diff --git a/pom.xml b/pom.xml index aafb5cf4f..8d1f0f3af 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT pom Results Service - Parent Module diff --git a/results-command/pom.xml b/results-command/pom.xml index f543b87b2..555004cac 100644 --- a/results-command/pom.xml +++ b/results-command/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-command pom diff --git a/results-command/results-command-api/pom.xml b/results-command/results-command-api/pom.xml index 3e4e1ba3f..c2222307a 100644 --- a/results-command/results-command-api/pom.xml +++ b/results-command/results-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.results results-command - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-command-api war diff --git a/results-command/results-command-handler/pom.xml b/results-command/results-command-handler/pom.xml index 16b7a02e7..e7d89a446 100644 --- a/results-command/results-command-handler/pom.xml +++ b/results-command/results-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-command - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-command-handler war diff --git a/results-command/results-command-handler/src/main/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandler.java b/results-command/results-command-handler/src/main/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandler.java index bb6073298..99f103977 100644 --- a/results-command/results-command-handler/src/main/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandler.java +++ b/results-command/results-command-handler/src/main/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandler.java @@ -101,6 +101,8 @@ public class ResultsCommandHandler extends AbstractCommandHandler { private static final String A_4 = "A4"; private static final String ZERO_FOUR = "04"; private static final String CONTACT_EMAIL_ADDRESS = "contactEmailAddress"; + private static final String CPS_FLAG = "cpsFlag"; + private static final String CPS_CC_EMAIL_ADDRESS = "cpsCcEmailAddress"; @Inject private ObjectToJsonObjectConverter objectToJsonObjectConverter; @@ -352,7 +354,7 @@ private void createAppealUpdateEmail(final JsonEnvelope commandEnvelope, final O final String[] emailAddress = new String[1]; refDataProsecutorJson.ifPresent(prosecutorJson -> - emailAddress[0] = getEmailAddress(prosecutorJson, jurisdictionType) + emailAddress[0] = getAppealUpdateEmailAddress(prosecutorJson, jurisdictionType) ); if (emailAddress[0] != null && !emailAddress[0].isBlank()) { @@ -638,6 +640,21 @@ private String getEmailAddress(final JsonObject prosecutorJson, final Optional jurisdictionType) { + if (getFlagValue(CPS_FLAG, prosecutorJson)) { + final String cpsCcEmailAddress = prosecutorJson.getString(CPS_CC_EMAIL_ADDRESS, null); + if (cpsCcEmailAddress != null && !cpsCcEmailAddress.isBlank()) { + return cpsCcEmailAddress; + } + } + return getEmailAddress(prosecutorJson, jurisdictionType); + } + private void appendEventsToStream(final Envelope envelope, final EventStream eventStream, final Stream events) throws EventStreamException { final JsonEnvelope jsonEnvelope = envelopeFrom(envelope.metadata(), NULL); eventStream.append(events.map(toEnvelopeWithMetadataFrom(jsonEnvelope))); diff --git a/results-command/results-command-handler/src/test/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandlerTest.java b/results-command/results-command-handler/src/test/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandlerTest.java index 70b002aec..281f02346 100644 --- a/results-command/results-command-handler/src/test/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandlerTest.java +++ b/results-command/results-command-handler/src/test/java/uk/gov/moj/cpp/results/command/handler/ResultsCommandHandlerTest.java @@ -18,6 +18,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasItem; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Named.named; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -1519,6 +1520,106 @@ public void shouldCreateAppealUpdateEvent() throws EventStreamException { )); } + @Test + public void shouldUseCpsCcEmailAddressForCpsProsecutorOnAppealUpdate() throws EventStreamException { + final String cpsCcEmail = "crowncourt@cps.gov.uk"; + final ResultsAggregate resultsAggregate = new ResultsAggregate(); + + when(eventSource.getStreamById(any())).thenReturn(this.eventStream); + when(aggregateService.get(any(EventStream.class), any())).thenReturn(resultsAggregate); + + // CPS prosecutor: cpsCcEmailAddress should win over contactEmailAddress + final JsonObjectBuilder cpsProsecutorBuilder = createObjectBuilder(); + cpsProsecutorBuilder + .add("spiOutFlag", true) + .add("cpsFlag", true) + .add("contactEmailAddress", EMAIL) + .add("cpsCcEmailAddress", cpsCcEmail); + + // Non-CPS prosecutor: existing fallback behaviour is unchanged + final JsonObjectBuilder nonCpsProsecutorBuilder = createObjectBuilder(); + nonCpsProsecutorBuilder + .add("spiOutFlag", true) + .add("policeFlag", true) + .add("informantEmailAddress", EMAIL2); + + when(referenceDataService.getSpiOutFlagForProsecutionAuthorityCode(any())) + .thenReturn(of(cpsProsecutorBuilder.build())) + .thenReturn(of(nonCpsProsecutorBuilder.build())); + + final JsonObject payload = getPayload(TEMPLATE_PAYLOAD_APPLICATION_RESULTED); + final JsonEnvelope envelope = envelopeFrom(metadataOf(metadataId, "results.command.create-results-for-day"), payload); + this.resultsCommandHandler.createResultsForDay(envelope); + + verify(eventStream, Mockito.times(3)).append(streamArgumentCaptor.capture()); + final List allValues = convertStreamToEventList(streamArgumentCaptor.getAllValues()); + + assertThat(allValues, containsInAnyOrder( + jsonEnvelope( + withMetadataEnvelopedFrom(envelope).withName("results.event.session-added-event"), + payloadIsJson(allOf( + withJsonPath("$.id", notNullValue()), + withJsonPath("$.courtCentreWithLJA", notNullValue()), + withJsonPath("$.sessionDays", notNullValue()) + ) + )), + jsonEnvelope( + withMetadataEnvelopedFrom(envelope) + .withName("results.event.appeal-update-notification-requested"), + payloadIsJson(allOf( + withJsonPath("$.applicationId", notNullValue()), + withJsonPath("$.subject", is("Appeal Update")), + withJsonPath("$.emailAddress", is(cpsCcEmail)) + ) + )), + jsonEnvelope( + withMetadataEnvelopedFrom(envelope) + .withName("results.event.appeal-update-notification-requested"), + payloadIsJson(allOf( + withJsonPath("$.applicationId", notNullValue()), + withJsonPath("$.subject", is("Appeal Update")), + withJsonPath("$.emailAddress", is(EMAIL2)) + ) + )) + )); + } + + @Test + public void shouldFallBackToContactEmailWhenCpsProsecutorHasNoCpsCcEmailOnAppealUpdate() throws EventStreamException { + final ResultsAggregate resultsAggregate = new ResultsAggregate(); + + when(eventSource.getStreamById(any())).thenReturn(this.eventStream); + when(aggregateService.get(any(EventStream.class), any())).thenReturn(resultsAggregate); + + // CPS prosecutor but no cpsCcEmailAddress -> falls back to contactEmailAddress (Crown Court) + final JsonObjectBuilder cpsProsecutorBuilder = createObjectBuilder(); + cpsProsecutorBuilder + .add("spiOutFlag", true) + .add("cpsFlag", true) + .add("contactEmailAddress", EMAIL); + + when(referenceDataService.getSpiOutFlagForProsecutionAuthorityCode(any())) + .thenReturn(of(cpsProsecutorBuilder.build())); + + final JsonObject payload = getPayload(TEMPLATE_PAYLOAD_APPLICATION_RESULTED); + final JsonEnvelope envelope = envelopeFrom(metadataOf(metadataId, "results.command.create-results-for-day"), payload); + this.resultsCommandHandler.createResultsForDay(envelope); + + verify(eventStream, Mockito.atLeastOnce()).append(streamArgumentCaptor.capture()); + final List allValues = convertStreamToEventList(streamArgumentCaptor.getAllValues()); + + assertThat(allValues, hasItem( + jsonEnvelope( + withMetadataEnvelopedFrom(envelope) + .withName("results.event.appeal-update-notification-requested"), + payloadIsJson(allOf( + withJsonPath("$.subject", is("Appeal Update")), + withJsonPath("$.emailAddress", is(EMAIL)) + ) + )) + )); + } + private List convertStreamToEventList(final List> listOfStreams) { return listOfStreams.stream() .flatMap(jsonEnvelopeStream -> jsonEnvelopeStream).collect(toList()); diff --git a/results-domain/pom.xml b/results-domain/pom.xml index bcda8d2fe..5c494d37c 100644 --- a/results-domain/pom.xml +++ b/results-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-domain pom diff --git a/results-domain/results-domain-aggregate/pom.xml b/results-domain/results-domain-aggregate/pom.xml index 0e846678e..a29561222 100644 --- a/results-domain/results-domain-aggregate/pom.xml +++ b/results-domain/results-domain-aggregate/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-domain - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-domain-aggregate diff --git a/results-domain/results-domain-common/pom.xml b/results-domain/results-domain-common/pom.xml index a4dcdbc19..905266170 100644 --- a/results-domain/results-domain-common/pom.xml +++ b/results-domain/results-domain-common/pom.xml @@ -4,7 +4,7 @@ results-domain uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-domain-common diff --git a/results-domain/results-domain-event/pom.xml b/results-domain/results-domain-event/pom.xml index a2bc8acea..4ec37030a 100644 --- a/results-domain/results-domain-event/pom.xml +++ b/results-domain/results-domain-event/pom.xml @@ -4,7 +4,7 @@ results-domain uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-domain-event diff --git a/results-event-sources/pom.xml b/results-event-sources/pom.xml index f46b1d457..a5f13be26 100644 --- a/results-event-sources/pom.xml +++ b/results-event-sources/pom.xml @@ -3,7 +3,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT 4.0.0 diff --git a/results-event/pom.xml b/results-event/pom.xml index f3dc2c700..b7b68747d 100644 --- a/results-event/pom.xml +++ b/results-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-event pom diff --git a/results-event/results-event-listener/pom.xml b/results-event/results-event-listener/pom.xml index f29474de6..dbc17a67a 100644 --- a/results-event/results-event-listener/pom.xml +++ b/results-event/results-event-listener/pom.xml @@ -4,7 +4,7 @@ results-event uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-event-listener diff --git a/results-event/results-event-processor/pom.xml b/results-event/results-event-processor/pom.xml index 080f72ee3..5ad016068 100644 --- a/results-event/results-event-processor/pom.xml +++ b/results-event/results-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-event - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-event-processor diff --git a/results-healthchecks/pom.xml b/results-healthchecks/pom.xml index 8f0c8747d..e69374391 100644 --- a/results-healthchecks/pom.xml +++ b/results-healthchecks/pom.xml @@ -3,7 +3,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT 4.0.0 diff --git a/results-integration-test/pom.xml b/results-integration-test/pom.xml index 4c8911ef4..9c93126fe 100644 --- a/results-integration-test/pom.xml +++ b/results-integration-test/pom.xml @@ -4,7 +4,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-integration-test diff --git a/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/ProsecutorResultsIT.java b/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/ProsecutorResultsIT.java index bdc29f69f..6c893e7b4 100644 --- a/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/ProsecutorResultsIT.java +++ b/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/ProsecutorResultsIT.java @@ -25,6 +25,8 @@ import static uk.gov.moj.cpp.results.it.steps.ResultsStepDefinitions.verifyAppealUpdateEmail; import static uk.gov.moj.cpp.results.it.stub.NotificationNotifyServiceStub.NOTIFICATION_NOTIFY_ENDPOINT; import static uk.gov.moj.cpp.results.it.stub.NotificationNotifyServiceStub.setupNotificationNotifyStubs; +import static uk.gov.moj.cpp.results.it.stub.NotificationNotifyServiceStub.verifyEmailNotificationIsRaised; +import static uk.gov.moj.cpp.results.it.utils.ReferenceDataServiceStub.stubCpsProsecutorForAppealUpdate; import static uk.gov.moj.cpp.results.it.utils.ReferenceDataServiceStub.stubGetOrganisationUnit; import static uk.gov.moj.cpp.results.it.utils.ReferenceDataServiceStub.stubPoliceFlag; import static uk.gov.moj.cpp.results.it.utils.ReferenceDataServiceStub.stubSpiOutFlag; @@ -41,6 +43,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -125,6 +128,32 @@ public void testAppealApplicationEmailNotificationSuccess() { verifyAppealUpdateEmail(NOTIFICATION_NOTIFY_ENDPOINT); } + @Test + public void testAppealApplicationEmailNotificationUsesCpsCrownCourtEmailForCpsProsecutor() { + final String cpsCrownCourtEmail = "appeals.cc@cps.gov.uk"; + final String contactEmail = "contact@cps.gov.uk"; + + stubGetOrganisationUnit(); + createMessageConsumers(); + setupNotificationNotifyStubs(); + ReferenceDataServiceStub.stubCountryNationalities(); + + final PublicHearingResulted resultsMessage = basicShareResultsTemplateWithAppealFlag(JurisdictionType.CROWN, true); + resultsMessage.setIsReshare(Optional.of(Boolean.FALSE)); + resultsMessage.setSharedTime(ZonedDateTime.now(ZoneId.of("UTC"))); + resultsMessage.setHearingDay(Optional.of(LocalDate.now())); + + stubSpiOutFlag(true, true, "CCSU@derbyshire.pnn.police.uk"); + stubPoliceFlag("DERPF", "DERPF"); + // The appeal-update notification looks the prosecutor up by code; a CPS prosecutor must be emailed at its + // CPS Crown Court address (cpsCcEmailAddress), not its contactEmailAddress. + stubCpsProsecutorForAppealUpdate(contactEmail, cpsCrownCourtEmail); + + hearingResultsHaveBeenSharedV2WithoutPoliceResultGenerated(resultsMessage); + + verifyEmailNotificationIsRaised(List.of("Appeal Update", cpsCrownCourtEmail)); + } + private void validateProsecutorResults(final String ouCode, final String startDate, final String endDate, final javax.ws.rs.core.Response.Status status, final ResponsePayloadMatcher responsePayloadMatcher) { final String url = BASE_URI + format("/results-query-api/query/api/rest/results/prosecutor/%s?startDate=%s%s", ouCode, startDate, Objects.nonNull(endDate) ? "&endDate=" + endDate : ""); diff --git a/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/utils/ReferenceDataServiceStub.java b/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/utils/ReferenceDataServiceStub.java index ce5ee946e..592264bf1 100644 --- a/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/utils/ReferenceDataServiceStub.java +++ b/results-integration-test/src/test/java/uk/gov/moj/cpp/results/it/utils/ReferenceDataServiceStub.java @@ -3,6 +3,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.matching; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; @@ -115,6 +116,36 @@ public static void stubSpiOutFlag(final boolean spiOutFlag, final boolean police .withBody(prosecutorCodeResponse.toString()))); } + /** + * Stubs the prosecutor reference-data query (by prosecutorCode) to return a CPS prosecutor for ANY prosecutorCode. + * Used by the appeal-update notification flow, which looks the prosecutor up by code. The CPS Crown Court email + * (cpsCcEmailAddress) is expected to be used for CPS prosecutors; contactEmailAddress is included to prove it is + * NOT used when the CPS Crown Court email is present. + */ + public static void stubCpsProsecutorForAppealUpdate(final String contactEmailAddress, final String cpsCcEmailAddress) { + final String urlPath = "/referencedata-service/query/api/rest/referencedata/prosecutors"; + + final JsonObject cpsProsecutor = createObjectBuilder() + .add("spiOutFlag", true) + .add("cpsFlag", true) + .add("contactEmailAddress", contactEmailAddress) + .add("cpsCcEmailAddress", cpsCcEmailAddress) + .build(); + + final JsonObject prosecutorCodeResponse = createObjectBuilder() + .add("prosecutors", createArrayBuilder() + .add(cpsProsecutor) + .build()) + .build(); + + stubFor(get(urlPathEqualTo(urlPath)) + .withQueryParam("prosecutorCode", matching(".+")) + .willReturn(aResponse().withStatus(SC_OK) + .withHeader(ID, randomUUID().toString()) + .withHeader(CONTENT_TYPE, APPLICATION_JSON) + .withBody(prosecutorCodeResponse.toString()))); + } + public static void stubPoliceFlag(final String originatingOrganisation, final String prosecutionAuthority) { final String urlPath = "/referencedata-service/query/api/rest/referencedata/prosecutors"; diff --git a/results-json/pom.xml b/results-json/pom.xml index 1f39b6528..a7ad0b13d 100644 --- a/results-json/pom.xml +++ b/results-json/pom.xml @@ -3,7 +3,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT 4.0.0 diff --git a/results-performance-test/pom.xml b/results-performance-test/pom.xml index a2c91650c..a074f2073 100644 --- a/results-performance-test/pom.xml +++ b/results-performance-test/pom.xml @@ -3,7 +3,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT 4.0.0 diff --git a/results-query/pom.xml b/results-query/pom.xml index f56fbce77..6a15b15dc 100644 --- a/results-query/pom.xml +++ b/results-query/pom.xml @@ -4,7 +4,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-query diff --git a/results-query/results-query-api/pom.xml b/results-query/results-query-api/pom.xml index d932f50a6..bd28bdfcc 100644 --- a/results-query/results-query-api/pom.xml +++ b/results-query/results-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-query - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-query-api diff --git a/results-query/results-query-view/pom.xml b/results-query/results-query-view/pom.xml index 925c702ca..c34822d85 100644 --- a/results-query/results-query-view/pom.xml +++ b/results-query/results-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-query - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-query-view diff --git a/results-service/pom.xml b/results-service/pom.xml index d34fa13e4..d6a187b5c 100644 --- a/results-service/pom.xml +++ b/results-service/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-service war diff --git a/results-viewstore/pom.xml b/results-viewstore/pom.xml index b5db634f5..fa3787fc5 100644 --- a/results-viewstore/pom.xml +++ b/results-viewstore/pom.xml @@ -4,7 +4,7 @@ results-parent uk.gov.moj.cpp.results - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-viewstore diff --git a/results-viewstore/results-viewstore-liquibase/pom.xml b/results-viewstore/results-viewstore-liquibase/pom.xml index 5a25c006f..f2f937bbe 100644 --- a/results-viewstore/results-viewstore-liquibase/pom.xml +++ b/results-viewstore/results-viewstore-liquibase/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-viewstore - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-viewstore-liquibase diff --git a/results-viewstore/results-viewstore-persistence/pom.xml b/results-viewstore/results-viewstore-persistence/pom.xml index f47264b10..2634170fb 100644 --- a/results-viewstore/results-viewstore-persistence/pom.xml +++ b/results-viewstore/results-viewstore-persistence/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.results results-viewstore - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT results-viewstore-persistence diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 7c38ac325..6b09ea1fb 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.results results-parent - 17.104.111-SNAPSHOT + 17.104.111-CIMD-3868-SNAPSHOT test-utilities