Dev/cct 1923 rebase

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.5</version>
+        <version>17.103.11</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.sjp</groupId>
@@ -46,14 +46,14 @@
         <referencedata.offences.version>17.0.38</referencedata.offences.version>
         <scheduling.version>17.0.11</scheduling.version>
         <authorisation.service.version>0.1.49</authorisation.service.version>
-        <usersgroups.version>17.104.46</usersgroups.version>
-        <progression.version>17.0.246</progression.version>
+        <usersgroups.version>17.104.48</usersgroups.version>
+        <progression.version>17.0.262</progression.version>
         <prosecutioncasefile.version>17.0.66</prosecutioncasefile.version>
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <file.alfresco.version>2.3.0</file.alfresco.version>
-        <coredomain.version>17.103.12</coredomain.version>
+        <coredomain.version>17.103.13</coredomain.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <joda-time.version>2.10</joda-time.version>
@@ -66,7 +66,7 @@
         <argLine>-Djava.locale.providers=CLDR</argLine>
         <elasticsearch-maven-plugin.version>6.13</elasticsearch-maven-plugin.version>
         <elasticsearch.embedded.version>7.16.2</elasticsearch.embedded.version>
-        <stagingenforcement.version>17.103.76</stagingenforcement.version>
+        <stagingenforcement.version>17.104.81</stagingenforcement.version>
         <unifiedsearch.version>17.0.26</unifiedsearch.version>
         <jsonassert.version>1.5.0</jsonassert.version>
         <junit4.version>4.13.1</junit4.version>

runIntegrationTests.sh

@@ -12,7 +12,7 @@ DOCKER_CONTAINER_REGISTRY_HOST_NAME=crmdvrepo01
 
 LIQUIBASE_COMMAND=update
 #LIQUIBASE_COMMAND=dropAll
-
+#
 #fail script on error
 set -e
 

sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java

@@ -1,6 +1,5 @@
 package uk.gov.moj.cpp.sjp.command.controller;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;

sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java

@@ -5,7 +5,6 @@
 import static java.util.Optional.ofNullable;
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER;
 import static uk.gov.justice.services.core.enveloper.Enveloper.envelop;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;

sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java

@@ -53,7 +53,8 @@ public void acknowledgeDefendantDetailsUpdates(
         final ProsecutingAuthorityAccess currentUsersProsecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(command);
 
         final Stream<Object> events = caseAggregate
-                .acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), currentUsersProsecutingAuthorityAccess.getProsecutingAuthority());
+                .acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), currentUsersProsecutingAuthorityAccess.getProsecutingAuthority(),
+                        currentUsersProsecutingAuthorityAccess.getAgentProsecutorAuthorityAccess());
 
         eventStream.append(events.map(enveloper.withMetadataFrom(command)));
     }

sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java

@@ -23,7 +23,8 @@ public void addDatesToAvoid(final JsonEnvelope command) throws EventStreamExcept
         final JsonObject payload = command.payloadAsJsonObject();
         final String datesToAvoid = payload.getString("datesToAvoid");
         final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(command);
-        applyToCaseAggregate(command, aggregate -> aggregate.addDatesToAvoid(datesToAvoid, prosecutingAuthorityAccess.getProsecutingAuthority()));
+        applyToCaseAggregate(command, aggregate -> aggregate.addDatesToAvoid(datesToAvoid, prosecutingAuthorityAccess.getProsecutingAuthority(),
+                prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()));
     }
 
     @Handles("sjp.command.expire-dates-to-avoid-timer")

sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java

@@ -53,7 +53,8 @@ public void setOffencesWithdrawalRequestsStatus(final Envelope<SetOffencesWithdr
                 UUID.fromString(command.metadata().userId().get()),
                 clock.now(),
                 offencesWithdrawalRequestsStatus,
-                prosecutingAuthorityAccess.getProsecutingAuthority()));
+                prosecutingAuthorityAccess.getProsecutingAuthority(),
+                prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()));
     }
 
 }

sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.update-defendant-details-from-CC.json

@@ -73,8 +73,7 @@
       },
       "required": [
         "name",
-        "address",
-        "contactDetails"
+        "address"
       ],
       "additionalProperties": false
     }

sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java

@@ -116,6 +116,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx
         final UUID offenceId_2 = randomUUID();
         final ZonedDateTime setAt = clock.now();
         final String prosecutionAuthority = "ALL";
+        final List<String> agentProsecutorAuthorityAccess = List.of("TFL", "TVL");
 
         final SetOffencesWithdrawalRequestsStatus requestsStatus = new SetOffencesWithdrawalRequestsStatus(caseId, requestPayload(offenceId_1, offenceId_2));
         final UUID userId = randomUUID();
@@ -125,6 +126,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx
         when(aggregateService.get(eventStream, CaseAggregate.class)).thenReturn(caseAggregate);
         when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(any())).thenReturn(prosecutingAuthorityAccess);
         when(prosecutingAuthorityAccess.getProsecutingAuthority()).thenReturn(prosecutionAuthority);
