Rebase with main

pom.xml

@@ -33,8 +33,6 @@
         <module>progression-healthchecks</module>
     </modules>
 
-
-
     <properties>
         <sonar.jacoco.itReportPath>${project.basedir}/../target/jacoco-it.exec
         </sonar.jacoco.itReportPath>
@@ -68,7 +66,7 @@
         <material.version>17.0.75</material.version>
         <json-transformer.version>1.0.6</json-transformer.version>
         <access.control.version>6.4.1</access.control.version>
-        <referencedata.version>17.103.133</referencedata.version>
+        <referencedata.version>17.104.137</referencedata.version>
         <listing.version>17.103.163</listing.version>
         <hearing.version>17.104.173</hearing.version>
         <usersgroups.version>17.104.49</usersgroups.version>
@@ -77,10 +75,10 @@
         <coredomain.version>17.103.13</coredomain.version>
         <directionsmanagement.version>8.0.30</directionsmanagement.version>
         <elasticsearch-maven-plugin.version>6.13</elasticsearch-maven-plugin.version>
-        <results.version>17.104.110</results.version>
+        <results.version>17.104.112</results.version>
         <notification.notify.version>17.104.44</notification.notify.version>
         <unifiedsearch.version>17.0.26</unifiedsearch.version>
-        <systemdocgenerator.version>17.0.64</systemdocgenerator.version>
+        <systemdocgenerator.version>17.104.114</systemdocgenerator.version>
         <applicationscourtorders.version>17.0.70</applicationscourtorders.version>
         <sjp.version>17.103.170</sjp.version>
         <httpmime.version>4.5.1</httpmime.version>

progression-command/progression-command-api/src/raml/json/schema/progression.initiate-court-proceedings-for-application.json

