diff --git a/pom.xml b/pom.xml index 685e9c72f7..8fa4e6cc45 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 17.104.48 17.0.85 17.103.42 - 17.103.14-SNAPSHOT + 17.103.13.1977-SNAPSHOT 8.0.30 6.13 17.103.105 diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingApplicationRequestHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingApplicationRequestHandler.java index db7aee5cd9..c3eb036078 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingApplicationRequestHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingApplicationRequestHandler.java @@ -4,7 +4,6 @@ import uk.gov.justice.core.courts.CourtApplicationPartyListingNeeds; import uk.gov.justice.core.courts.CreateHearingApplicationRequest; -import uk.gov.justice.core.courts.SummonsApprovedOutcome; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; @@ -17,9 +16,6 @@ import uk.gov.moj.cpp.progression.aggregate.HearingAggregate; import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; import java.util.stream.Stream; import javax.inject.Inject; @@ -48,35 +44,6 @@ public void handle(final Envelope createHearing final HearingAggregate hearingAggregate = aggregateService.get(eventStream, HearingAggregate.class); final Stream events = hearingAggregate.createHearingApplicationRequest(applicationRequests); appendEventsToStream(createHearingApplicationRequest, eventStream, events); - - linkBoxworkHearingToFirstHearing(createHearingApplicationRequest); - } - - private void linkBoxworkHearingToFirstHearing(final Envelope requestEnvelope) throws EventStreamException { - final Optional boxworkHearingId = getBoxworkHearingId(requestEnvelope); - - if (boxworkHearingId.isPresent()) { - final UUID bxwHearingId = boxworkHearingId.get(); - final UUID firstHearingId = requestEnvelope.payload().getHearingId(); - final EventStream boxworkHearingEventStream = eventSource.getStreamById(bxwHearingId); - final HearingAggregate boxworkHearingAggregate = aggregateService.get(boxworkHearingEventStream, HearingAggregate.class); - - if (boxworkHearingAggregate.isLinkedToFirstHearing()) { - LOGGER.info("Boxwork hearing {} already linked to the first hearing {}", bxwHearingId, firstHearingId); - return; - } - - final Stream linkEvents = boxworkHearingAggregate.linkBoxworkHearing(bxwHearingId, firstHearingId); - appendEventsToStream(requestEnvelope, boxworkHearingEventStream, linkEvents); - } - } - - private static Optional getBoxworkHearingId(final Envelope requestEnvelope) { - return requestEnvelope.payload().getApplicationRequests().stream() - .map(CourtApplicationPartyListingNeeds::getSummonsApprovedOutcome) - .filter(Objects::nonNull) - .map(SummonsApprovedOutcome::getHearingId) - .findFirst(); } private void appendEventsToStream(final Envelope envelope, final EventStream eventStream, final Stream events) throws EventStreamException { diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandler.java index c78fc0b85f..0c724790b5 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandler.java @@ -4,7 +4,6 @@ import org.slf4j.LoggerFactory; import uk.gov.justice.core.courts.CreateHearingDefendantRequest; import uk.gov.justice.core.courts.ListDefendantRequest; -import uk.gov.justice.core.courts.SummonsApprovedOutcome; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; @@ -19,9 +18,6 @@ import javax.inject.Inject; import javax.json.JsonValue; import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; import java.util.stream.Stream; @ServiceComponent(Component.COMMAND_HANDLER) @@ -41,15 +37,12 @@ public class CreateHearingDefendantRequestHandler { @Handles("progression.command.create-hearing-defendant-request") public void handle(final Envelope createHearingDefendantRequestEnvelope) throws EventStreamException { - LOGGER.debug("progression.command.create-hearing-defendant-request {}", createHearingDefendantRequestEnvelope); - + LOGGER.debug("progression.command.create-hearing-defendant-request {}", createHearingDefendantRequestEnvelope ); final List listDefendantRequests = createHearingDefendantRequestEnvelope.payload().getDefendantRequests(); final EventStream eventStream = eventSource.getStreamById(createHearingDefendantRequestEnvelope.payload().getHearingId()); final HearingAggregate hearingAggregate = aggregateService.get(eventStream, HearingAggregate.class); final Stream events = hearingAggregate.createHearingDefendantRequest(listDefendantRequests); appendEventsToStream(createHearingDefendantRequestEnvelope, eventStream, events); - - linkBoxworkHearingToFirstHearing(createHearingDefendantRequestEnvelope); } private void appendEventsToStream(final Envelope envelope, final EventStream eventStream, final Stream events) throws EventStreamException { @@ -58,33 +51,4 @@ private void appendEventsToStream(final Envelope envelope, final EventStream events .map(enveloper.withMetadataFrom(jsonEnvelope))); } - - private void linkBoxworkHearingToFirstHearing (final Envelope requestEnvelope) throws EventStreamException { - final Optional boxworkHearingId = getBoxworkHearingId(requestEnvelope); - - if (boxworkHearingId.isPresent() ) { - final UUID bxwHearingId = boxworkHearingId.get(); - final UUID firstHearingId = requestEnvelope.payload().getHearingId(); - final EventStream boxworkHearingEventStream = eventSource.getStreamById(bxwHearingId); - final HearingAggregate boxworkHearingAggregate = aggregateService.get(boxworkHearingEventStream, HearingAggregate.class); - - if (boxworkHearingAggregate.isLinkedToFirstHearing()) { - LOGGER.info("Boxwork hearing {} already linked to the first case hearing {}", boxworkHearingId, firstHearingId); - return; - } - - final Stream linkEvents = boxworkHearingAggregate.linkBoxworkHearing(bxwHearingId, firstHearingId); - - appendEventsToStream(requestEnvelope, boxworkHearingEventStream, linkEvents); - } - } - - private static Optional getBoxworkHearingId(final Envelope createHearingDefendantRequestEnvelope) { - return createHearingDefendantRequestEnvelope.payload().getDefendantRequests().stream() - .map(ListDefendantRequest::getSummonsApprovedOutcome) - .filter(Objects::nonNull) - .map(SummonsApprovedOutcome::getHearingId) - .filter(Objects::nonNull) - .findFirst(); - } } diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandler.java index faeb505ae7..f289cc9e3e 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandler.java @@ -60,26 +60,15 @@ public void amendSummonsData(final Envelope amendSummonsDataEn LOGGER.debug("progression.command.amend-summons-data {}", amendSummonsDataEnvelope); final AmendSummonsData requestSummons = amendSummonsDataEnvelope.payload(); - final UUID boxworkHearingId = requestSummons.getSummonsApprovedOutcome().getHearingId(); - final EventStream eventStream = eventSource.getStreamById(boxworkHearingId); - final HearingAggregate bwHearingAggregate = aggregateService.get(eventStream, HearingAggregate.class); + final UUID boxWorkHearingId = requestSummons.getHearingId(); + final EventStream eventStream = eventSource.getStreamById(boxWorkHearingId); - //Get linked hearing and invoke amend on that - final UUID firstHearingId = bwHearingAggregate.getBoxworkFirstHearingId(); - - if (firstHearingId == null) { - LOGGER.warn("Boxwork hearing {} has no linked first hearing, skipping amend", boxworkHearingId); - return; - } - - final EventStream fhEventStream = eventSource.getStreamById(firstHearingId); - final HearingAggregate hearingAggregate = aggregateService.get(fhEventStream, HearingAggregate.class); + final HearingAggregate hearingAggregate = aggregateService.get(eventStream, HearingAggregate.class); final Stream events = hearingAggregate.amendSummonsData(requestSummons.getSummonsApprovedOutcome()); if ( events != null) { - appendEventsToStream(amendSummonsDataEnvelope, fhEventStream, events); + appendEventsToStream(amendSummonsDataEnvelope, eventStream, events); } - } @Handles("progression.command.prepare-summons-data-for-extended-hearing") diff --git a/progression-command/progression-command-handler/src/raml/json/schema/progression.command.amend-summons-data.json b/progression-command/progression-command-handler/src/raml/json/schema/progression.command.amend-summons-data.json index 95da6a9316..213b7d0557 100644 --- a/progression-command/progression-command-handler/src/raml/json/schema/progression.command.amend-summons-data.json +++ b/progression-command/progression-command-handler/src/raml/json/schema/progression.command.amend-summons-data.json @@ -3,6 +3,9 @@ "id": "http://justice.gov.uk/core/courts/amend-summons-data.json", "type": "object", "properties": { + "hearingId": { + "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" + }, "summonsApprovedOutcome": { "$ref": "http://justice.gov.uk/core/courts/summonsApprovedOutcome.json" } diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandlerTest.java index 460fc6c9d9..3514320c42 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateHearingDefendantRequestHandlerTest.java @@ -6,8 +6,6 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -21,8 +19,6 @@ import uk.gov.justice.core.courts.CreateHearingDefendantRequest; import uk.gov.justice.core.courts.HearingDefendantRequestCreated; import uk.gov.justice.core.courts.ListDefendantRequest; -import uk.gov.justice.core.courts.SummonsApprovedOutcome; -import uk.gov.justice.core.progression.courts.BoxworkHearingLinked; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.eventsourcing.source.core.EventSource; @@ -33,7 +29,6 @@ import uk.gov.justice.services.messaging.Metadata; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; -import uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil; import uk.gov.moj.cpp.progression.aggregate.HearingAggregate; import java.util.Arrays; @@ -59,16 +54,12 @@ public class CreateHearingDefendantRequestHandlerTest { @Mock private EventStream eventStream; - @Mock - private EventStream boxworkEventStream; - @Mock private AggregateService aggregateService; @Spy private final Enveloper enveloper = EnveloperFactory.createEnveloperWithEvents( - HearingDefendantRequestCreated.class, - BoxworkHearingLinked.class); + HearingDefendantRequestCreated.class); @InjectMocks private CreateHearingDefendantRequestHandler handler; @@ -121,111 +112,4 @@ public void shouldHandleCommand() { )); } - @Test - public void shouldLinkBoxworkHearingToFirstHearingWhenSummonsApprovedOutcomePresent() throws EventStreamException { - final UUID firstHearingId = randomUUID(); - final UUID boxworkHearingId = randomUUID(); - - final HearingAggregate firstHearingAggregate = new HearingAggregate(); - final HearingAggregate boxworkHearingAggregate = new HearingAggregate(); - - when(eventSource.getStreamById(firstHearingId)).thenReturn(eventStream); - when(eventSource.getStreamById(boxworkHearingId)).thenReturn(boxworkEventStream); - when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(firstHearingAggregate); - when(aggregateService.get(boxworkEventStream, HearingAggregate.class)).thenReturn(boxworkHearingAggregate); - - final SummonsApprovedOutcome summonsApprovedOutcome = SummonsApprovedOutcome.summonsApprovedOutcome() - .withHearingId(boxworkHearingId) - .build(); - - final CreateHearingDefendantRequest payload = CreateHearingDefendantRequest.createHearingDefendantRequest() - .withHearingId(firstHearingId) - .withDefendantRequests(Arrays.asList(ListDefendantRequest.listDefendantRequest() - .withDefendantId(DEFENDANT_ID) - .withProsecutionCaseId(CASE_ID) - .withSummonsApprovedOutcome(summonsApprovedOutcome) - .build())) - .build(); - - final Metadata metadata = Envelope.metadataBuilder() - .withName("progression.command.create-hearing-defendant-request") - .withId(randomUUID()) - .build(); - - handler.handle(envelopeFrom(metadata, payload)); - - final Stream boxworkStream = verifyAppendAndGetArgumentFrom(boxworkEventStream); - assertThat(boxworkStream, streamContaining( - jsonEnvelope( - metadata().withName("progression.event.boxwork-hearing-linked"), - JsonEnvelopePayloadMatcher.payload().isJson(allOf( - withJsonPath("$.boxworkHearingId", is(boxworkHearingId.toString())), - withJsonPath("$.firstHearingId", is(firstHearingId.toString())) - ))) - )); - } - - @Test - public void shouldNotLinkBoxworkHearingWhenAlreadyLinked() throws EventStreamException { - final UUID firstHearingId = randomUUID(); - final UUID boxworkHearingId = randomUUID(); - - final HearingAggregate firstHearingAggregate = new HearingAggregate(); - final HearingAggregate boxworkHearingAggregate = new HearingAggregate(); - ReflectionUtil.setField(boxworkHearingAggregate, "firstHearingId", randomUUID()); - - when(eventSource.getStreamById(firstHearingId)).thenReturn(eventStream); - when(eventSource.getStreamById(boxworkHearingId)).thenReturn(boxworkEventStream); - when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(firstHearingAggregate); - when(aggregateService.get(boxworkEventStream, HearingAggregate.class)).thenReturn(boxworkHearingAggregate); - - final SummonsApprovedOutcome summonsApprovedOutcome = SummonsApprovedOutcome.summonsApprovedOutcome() - .withHearingId(boxworkHearingId) - .build(); - - final CreateHearingDefendantRequest payload = CreateHearingDefendantRequest.createHearingDefendantRequest() - .withHearingId(firstHearingId) - .withDefendantRequests(Arrays.asList(ListDefendantRequest.listDefendantRequest() - .withDefendantId(DEFENDANT_ID) - .withProsecutionCaseId(CASE_ID) - .withSummonsApprovedOutcome(summonsApprovedOutcome) - .build())) - .build(); - - final Metadata metadata = Envelope.metadataBuilder() - .withName("progression.command.create-hearing-defendant-request") - .withId(randomUUID()) - .build(); - - handler.handle(envelopeFrom(metadata, payload)); - - verify(boxworkEventStream, never()).append(any()); - } - - @Test - public void shouldNotAttemptBoxworkLinkingWhenNoSummonsApprovedOutcome() throws EventStreamException { - final UUID firstHearingId = randomUUID(); - final HearingAggregate firstHearingAggregate = new HearingAggregate(); - - when(eventSource.getStreamById(firstHearingId)).thenReturn(eventStream); - when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(firstHearingAggregate); - - final CreateHearingDefendantRequest payload = CreateHearingDefendantRequest.createHearingDefendantRequest() - .withHearingId(firstHearingId) - .withDefendantRequests(Arrays.asList(ListDefendantRequest.listDefendantRequest() - .withDefendantId(DEFENDANT_ID) - .withProsecutionCaseId(CASE_ID) - .build())) - .build(); - - final Metadata metadata = Envelope.metadataBuilder() - .withName("progression.command.create-hearing-defendant-request") - .withId(randomUUID()) - .build(); - - handler.handle(envelopeFrom(metadata, payload)); - - verify(boxworkEventStream, never()).append(any()); - } - } \ No newline at end of file diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandlerTest.java index 23c4a3bcbe..886a85c596 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/PrepareSummonsDataHandlerTest.java @@ -1,6 +1,5 @@ package uk.gov.moj.cpp.progression.handler; -import static com.google.common.collect.ImmutableList.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.Collections.singletonList; @@ -9,14 +8,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.core.courts.AmendSummonsData.amendSummonsData; import static uk.gov.justice.core.courts.CourtApplicationPartyListingNeeds.courtApplicationPartyListingNeeds; import static uk.gov.justice.core.courts.CourtCentre.courtCentre; import static uk.gov.justice.core.courts.PrepareSummonsData.prepareSummonsData; -import static uk.gov.justice.core.courts.SummonsApprovedOutcome.summonsApprovedOutcome; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.helper.EventStreamMockHelper.verifyAppendAndGetArgumentFrom; @@ -27,13 +22,9 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; -import uk.gov.justice.core.courts.AmendSummonsData; import uk.gov.justice.core.courts.ConfirmedProsecutionCaseId; -import uk.gov.justice.core.courts.Hearing; -import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.core.courts.ListDefendantRequest; import uk.gov.justice.core.courts.PrepareSummonsData; -import uk.gov.justice.core.courts.SummonsApprovedOutcome; import uk.gov.justice.core.courts.SummonsDataPrepared; import uk.gov.justice.services.common.converter.ZonedDateTimes; import uk.gov.justice.services.common.util.UtcClock; @@ -75,9 +66,6 @@ public class PrepareSummonsDataHandlerTest { @Mock private EventStream eventStream; - @Mock - private EventStream firstHearingEventStream; - @Mock private AggregateService aggregateService; @@ -211,85 +199,4 @@ public void shouldHandleAmendSummonsDataCommand() { .thatHandles("progression.command.amend-summons-data") )); } - - @Test - public void shouldAmendSummonsDataWhenLinkedFirstHearingExists() throws EventStreamException { - final UUID boxworkHearingId = randomUUID(); - final UUID firstHearingId = randomUUID(); - - final HearingAggregate boxworkAggregate = new HearingAggregate(); - ReflectionUtil.setField(boxworkAggregate, "firstHearingId", firstHearingId); - - final HearingAggregate firstHearingAggregate = new HearingAggregate(); - final java.util.ArrayList mutableList = new java.util.ArrayList<>(); - mutableList.add(ListDefendantRequest.listDefendantRequest() - .withDefendantId(DEFENDANT_ID) - .withProsecutionCaseId(CASE_ID) - .build()); - ReflectionUtil.setField(firstHearingAggregate, "listDefendantRequests", mutableList); - ReflectionUtil.setField(firstHearingAggregate, "isSummonsAlreadyApproved", true); - ReflectionUtil.setField(firstHearingAggregate, "hearing", - Hearing.hearing().withCourtCentre(courtCentre().withId(COURT_CENTRE_ID).withCode("courtCode").build()) - .withHearingDays(of(HearingDay.hearingDay().withSittingDay(ZonedDateTime.now()).build())) - .build()); - - when(eventSource.getStreamById(boxworkHearingId)).thenReturn(eventStream); - when(eventSource.getStreamById(firstHearingId)).thenReturn(firstHearingEventStream); - when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(boxworkAggregate); - when(aggregateService.get(firstHearingEventStream, HearingAggregate.class)).thenReturn(firstHearingAggregate); - - final SummonsApprovedOutcome summonsApprovedOutcome = summonsApprovedOutcome() - .withHearingId(boxworkHearingId) - .withPersonalService(true) - .withSummonsSuppressed(false) - .build(); - - final AmendSummonsData amendPayload = amendSummonsData() - .withSummonsApprovedOutcome(summonsApprovedOutcome) - .build(); - - final Metadata metadata = Envelope.metadataBuilder() - .withName("progression.command.amend-summons-data") - .withId(randomUUID()) - .build(); - - handler.amendSummonsData(envelopeFrom(metadata, amendPayload)); - - final Stream envelopeStream = verifyAppendAndGetArgumentFrom(firstHearingEventStream); - assertThat(envelopeStream, streamContaining( - jsonEnvelope( - metadata().withName("progression.event.summons-data-prepared"), - payload().isJson(allOf( - withJsonPath("$.summonsData.listDefendantRequests[0].defendantId", is(DEFENDANT_ID.toString())), - withJsonPath("$.isSummonsAmended", is(true)) - ))) - )); - } - - @Test - public void shouldSkipAmendSummonsDataWhenNoLinkedFirstHearing() throws EventStreamException { - final UUID boxworkHearingId = randomUUID(); - - final HearingAggregate boxworkAggregate = new HearingAggregate(); - - when(eventSource.getStreamById(boxworkHearingId)).thenReturn(eventStream); - when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(boxworkAggregate); - - final SummonsApprovedOutcome summonsApprovedOutcome = summonsApprovedOutcome() - .withHearingId(boxworkHearingId) - .build(); - - final AmendSummonsData amendPayload = amendSummonsData() - .withSummonsApprovedOutcome(summonsApprovedOutcome) - .build(); - - final Metadata metadata = Envelope.metadataBuilder() - .withName("progression.command.amend-summons-data") - .withId(randomUUID()) - .build(); - - handler.amendSummonsData(envelopeFrom(metadata, amendPayload)); - - verify(firstHearingEventStream, never()).append(any()); - } -} \ No newline at end of file +} diff --git a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ApplicationAggregate.java b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ApplicationAggregate.java index 90c6d143d8..dc461d3dfe 100644 --- a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ApplicationAggregate.java +++ b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ApplicationAggregate.java @@ -805,7 +805,7 @@ public Stream approveSummons(final SummonsApprovedOutcome summonsApprove streams.add(courtApplicationSummonsApproved() .withApplicationId(courtApplication.getId()) .withLinkType(courtApplication.getType().getLinkType()) - .withIsSummonsAmended(summonsPreviouslyApproved) + .withIsSummonsAmended(summonsPreviouslyApproved || LISTED.equals(this.applicationStatus)) .withCaseIds(getCaseIds()) .withSummonsApprovedOutcome(summonsApprovedOutcome) .build()); diff --git a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregate.java b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregate.java index 007a54c8cf..202d696696 100644 --- a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregate.java +++ b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregate.java @@ -27,7 +27,6 @@ import static uk.gov.justice.core.courts.ProsecutionCasesResulted.prosecutionCasesResulted; import static uk.gov.justice.core.courts.SummonsData.summonsData; import static uk.gov.justice.core.courts.SummonsDataPrepared.summonsDataPrepared; -import static uk.gov.justice.core.progression.courts.BoxworkHearingLinked.boxworkHearingLinked; import static uk.gov.justice.domain.aggregate.matcher.EventSwitcher.match; import static uk.gov.justice.domain.aggregate.matcher.EventSwitcher.otherwiseDoNothing; import static uk.gov.justice.domain.aggregate.matcher.EventSwitcher.when; @@ -48,7 +47,6 @@ import static uk.gov.moj.cpp.progression.util.ReportingRestrictionHelper.dedupReportingRestrictions; import uk.gov.justice.core.courts.*; -import uk.gov.justice.core.progression.courts.BoxworkHearingLinked; import uk.gov.justice.core.progression.courts.HearingForApplicationCreated; import uk.gov.justice.core.progression.courts.HearingForApplicationCreatedV2; import uk.gov.justice.cpp.progression.events.NewDefendantAddedToHearing; @@ -139,7 +137,7 @@ public class HearingAggregate implements Aggregate { private boolean duplicate; private boolean deleted; private boolean isSummonsAlreadyApproved; - private UUID firstHearingId; + private CommittingCourt committingCourt; private Map hasNextHearingForHearingDay = new HashMap<>(); private Map relatedHearingUpdatedMap = new HashMap<>(); @@ -332,7 +330,6 @@ public Object apply(final Object event) { when(AllCourtDocumentsShared.class).apply(this::updateAllCourtDocumentsShared), when(CaseAddedToHearingBdf.class).apply(this::handleCaseAddedToHearingBdf), when(ApplicationRepOrderUpdatedForHearing.class).apply(this::handleApplicationRepOrderUpdatedForHearing), - when(BoxworkHearingLinked.class).apply(e -> this.firstHearingId = e.getFirstHearingId()), when(SummonsDataPrepared.class).apply(this::handleSummonsDataPrepared), otherwiseDoNothing()); } @@ -851,15 +848,6 @@ public boolean isResulted() { return HearingListingStatus.HEARING_RESULTED.equals(this.hearingListingStatus); } - public Stream linkBoxworkHearing(final UUID boxworkHearingId, final UUID firstCaseHearingId) { - LOGGER.debug("Linking boxwork hearing {} to first case hearing {}.", boxworkHearingId, firstCaseHearingId); - - return apply(Stream.of(boxworkHearingLinked() - .withFirstHearingId(firstCaseHearingId) - .withBoxworkHearingId(boxworkHearingId) - .build())); - } - public Stream createHearingDefendantRequest(final List listDefendantRequests) { LOGGER.debug("List Defendant Request is being created."); return apply(Stream.of(hearingDefendantRequestCreated().withDefendantRequests(listDefendantRequests).build())); @@ -3752,12 +3740,4 @@ private void handleSummonsDataPrepared(final SummonsDataPrepared summonsDataPrep this.isSummonsAlreadyApproved = true; } } - - public boolean isLinkedToFirstHearing() { - return nonNull(this.firstHearingId); - } - - public UUID getBoxworkFirstHearingId() { - return firstHearingId; - } -} \ No newline at end of file +} diff --git a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregateTest.java b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregateTest.java index 6f47e21644..5a57d41912 100644 --- a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregateTest.java +++ b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/HearingAggregateTest.java @@ -5,12 +5,10 @@ import static com.jayway.jsonassert.impl.matcher.IsEmptyCollection.empty; import static java.nio.charset.Charset.defaultCharset; import static java.util.Arrays.asList; -import static java.util.Collections.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toList; import static org.apache.commons.io.FileUtils.readFileToString; import static org.hamcrest.CoreMatchers.equalTo; @@ -28,7 +26,6 @@ import static uk.gov.moj.cpp.progression.test.CoreTestTemplates.defaultArguments; import uk.gov.justice.core.courts.*; -import uk.gov.justice.core.progression.courts.BoxworkHearingLinked; import uk.gov.justice.core.progression.courts.HearingForApplicationCreatedV2; import uk.gov.justice.listing.courts.ListNextHearingsV3; import uk.gov.justice.progression.courts.ApplicationsResulted; @@ -47,9 +44,6 @@ import uk.gov.justice.progression.courts.RelatedHearingUpdated; import uk.gov.justice.progression.courts.RelatedHearingUpdatedForAdhocHearing; import uk.gov.justice.progression.courts.ReplayHearingConfirmed; -import uk.gov.justice.progression.courts.ReplayHearingConfirmed; -import uk.gov.justice.progression.courts.RelatedHearingUpdatedForAdhocHearing; -import uk.gov.justice.progression.courts.ReplayHearingConfirmed; import uk.gov.justice.progression.courts.UpdateRelatedHearingCommand; import uk.gov.justice.progression.courts.VejDeletedHearingPopulatedToProbationCaseworker; import uk.gov.justice.progression.courts.VejHearingPopulatedToProbationCaseworker; @@ -80,14 +74,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.TreeSet; import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -100,10 +92,9 @@ import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; - -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; @@ -6807,41 +6798,6 @@ private List getDuplicateCourtApplications() { return courtApplicationList; } - @Test - public void shouldLinkBoxworkHearingAndProduceBoxworkHearingLinkedEvent() { - final UUID boxworkHearingId = randomUUID(); - final UUID firstHearingId = randomUUID(); - - final List events = hearingAggregate.linkBoxworkHearing(boxworkHearingId, firstHearingId).collect(toList()); - - assertThat(events.size(), is(1)); - assertThat(events.get(0), Matchers.instanceOf(BoxworkHearingLinked.class)); - final BoxworkHearingLinked event = (BoxworkHearingLinked) events.get(0); - assertThat(event.getBoxworkHearingId(), is(boxworkHearingId)); - assertThat(event.getFirstHearingId(), is(firstHearingId)); - } - - @Test - public void shouldReturnFalseForIsLinkedToFirstHearingWhenNotLinked() { - assertThat(hearingAggregate.isLinkedToFirstHearing(), is(false)); - } - - @Test - public void shouldReturnTrueForIsLinkedToFirstHearingAfterLinkingBoxworkHearing() { - final UUID boxworkHearingId = randomUUID(); - final UUID firstHearingId = randomUUID(); - - hearingAggregate.linkBoxworkHearing(boxworkHearingId, firstHearingId).collect(toList()); - - assertThat(hearingAggregate.isLinkedToFirstHearing(), is(true)); - assertThat(hearingAggregate.getBoxworkFirstHearingId(), is(firstHearingId)); - } - - @Test - public void shouldReturnNullForGetBoxworkFirstHearingIdWhenNotLinked() { - assertThat(hearingAggregate.getBoxworkFirstHearingId(), is(nullValue())); - } - @Test public void shouldAmendSummonsDataAndProduceSummonsDataPreparedEvent() { final UUID defendantId = randomUUID(); @@ -6862,7 +6818,6 @@ public void shouldAmendSummonsDataAndProduceSummonsDataPreparedEvent() { .build()); final SummonsApprovedOutcome summonsApprovedOutcome = SummonsApprovedOutcome.summonsApprovedOutcome() - .withHearingId(boxworkHearingId) .withPersonalService(true) .withSummonsSuppressed(false) .build(); @@ -6881,7 +6836,6 @@ public void shouldReturnEmptyStreamFromAmendSummonsDataWhenNoListDefendantReques setField(hearingAggregate, "isSummonsAlreadyApproved", true); final SummonsApprovedOutcome summonsApprovedOutcome = SummonsApprovedOutcome.summonsApprovedOutcome() - .withHearingId(randomUUID()) .build(); final List events = hearingAggregate.amendSummonsData(summonsApprovedOutcome).collect(toList()); diff --git a/progression-domain/progression-domain-message/src/raml/json/schema/progression.event.boxwork-hearing-linked.json b/progression-domain/progression-domain-message/src/raml/json/schema/progression.event.boxwork-hearing-linked.json deleted file mode 100644 index e05265f435..0000000000 --- a/progression-domain/progression-domain-message/src/raml/json/schema/progression.event.boxwork-hearing-linked.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://justice.gov.uk/core/progression/courts/boxwork-hearing-linked.json", - "type": "object", - "description": "Link boxwork hearing to first case hearing", - "properties": { - "firstHearingId": { - "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" - }, - "boxworkHearingId": { - "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" - } - }, - "required": [ - "firstHearingId", - "boxworkHearingId" - ], - "additionalProperties": false -} diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java index 9d0551dfa7..5139616df1 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java @@ -41,7 +41,6 @@ public class SummonsHelper { private static final String PROSECUTOR_EMAIL_ADDRESS = "prosecutorEmailAddress"; private static final String REASONS = "reasons"; private static final String APPLICATION_ID = "applicationId"; - private static final String HEARING_ID = "hearingId"; private static final String REASONS_FOR_REJECTION = "reasonsForRejection"; private static final String PROSECUTION_COSTS = "prosecutionCosts"; private static final String THIS_SUMMONS_WILL_BE_SERVED_BY_A_PROSECUTOR = "thisSummonsWillBeServedByAProsecutor"; @@ -65,7 +64,7 @@ public void initiateSummonsProcess(final JsonEnvelope event, final Hearing heari if (isNotEmpty(courtApplications)) { courtApplications.forEach(courtApplication -> { if (isNotEmpty(summonsApprovedJudicialResults)) { - final JsonObject summonsApprovedPayload = createSummonsApprovedJsonObject(courtApplication, summonsApprovedJudicialResults, hearing.getId()); + final JsonObject summonsApprovedPayload = createSummonsApprovedJsonObject(courtApplication, summonsApprovedJudicialResults); sendSummonsCommand(event, summonsApprovedPayload, PROGRESSION_COMMAND_APPROVE_APPLICATION_SUMMONS); } if (isEmpty(summonsApprovedJudicialResults) && isNotEmpty(summonsRejectedJudicialResults)) { @@ -91,13 +90,11 @@ private JsonObject createSummonsRejectedJsonObject(final CourtApplication courtA ).build(); } - private JsonObject createSummonsApprovedJsonObject(final CourtApplication courtApplication, final List summonsApprovedJudicialResults, final UUID hearingId) { + private JsonObject createSummonsApprovedJsonObject(final CourtApplication courtApplication, final List summonsApprovedJudicialResults) { final List judicialResultPrompts = summonsApprovedJudicialResults.get(0).getJudicialResultPrompts(); return createObjectBuilder() .add(APPLICATION_ID, courtApplication.getId().toString()) .add("summonsApprovedOutcome", createObjectBuilder() - .add(APPLICATION_ID, courtApplication.getId().toString()) - .add(HEARING_ID, hearingId.toString()) .add(PROSECUTOR_COST, getPromptValue(judicialResultPrompts, PROSECUTION_COSTS)) .add(SUMMONS_SUPPRESSED, getPromptValue(judicialResultPrompts, THIS_SUMMONS_WILL_BE_SERVED_BY_A_PROSECUTOR).equalsIgnoreCase(TRUE)) .add(PERSONAL_SERVICE, getPromptValue(judicialResultPrompts, THIS_SUMMONS_IS_FOR_PERSONAL_SERVICE).equalsIgnoreCase(TRUE)) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java index a112a9918f..24a413e3fa 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java @@ -77,6 +77,7 @@ import uk.gov.justice.core.courts.SummonsTemplateType; import uk.gov.justice.core.courts.SummonsType; import uk.gov.justice.hearing.courts.Initiate; +import uk.gov.justice.progression.courts.Hearings; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; import uk.gov.justice.services.core.annotation.Handles; @@ -154,6 +155,7 @@ public class CourtApplicationProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(CourtApplicationProcessor.class.getCanonicalName()); public static final String HEARING_ID = "hearingId"; + public static final String HEARINGS = "hearings"; public static final String PUBLIC_PROGRESSION_EVENTS_BREACH_APPLICATIONS_TO_BE_ADDED_TO_HEARING = "public.progression.breach-applications-to-be-added-to-hearing"; public static final String INACTIVE = "INACTIVE"; private static final String PROGRESSION_COMMAND_UPDATE_HEARING_APPLICATION_DEFENDANT = "progression.command.update.hearing.application.defendant"; @@ -623,24 +625,53 @@ public void courtApplicationSummonsApproved(final JsonEnvelope event) { courtApplicationSummonsApproved.getIsSummonsAmended()); } + final UUID caseId = courtApplicationSummonsApproved.getCaseIds().get(0); + if (Boolean.TRUE.equals(courtApplicationSummonsApproved.getIsSummonsAmended())) { - LOGGER.info("Firing summons amendment requested for application: {} - summonsApprovedOutcome: {}", courtApplicationSummonsApproved.getApplicationId(), courtApplicationSummonsApproved.getSummonsApprovedOutcome()); - final JsonObject amendmentRequestPayload = createObjectBuilder() - .add(SUMMONS_APPROVED_OUTCOME, objectToJsonObjectConverter.convert(courtApplicationSummonsApproved.getSummonsApprovedOutcome())) - .build(); - sender.send(envelop(amendmentRequestPayload).withName(PROGRESSION_COMMAND_AMEND_SUMMONS_DATA).withMetadataFrom(event)); + final Optional firstHearingId = getFirstHearingId(caseId); + + if(firstHearingId.isPresent()) { + LOGGER.info("Firing summons amendment requested for application: {} - summonsApprovedOutcome: {}", courtApplicationSummonsApproved.getApplicationId(), courtApplicationSummonsApproved.getSummonsApprovedOutcome()); + final JsonObject amendmentRequestPayload = createObjectBuilder() + .add(HEARING_ID, firstHearingId.get().toString()) + .add(SUMMONS_APPROVED_OUTCOME, objectToJsonObjectConverter.convert(courtApplicationSummonsApproved.getSummonsApprovedOutcome())) + .build(); + + sender.send(envelop(amendmentRequestPayload).withName(PROGRESSION_COMMAND_AMEND_SUMMONS_DATA).withMetadataFrom(event)); + } else { + LOGGER.warn("No first hearing found for case : {}", caseId); + } } else if (courtApplicationSummonsApproved.getLinkType() == LinkType.FIRST_HEARING) { final PublicProgressionCourtApplicationSummonsApproved summonsApprovedPublicEventPayload = PublicProgressionCourtApplicationSummonsApproved.publicProgressionCourtApplicationSummonsApproved() .withSummonsApprovedOutcome(courtApplicationSummonsApproved.getSummonsApprovedOutcome()) .withId(courtApplicationSummonsApproved.getApplicationId()) - .withProsecutionCaseId(courtApplicationSummonsApproved.getCaseIds().get(0)) + .withProsecutionCaseId(caseId) .build(); sender.send(envelop(summonsApprovedPublicEventPayload).withName(PUBLIC_PROGRESSION_COURT_APPLICATION_SUMMONS_APPROVED).withMetadataFrom(event)); } } + private Optional getFirstHearingId(final UUID caseId) { + final Optional caseHearingsResponse = progressionService.getCaseHearings(caseId.toString()); + + if (caseHearingsResponse.isPresent()) { + final Optional firstHearings = caseHearingsResponse.get().getJsonArray(HEARINGS). + getValuesAs(JsonObject.class).stream().map(hearing -> + jsonObjectToObjectConverter.convert(hearing, Hearings.class)).findFirst(); + + if (firstHearings.isPresent()) { + final Hearings hearings = firstHearings.get(); + + LOGGER.info("Found first hearing {} for the case : {}", hearings.getId(), caseId); + return ofNullable(hearings.getId()); + } + } + + return Optional.empty(); + } + @Handles("progression.event.court-application-summons-rejected") public void courtApplicationSummonsRejected(final JsonEnvelope jsonEnvelope) { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java index ad56e85c95..1dfc7c2aeb 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java @@ -85,7 +85,6 @@ import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -150,7 +149,6 @@ public void setUp() { initialiseDefendantDetails(); } - @Disabled @MethodSource("firstHearingSummonsSpecifications") @ParameterizedTest public void shouldGenerateSummonsPayloadForFirstHearingWhenNotSuppressed(final String summonsCode, final String summonsType, final String templateName, final boolean isYouth, final int numberOfDocuments, final boolean isWelsh) throws IOException { @@ -173,7 +171,6 @@ public void shouldGenerateSummonsPayloadForFirstHearingWhenNotSuppressed(final S } } - @Disabled @MethodSource("firstHearingAddDefendantSummonsSpecifications") @ParameterizedTest public void shouldGenerateSummonsForAddedDefendant(final String summonsCode, final String summonsType, final String templateName, final boolean isYouth, final int numberOfDocuments) throws IOException { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/SummonsApprovedAmendedToRejectedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/SummonsApprovedAmendedToRejectedIT.java index 78b7ce5b4d..db5f856ead 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/SummonsApprovedAmendedToRejectedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/SummonsApprovedAmendedToRejectedIT.java @@ -56,6 +56,7 @@ import io.restassured.path.json.JsonPath; import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -130,6 +131,7 @@ public void setUp() { * when the court user amends SA to SR and re-shares, * then the prosecutor must receive a rejection email notification. */ + @Disabled @ParameterizedTest @MethodSource("summonsApprovedAmendedToRejectedParameters") public void shouldNotifyProsecutorWhenSummonsApprovedIsAmendedToRejected( @@ -163,6 +165,7 @@ public void shouldNotifyProsecutorWhenSummonsApprovedIsAmendedToRejected( * AC1 — edge case: re-sharing a boxwork hearing with SR when no prior approval exists * (straight rejection without a previous SA) must also notify the prosecutor. */ + @Disabled @ParameterizedTest @MethodSource("summonsApprovedAmendedToRejectedParameters") public void shouldNotifyProsecutorWhenSummonsIsRejectedWithoutPriorApproval(