Skip to content

Dev/sprdt 874 : Adjournment CROWN journey updates #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ozturkmenb merged 5 commits into from
Jun 14, 2026
+1,135 −1
Merged

Dev/sprdt 874 : Adjournment CROWN journey updates #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a999031
SPRDT-874: Crown adjournment journey changes
ragubalan May 19, 2026
c206036
SPRDT-874: Tests updated
ragubalan May 19, 2026
9e1ece3
SPRDT-874: pom version updated
ragubalan May 19, 2026
30c2dc8
SPRDT-874: Tests were updated
ragubalan May 21, 2026
5a63853
Merge remote-tracking branch 'origin/team/ccsph2' into dev/SPRDT-874
ozturkmenb Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/test/java/uk/gov/moj/cpp/hearing/event/delegates/PublishResultsDelegateTreeMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public void shouldNotDisplayHiddenPrompts() {
.map(m ->m.getJudicialResultPromptTypeId().toString())
.collect(Collectors.toList());

assertThat(judicialResultPromptIds.size(), is(20));
assertThat(judicialResultPromptIds.size(), is(21));
assertTrue(judicialResultPromptIds.contains("2493a3a4-918a-4b83-b3c0-d221ff83d6fc"));

}
Expand Down
103 changes: 103 additions & 0 deletions .../src/test/java/uk/gov/moj/cpp/hearing/event/delegates/helper/NextHearingHelperV3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static java.util.stream.Collectors.toList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
Expand Down Expand Up @@ -200,6 +201,58 @@ public void shouldPopulateNextHearingForCrownCourtHearingFixedDate() {
assertValid(nextHearing, JurisdictionType.CROWN, ZonedDateTimes.fromString("2024-04-30T09:00Z"), "1 HOURS", hearingType, true);
}

@Test
public void shouldPopulateNextHearingForCrownCourtHearingWithBookingReference() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-crowncourt-booking-reference.json");

setupMocks(event, null);

final ResultDefinition resultDefinition = jsonObjectToObjectConverter
.convert(givenPayload("/data/resultdefinition-fbed768b-ee95-4434-87c8-e81cbc8d24c8.json"), ResultDefinition.class);

final ResultsSharedV3 resultsSharedV3 = jsonObjectToObjectConverter
.convert(event.payloadAsJsonObject(), ResultsSharedV3.class);

final List<ResultLine2> resultLine2s = getResultLines(resultsSharedV3);

final ResultLine2 resultLine = resultsSharedV3.getTargets().get(0).getResultLines().stream()
.filter(rl3 -> rl3.getResultLabel().equalsIgnoreCase("Next hearing in Crown Court"))
.findFirst().get();

final Optional<NextHearing> nextHearing = nextHearingHelperV3.getNextHearing(
event, resultDefinition, resultLine2s, resultLine,
getPrompts(resultsSharedV3, resultDefinition), resultsSharedV3, resultDefinitions);

assertValid(nextHearing, JurisdictionType.CROWN, ZonedDateTimes.fromString("2024-04-30T09:00Z"), "1 HOURS", hearingType, true);
assertThat(nextHearing.get().getBookingReference(), is(fromString("a8c9d1e2-f3b4-5678-90ab-cdef01234567")));
}

@Test
public void shouldReturnNullBookingReferenceForCrownCourtHearingWithoutBookingReferencePrompt() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-crowncourt-fixed-date.json");

setupMocks(event, null);

final ResultDefinition resultDefinition = jsonObjectToObjectConverter
.convert(givenPayload("/data/resultdefinition-fbed768b-ee95-4434-87c8-e81cbc8d24c8.json"), ResultDefinition.class);

final ResultsSharedV3 resultsSharedV3 = jsonObjectToObjectConverter
.convert(event.payloadAsJsonObject(), ResultsSharedV3.class);

final List<ResultLine2> resultLine2s = getResultLines(resultsSharedV3);

final ResultLine2 resultLine = resultsSharedV3.getTargets().get(0).getResultLines().stream()
.filter(rl3 -> rl3.getResultLabel().equalsIgnoreCase("Next hearing in Crown Court"))
.findFirst().get();