+        when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()).thenReturn(agentProsecutorAuthorityAccess);
 
         final List<uk.gov.moj.cpp.sjp.domain.aggregate.state.WithdrawalRequestsStatus> offenceWithdrawalRequestsStatus =
                 requestsStatus.getWithdrawalRequestsStatus().stream()
@@ -134,7 +136,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx
                         )
                         .collect(Collectors.toList());
 
-        when(caseAggregate.requestForOffenceWithdrawal(eq(requestsStatus.getCaseId()), eq(userId), eq(setAt), eq(offenceWithdrawalRequestsStatus), eq(prosecutionAuthority)))
+        when(caseAggregate.requestForOffenceWithdrawal(eq(requestsStatus.getCaseId()), eq(userId), eq(setAt), eq(offenceWithdrawalRequestsStatus), eq(prosecutionAuthority), eq(agentProsecutorAuthorityAccess)))
                 .thenReturn(Stream.of(new OffencesWithdrawalRequestsStatusSet(caseId, setAt, userId, requestPayload(offenceId_1, offenceId_2)),
                         new OffenceWithdrawalRequested(caseId, offenceId_1, withdrawalRequestReasonId, userId, setAt),
                         new OffenceWithdrawalRequested(caseId, offenceId_2, withdrawalRequestReasonId, userId, setAt)));

sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java

@@ -223,8 +223,8 @@ public Stream<Object> updateHearingRequirements(final UUID userId,
         return apply(CaseLanguageHandler.INSTANCE.updateHearingRequirements(userId, defendantId, interpreterLanguage, speakWelsh, state, pleaMethod, createdOn));
     }
 
-    public Stream<Object> addDatesToAvoid(final String datesToAvoid, final String userProsecutingAuthority) {
-        return applyAndResolveCaseReadiness(() -> CaseCoreHandler.INSTANCE.addDatesToAvoid(datesToAvoid, state, userProsecutingAuthority));
+    public Stream<Object> addDatesToAvoid(final String datesToAvoid, final String userProsecutingAuthority, final List<String> agentProsecutorAuthorityAccess) {
+        return applyAndResolveCaseReadiness(() -> CaseCoreHandler.INSTANCE.addDatesToAvoid(datesToAvoid, state, userProsecutingAuthority, agentProsecutorAuthorityAccess));
     }
 
     public Stream<Object> expireDefendantResponseTimer() {
@@ -258,9 +258,10 @@ public Stream<Object> markAsLegalSocChecked(final UUID caseId, final UUID checke
     public Stream<Object> acknowledgeDefendantDetailsUpdates(
             final UUID defendantId,
             final ZonedDateTime acknowledgedAt,
-            final String userProsecutingAuthority) {
+            final String userProsecutingAuthority,
+            final List<String> agentProsecutorAuthorityAccess) {
 
-        return apply(CaseDefendantHandler.INSTANCE.acknowledgeDefendantDetailsUpdates(defendantId, acknowledgedAt, state, userProsecutingAuthority));
+        return apply(CaseDefendantHandler.INSTANCE.acknowledgeDefendantDetailsUpdates(defendantId, acknowledgedAt, state, userProsecutingAuthority, agentProsecutorAuthorityAccess));
     }
 
     public Stream<Object> updateDefendantDetails(final UUID userId,
@@ -368,8 +369,10 @@ public Stream<Object> addCaseNote(final UUID caseId, final Note note, final User
                 state));
     }
 
-    public Stream<Object> requestForOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List<WithdrawalRequestsStatus> withdrawalRequestsStatus, final String prosecutionAuthority) {
-        return applyAndResolveCaseReadiness(() -> OffenceWithdrawalHandler.INSTANCE.requestOffenceWithdrawal(caseId, setBy, setAt, withdrawalRequestsStatus, state, prosecutionAuthority));
+    public Stream<Object> requestForOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List<WithdrawalRequestsStatus> withdrawalRequestsStatus,
+                                                      final String prosecutionAuthority, final List<String> agentProsecutorAuthorityAccess) {
+        return applyAndResolveCaseReadiness(() -> OffenceWithdrawalHandler.INSTANCE.requestOffenceWithdrawal(caseId, setBy, setAt, withdrawalRequestsStatus, state,
+                prosecutionAuthority, agentProsecutorAuthorityAccess));
     }
 
     public Stream<Object> setPleas(final UUID caseId, final SetPleas pleas, final UUID userId, final ZonedDateTime pleadAt) {

sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseCoreHandler.java

@@ -135,14 +135,16 @@ public Stream<Object> updateCaseListedInCcForReferToCourt(final List<CaseOffence
     }
 
     public Stream<Object> addDatesToAvoid(final String datesToAvoid,
-                                          final CaseAggregateState state, final String userProsecutingAuthority) {
+                                          final CaseAggregateState state, final String userProsecutingAuthority,
+                                          final List<String> agentProsecutorAuthorityAccess) {
 
         return createRejectionEvents(
                 null,
                 "Add dates to avoid",
                 null,
                 state,
-                userProsecutingAuthority
+                userProsecutingAuthority,
+                agentProsecutorAuthorityAccess
         ).orElse(Stream.of(state.getDatesToAvoid() == null ?
                 new DatesToAvoidAdded(state.getCaseId(), datesToAvoid) :
                 new DatesToAvoidUpdated(state.getCaseId(), datesToAvoid)));

sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandler.java

@@ -31,6 +31,7 @@
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -66,7 +67,8 @@ public Stream<Object> acknowledgeDefendantDetailsUpdates(
             final UUID defendantId,
             final ZonedDateTime acknowledgedAt,
             final CaseAggregateState state,
-            final String userProsecutingAuthority) {
+            final String userProsecutingAuthority,
+            final List<String> agentProsecutorAuthorityAccess) {
 
         Object event;
         if (state.getCaseId() == null) {
@@ -75,8 +77,19 @@ public Stream<Object> acknowledgeDefendantDetailsUpdates(
         } else if (defendantId != null && !state.hasDefendant(defendantId)) {
             LOGGER.warn("Defendant not found: {}", defendantId);
             event = new DefendantNotFound(defendantId, "Acknowledge defendant details updates");
-        } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || "ALL".equalsIgnoreCase(userProsecutingAuthority))) {
-            event = new ProsecutionAuthorityAccessDenied(userProsecutingAuthority, state.getProsecutingAuthority());
+        } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) ||
+                "ALL".equalsIgnoreCase(userProsecutingAuthority) ||
+                (agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.stream().anyMatch(s-> s.equalsIgnoreCase(state.getProsecutingAuthority()))))) {
+
+            final List<String> prosecutorAuthorityAccess = new ArrayList<>();
+
+            if(agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.size() > 1) {
+                prosecutorAuthorityAccess.addAll(agentProsecutorAuthorityAccess);
+            } else {
+                prosecutorAuthorityAccess.add(userProsecutingAuthority);
+            }
+
+            event = new ProsecutionAuthorityAccessDenied(state.getProsecutingAuthority(), prosecutorAuthorityAccess);
         } else {
             event = new DefendantDetailsUpdatesAcknowledged(state.getCaseId(), defendantId, acknowledgedAt);
         }

sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtils.java

@@ -12,6 +12,7 @@
 import uk.gov.moj.cpp.sjp.event.DefendantNotFound;
 import uk.gov.moj.cpp.sjp.event.OffenceNotFound;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +36,8 @@ public static Optional<Stream<Object>> createRejectionEvents(final UUID userId,
                                                                  final String action,
                                                                  final UUID defendantId,
                                                                  final CaseAggregateState state,
-                                                                 final String userProsecutingAuthority) {
+                                                                 final String userProsecutingAuthority, // initial
+                                                                 final List<String> agentProsecutorAuthorityAccess) { // new
         Object event = null;
         if (isNull(state.getCaseId())) {
             LOGGER.warn("Case not found: {}", action);
@@ -52,8 +54,19 @@ public static Optional<Stream<Object>> createRejectionEvents(final UUID userId,
         } else if (state.isCaseReferredForCourtHearing()) {
             LOGGER.warn("Update rejected because case is referred to court for hearing: {}", action);
             event = new CaseUpdateRejected(state.getCaseId(), CaseUpdateRejected.RejectReason.CASE_REFERRED_FOR_COURT_HEARING);
-        } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || "ALL".equalsIgnoreCase(userProsecutingAuthority))) {
-            event = new ProsecutionAuthorityAccessDenied(userProsecutingAuthority, state.getProsecutingAuthority());
+        } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) ||
+                "ALL".equalsIgnoreCase(userProsecutingAuthority) ||
+                (agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.stream().anyMatch(s-> s.equalsIgnoreCase(state.getProsecutingAuthority()))))) {
+
+            final List<String> prosecutorAuthorityAccess = new ArrayList<>();
+
+            if(agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.size() > 1) {
+                prosecutorAuthorityAccess.addAll(agentProsecutorAuthorityAccess);
+            } else {
+                prosecutorAuthorityAccess.add(userProsecutingAuthority);
+            }
+
+            event = new ProsecutionAuthorityAccessDenied(state.getProsecutingAuthority(), prosecutorAuthorityAccess);
         }
 
         return Optional.ofNullable(event).map(Stream::of);

sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandler.java

@@ -24,10 +24,11 @@ public class OffenceWithdrawalHandler {
     private OffenceWithdrawalHandler() {
     }
 
-    public Stream<Object> requestOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List<WithdrawalRequestsStatus> withdrawalRequestsStatus, final CaseAggregateState state, final String prosecutionAuthority) {
+    public Stream<Object> requestOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List<WithdrawalRequestsStatus> withdrawalRequestsStatus,
+                                                   final CaseAggregateState state, final String prosecutionAuthority, final List<String> agentProsecutorAuthorityAccess) {
 
         return HandlerUtils.
-                createRejectionEvents(null, "Request Offence Withdrawal", null, state, prosecutionAuthority).
+                createRejectionEvents(null, "Request Offence Withdrawal", null, state, prosecutionAuthority, agentProsecutorAuthorityAccess).
                 orElse(createWithdrawalEvents(caseId, setBy, setAt, withdrawalRequestsStatus, state));
     }