@@ -19,6 +19,9 @@
     "summonsApprovalRequired": {
       "description": "Indicates that the summons approval process is required to be initiated",
       "type": "boolean"
+    },
+    "applicationSource": {
+      "$ref": "http://moj.gov.uk/cpp/progression/enum-def.json#/definitions/applicationSource"
     }
   },
   "required": [

progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CourtApplicationHandler.java

@@ -15,6 +15,10 @@
 import static uk.gov.justice.core.courts.ProsecutingAuthority.prosecutingAuthority;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.moj.cpp.progression.domain.constant.CaseStatusEnum.CLOSED;
+import static uk.gov.moj.cpp.progression.domain.constant.CaseStatusEnum.INACTIVE;
+import static uk.gov.moj.cpp.progression.enums.ApplicationSource.MH;
+import static uk.gov.moj.cpp.progression.enums.ApplicationSource.UNKNOWN;
 
 import uk.gov.justice.core.courts.AddBreachApplication;
 import uk.gov.justice.core.courts.AddCourtApplicationToCase;
@@ -63,6 +67,7 @@
 import uk.gov.justice.services.messaging.Metadata;
 import uk.gov.moj.cpp.progression.aggregate.ApplicationAggregate;
 import uk.gov.moj.cpp.progression.aggregate.HearingAggregate;
+import uk.gov.moj.cpp.progression.enums.ApplicationSource;
 import uk.gov.moj.cpp.progression.service.ApplicationDetailsEnrichmentService;
 import uk.gov.moj.cpp.progression.service.ProsecutionCaseQueryService;
 import uk.gov.moj.cpp.progression.service.RefDataService;
@@ -349,7 +354,7 @@ private InitiateCourtApplicationProceedings rebuildInitiateCourtApplicationProce
                                                                                            final boolean applicationReferredToNewHearing, final Envelope<InitiateCourtApplicationProceedings> envelope) {
         final boolean summonsApprovalRequired = isSummonsApprovalRequired(initiateCourtProceedingsForApplication.getBoxHearing(), initiateCourtProceedingsForApplication.getCourtApplication());
         final InitiateCourtApplicationProceedings.Builder initiateCourtProceedingsForApplicationBuilder = InitiateCourtApplicationProceedings.initiateCourtApplicationProceedings()
-                .withCourtApplication(rebuildCourtApplication(initiateCourtProceedingsForApplication.getCourtApplication(), envelope))
+                .withCourtApplication(rebuildCourtApplication(initiateCourtProceedingsForApplication.getCourtApplication(), initiateCourtProceedingsForApplication.getApplicationSource(), envelope))
                 .withSummonsApprovalRequired(summonsApprovalRequired)
                 .withIsAmended(initiateCourtProceedingsForApplication.getIsAmended())
                 .withOldApplicationId(initiateCourtProceedingsForApplication.getOldApplicationId())
@@ -384,13 +389,13 @@ private EditCourtApplicationProceedings rebuildEditCourtApplicationProceedings(f
         final boolean summonsApprovalRequired = isSummonsApprovalRequired(editCourtApplicationProceedings.getBoxHearing(), editCourtApplicationProceedings.getCourtApplication());
         final EditCourtApplicationProceedings.Builder editCourtProceedingsForApplicationBuilder = EditCourtApplicationProceedings.editCourtApplicationProceedings()
                 .withValuesFrom(editCourtApplicationProceedings)
-                .withCourtApplication(rebuildCourtApplication(editCourtApplicationProceedings.getCourtApplication(), envelope))
+                .withCourtApplication(rebuildCourtApplication(editCourtApplicationProceedings.getCourtApplication(), UNKNOWN, envelope))
                 .withSummonsApprovalRequired(summonsApprovalRequired);
 
         return editCourtProceedingsForApplicationBuilder.build();
     }
 
-    private CourtApplication rebuildCourtApplication(final CourtApplication courtApplication, final Envelope<?> envelope) {
+    private CourtApplication rebuildCourtApplication(final CourtApplication courtApplication, final ApplicationSource applicationSource, final Envelope<?> envelope) {
 
         final LaaReference laaReference = getLaaApplnReference(courtApplication, envelope);
 
@@ -404,7 +409,7 @@ private CourtApplication rebuildCourtApplication(final CourtApplication courtApp
         final JsonEnvelope jsonEnvelope = envelopeFrom(envelope.metadata(), JsonValue.NULL);
 
         updateClonedCourtApplicationParties(courtApplicationBuilder, courtApplication, jsonEnvelope);
-        updateClonedOffenceApplicationCases(courtApplicationBuilder, courtApplication);
+        updateClonedOffenceApplicationCases(courtApplicationBuilder, courtApplication, applicationSource);
         updateClonedOffenceCourtOrder(courtApplicationBuilder, courtApplication);
 
 
@@ -446,7 +451,7 @@ private boolean hasActivationCode(CourtApplicationType type) {
         return StringUtils.isNotEmpty(type.getResentencingActivationCode());
     }
 
-    private void updateClonedOffenceApplicationCases(final CourtApplication.Builder courtApplicationBuilder, final CourtApplication courtApplication) {
+    private void updateClonedOffenceApplicationCases(final CourtApplication.Builder courtApplicationBuilder, final CourtApplication courtApplication, final ApplicationSource applicationSource) {
         if (isNull(courtApplication.getCourtApplicationCases())) {
             return;
         }
@@ -461,17 +466,31 @@ private void updateClonedOffenceApplicationCases(final CourtApplication.Builder
         final String resentencingActivationCode = courtApplication.getType().getResentencingActivationCode();
 
         final List<CourtApplicationCase> courtApplicationCases = courtApplication.getCourtApplicationCases().stream()
-                .map(courtApplicationCase -> courtApplicationCase()
+                .map(courtApplicationCase -> {
+                    if (ignoreCaseOffences(courtApplicationCase.getCaseStatus(), applicationSource)) {
+                        return courtApplicationCase()
+                                .withValuesFrom(courtApplicationCase)
+                                .withOffences(null)
+                                .build();
+                    } else {
+                        return courtApplicationCase()
                         .withValuesFrom(courtApplicationCase)
-                        .withOffences(ofNullable(courtApplicationCase.getOffences()).map(Collection::stream).orElseGet(Stream::empty)
+                                .withOffences(ofNullable(courtApplicationCase.getOffences()).stream().flatMap(Collection::stream)
                                 .map(courtApplicationOffence -> updateOffence(courtApplication.getType(), courtApplicationOffence, wordingPattern, resentencingActivationCode))
                                 .collect(collectingAndThen(toList(), getListOrNull())))
-                        .build())
-                .collect(toList());
+                                .build();
+                    }
+                }).collect(toList());
 
         courtApplicationBuilder.withCourtApplicationCases(courtApplicationCases);
     }
 
+    private boolean ignoreCaseOffences(final String caseStatus, final ApplicationSource applicationSource) {
+        final boolean activeCase = !(INACTIVE.name().equalsIgnoreCase(caseStatus) || CLOSED.name().equalsIgnoreCase(caseStatus));
+
+        return activeCase && MH == applicationSource;
+    }
+
     private <T> UnaryOperator<List<T>> getListOrNull() {
         return list -> list.isEmpty() ? null : list;
     }

progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/UpdateFinancialMeansDataHandler.java

@@ -14,6 +14,7 @@
 import uk.gov.justice.services.eventsourcing.source.core.EventStream;
 import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
 import uk.gov.justice.services.messaging.Envelope;
+import uk.gov.moj.cpp.progression.aggregate.ApplicationAggregate;
 import uk.gov.moj.cpp.progression.aggregate.CaseAggregate;
 
 import java.util.List;
@@ -77,13 +78,18 @@ private boolean isDefendantsFinancialData(final CourtDocument courtDocument) {
 
     private void updateEventStream(final UUID prosecutionCaseId, final UUID defendantId, final UUID applicationId,
                                    final List<Material> materials,
-                                   final Envelope<CreateCourtDocument> createCourtDocumentEnvelope)
-            throws EventStreamException {
-
-        final EventStream eventStream = eventSource.getStreamById(prosecutionCaseId);
-        final CaseAggregate caseAggregate = aggregateService.get(eventStream, CaseAggregate.class);
-        final Stream<Object> events = caseAggregate.addFinancialMeansData(prosecutionCaseId, defendantId, applicationId, materials.get(0));
-        eventStream.append(events.map(Enveloper.toEnvelopeWithMetadataFrom(createCourtDocumentEnvelope)));
+                                   final Envelope<CreateCourtDocument> createCourtDocumentEnvelope) throws EventStreamException {
+        if (prosecutionCaseId != null) {
+            final EventStream eventStream = eventSource.getStreamById(prosecutionCaseId);
+            final CaseAggregate caseAggregate = aggregateService.get(eventStream, CaseAggregate.class);
+            final Stream<Object> events = caseAggregate.addFinancialMeansData(prosecutionCaseId, defendantId, applicationId, materials.get(0));
+            eventStream.append(events.map(Enveloper.toEnvelopeWithMetadataFrom(createCourtDocumentEnvelope)));
+        } else if (prosecutionCaseId == null && applicationId != null) {
+            final EventStream eventStream = eventSource.getStreamById(applicationId);
+            final ApplicationAggregate applicationAggregate = aggregateService.get(eventStream, ApplicationAggregate.class);
+            final Stream<Object> events = applicationAggregate.addFinancialMeansData(prosecutionCaseId, defendantId, applicationId, materials.get(0));
+            eventStream.append(events.map(Enveloper.toEnvelopeWithMetadataFrom(createCourtDocumentEnvelope)));
+        }
     }
 
 }

progression-command/progression-command-handler/src/raml/json/schema/progression.command.initiate-court-proceedings-for-application.json

@@ -20,6 +20,9 @@
       "description": "Indicates that the summons approval process is required to be initiated",
       "type": "boolean"
     },
+    "applicationSource": {
+      "$ref": "http://moj.gov.uk/cpp/progression/enum-def.json#/definitions/applicationSource"
+    },
     "isAmended": {
       "type": "boolean"
     },