final Optional<NextHearing> nextHearing = nextHearingHelperV3.getNextHearing(
event, resultDefinition, resultLine2s, resultLine,
getPrompts(resultsSharedV3, resultDefinition), resultsSharedV3, resultDefinitions);

assertValid(nextHearing, JurisdictionType.CROWN, ZonedDateTimes.fromString("2024-04-30T09:00Z"), "1 HOURS", hearingType, true);
assertThat(nextHearing.get().getBookingReference(), is(nullValue()));
}

@Test
public void shouldPopulateNextHearingForCrownCourtHearingFixedDateWithoutTime() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-crowncourt-fixed-date_without_time.json");
Expand Down Expand Up @@ -242,6 +295,56 @@ public void shouldPopulateNextHearingForMagistrateCourtHearing() {
assertValid(nextHearing, JurisdictionType.MAGISTRATES, ZonedDateTimes.fromString("2024-04-30T22:30Z"), "20 MINUTES", firstHearingType, true);
}

@Test
public void shouldPopulateNextHearingForMagistrateCourtHearingWithBookingReference() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-magistratescourt-booking-reference.json");
setupMagsMocks(event, null);

final ResultsSharedV3 resultsSharedV3 = jsonObjectToObjectConverter
.convert(event.payloadAsJsonObject(), ResultsSharedV3.class);

final List<ResultLine2> resultLine2s = getResultLines(resultsSharedV3);

final ResultDefinition resultDefinition = jsonObjectToObjectConverter
.convert(givenPayload("/data/resultdefinition-70c98fa6-804d-11e8-adc0-fa7ae01bbebc.json"), ResultDefinition.class);

final ResultLine2 resultLine = resultsSharedV3.getTargets().get(0).getResultLines().stream()
.filter(rl3 -> rl3.getResultLabel().equalsIgnoreCase("Next hearing in magistrates' court"))
.findFirst().get();

final Optional<NextHearing> nextHearing = nextHearingHelperV3.getNextHearing(
event, resultDefinition, resultLine2s, resultLine,
getPrompts(resultsSharedV3, resultDefinition), resultsSharedV3, resultDefinitions);

assertValid(nextHearing, JurisdictionType.MAGISTRATES, ZonedDateTimes.fromString("2024-04-30T22:30Z"), "20 MINUTES", firstHearingType, true);
assertThat(nextHearing.get().getBookingReference(), is(fromString("b1c2d3e4-f5a6-7890-ab12-cd34ef567890")));
}

@Test
public void shouldReturnNullBookingReferenceForMagistrateCourtHearingWithoutBookingReferencePrompt() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-magistratescourt.json");
setupMagsMocks(event, null);

final ResultsSharedV3 resultsSharedV3 = jsonObjectToObjectConverter
.convert(event.payloadAsJsonObject(), ResultsSharedV3.class);

final List<ResultLine2> resultLine2s = getResultLines(resultsSharedV3);

final ResultDefinition resultDefinition = jsonObjectToObjectConverter
.convert(givenPayload("/data/resultdefinition-70c98fa6-804d-11e8-adc0-fa7ae01bbebc.json"), ResultDefinition.class);

final ResultLine2 resultLine = resultsSharedV3.getTargets().get(0).getResultLines().stream()
.filter(rl3 -> rl3.getResultLabel().equalsIgnoreCase("Next hearing in magistrates' court"))
.findFirst().get();

final Optional<NextHearing> nextHearing = nextHearingHelperV3.getNextHearing(
event, resultDefinition, resultLine2s, resultLine,
getPrompts(resultsSharedV3, resultDefinition), resultsSharedV3, resultDefinitions);

assertValid(nextHearing, JurisdictionType.MAGISTRATES, ZonedDateTimes.fromString("2024-04-30T22:30Z"), "20 MINUTES", firstHearingType, true);
assertThat(nextHearing.get().getBookingReference(), is(nullValue()));
}

@Test
public void shouldPopulateNextHearingForUnscheduled() {
final JsonEnvelope event = getJsonEnvelop("/data/hearing.results-shared-v3-with-nexthearing-crowncourt-date-tobe-fixed.json");
Expand Down
Loading
Loading