Skip to content

SPRDT-874: Adjournment CROWN journey updates #318

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

Open
ragubalan wants to merge 2 commits into
base: team/ccsph2
Choose a base branch
from
Open

SPRDT-874: Adjournment CROWN journey updates #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f9b13c
SPRDT-874: Adjournment CROWN journey updates
ragubalan May 21, 2026
65cce48
SPRDT-874: pom version updated
ragubalan May 21, 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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<access.control.version>6.4.1</access.control.version>
<referencedata.version>17.103.131</referencedata.version>
<listing.version>17.103.163</listing.version>
<hearing.version>17.0.149</hearing.version>
<hearing.version>17.104.168</hearing.version>
<usersgroups.version>17.104.49</usersgroups.version>
<defence.version>17.0.85</defence.version>
<referencedata.offence.version>17.103.42</referencedata.offence.version>
Expand Down
18 changes: 12 additions & 6 deletions ...c/main/java/uk/gov/moj/cpp/progression/helper/UnscheduledCourtHearingListTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ private Optional<HearingUnscheduledListingNeeds> transformCourtApplication(final
// judicialResult.nextHearing.estimatedMinutes — not on the parent Hearing.
final Integer estimatedMinutes = judicialResultWithNextHearing.get().getNextHearing().getEstimatedMinutes();

final UUID bookingReference = judicialResultWithNextHearing.get().getNextHearing().getBookingReference();

final HearingUnscheduledListingNeeds hearingListingNeeds = createHearingListingNeeds(hearing, typeOfList, jurisdictionType, hearing.getProsecutionCases(),
Arrays.asList(createCourtApplication(courtApplication, judicialResultWithNextHearing.get())), hearingType, courtCentre, estimatedMinutes);
Arrays.asList(createCourtApplication(courtApplication, judicialResultWithNextHearing.get())), hearingType, courtCentre, estimatedMinutes, bookingReference);

LOGGER.info("Unscheduled listing (nextHearing) New HearingId: {} created with typeOfList {} , jurisdictionType {} ," +
"hearingType {} , courtCentre {} from court application {} in HearingId: {}.",
Expand All @@ -124,7 +126,7 @@ private Optional<HearingUnscheduledListingNeeds> transformCourtApplication(final
// No next hearing → no duration to forward; null lets the listing-side fallback into action
// (HearingDurationDefaults) substitute a sane default.
final HearingUnscheduledListingNeeds hearingListingNeeds = createHearingListingNeeds(hearing, typeOfList, jurisdictionType, hearing.getProsecutionCases(),
Arrays.asList(createCourtApplication(courtApplication, judicialResultWithUnscheduledFlag.get())), hearingType, hearing.getCourtCentre(), null);
Arrays.asList(createCourtApplication(courtApplication, judicialResultWithUnscheduledFlag.get())), hearingType, hearing.getCourtCentre(), null, null);

LOGGER.info("Unscheduled listing (result) New HearingId: {} created with typeOfList {} , jurisdictionType {} ," +
"hearingType {} , courtCentre {} from court application {} in HearingId: {}.",
Expand Down Expand Up @@ -210,7 +212,7 @@ private Optional<HearingUnscheduledListingNeeds> mergeListingNeedsWithSameTypeOf
if (unscheduledListingNeeds.isPresent()) {
return Optional.of(createHearingListingNeeds(originalHearing, unscheduledListingNeeds.get().getTypeOfList(), unscheduledListingNeeds.get().getJurisdictionType(),
Arrays.asList(pc), null, unscheduledListingNeeds.get().getType(), unscheduledListingNeeds.get().getCourtCentre(),
unscheduledListingNeeds.get().getEstimatedMinutes()));
unscheduledListingNeeds.get().getEstimatedMinutes(), unscheduledListingNeeds.get().getBookingReference()));
}
return Optional.empty();
}
Expand All @@ -232,8 +234,10 @@ private Optional<HearingUnscheduledListingNeeds> transformDefendantOffence(final
// judicialResult.nextHearing.estimatedMinutes — not on the parent Hearing.
final Integer estimatedMinutes = judicialResultWithNextHearing.get().getNextHearing().getEstimatedMinutes();

final UUID bookingReference = judicialResultWithNextHearing.get().getNextHearing().getBookingReference();

final HearingUnscheduledListingNeeds hearingUnscheduledListingNeeds = createHearingListingNeeds(originalHearing, typeOfList, jurisdictionType,
Arrays.asList(pc), null, hearingType, courtCentre, estimatedMinutes);
Arrays.asList(pc), null, hearingType, courtCentre, estimatedMinutes, bookingReference);

LOGGER.info("Unscheduled listing (nextHearing) New HearingId: {} created with typeOfList {} , jurisdictionType {} ," +
"hearingType {} , courtCentre {} from court application {} in HearingId: {}.",
Expand All @@ -253,7 +257,7 @@ private Optional<HearingUnscheduledListingNeeds> transformDefendantOffence(final
final HearingType hearingType = HearingType.hearingType().withId(HEARING_TYPE_HRG_ID).withDescription(HEARING_TYPE_HRG_DESC).build();

final HearingUnscheduledListingNeeds hearingUnscheduledListingNeeds = createHearingListingNeeds(originalHearing, typeOfList, jurisdictionType,
Arrays.asList(pc), null, hearingType, originalHearing.getCourtCentre(), null);
Arrays.asList(pc), null, hearingType, originalHearing.getCourtCentre(), null, null);

LOGGER.info("Unscheduled listing (result) New HearingId: {} created with typeOfList {} , jurisdictionType {} ," +
"hearingType {} , courtCentre {} from court application {} in HearingId: {}.",
Expand Down Expand Up @@ -338,7 +342,8 @@ private HearingUnscheduledListingNeeds createHearingListingNeeds(final Hearing h
final JurisdictionType jurisdictionType,
final List<ProsecutionCase> prosecutionCases,
final List<CourtApplication> courtApplications, final HearingType hearingType, final CourtCentre courtCentre,
final Integer estimatedMinutes) {
final Integer estimatedMinutes,
final UUID bookingReference) {

// SPRDT-831: forward the user-typed estimatedMinutes Integer sourced from
// judicialResult.nextHearing.estimatedMinutes. Mirrors the allocated-listings pattern in
Expand All @@ -348,6 +353,7 @@ private HearingUnscheduledListingNeeds createHearingListingNeeds(final Hearing h
// the SPRDT-806/807 "never 0 / never null" guarantee.
return HearingUnscheduledListingNeeds.hearingUnscheduledListingNeeds()
.withId(UUID.randomUUID())
.withBookingReference(bookingReference)
.withTypeOfList(typeOfList)
.withReportingRestrictionReason(hearing.getReportingRestrictionReason())
.withProsecutionCases(prosecutionCases)
Expand Down
58 changes: 58 additions & 0 deletions ...st/java/uk/gov/moj/cpp/progression/helper/UnscheduledCourtHearingListTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,5 +645,63 @@ private JudicialResult resultWithNextHearingDateTobeFixed() {
.build();
}

private JudicialResult resultWithNextHearingDateTobeFixedAndBookingReference(final UUID bookingReference) {
return JudicialResult.judicialResult()
.withIsUnscheduled(false)
.withJudicialResultTypeId(UnscheduledCourtHearingListTransformer.RESULT_DEFINITION_NHCCS)
.withNextHearing(NextHearing.nextHearing()
.withDateToBeFixed(true)
.withBookingReference(bookingReference)
.withType(HearingType.hearingType().withId(randomUUID()).withDescription("desc").build())
.withCourtCentre(CourtCentre.courtCentre().withId(randomUUID()).build())
.build())
.withLabel(NHCCS_LABEL)
.build();
}

@Test
public void shouldPropagateBookingReferenceFromNextHearingOnOffencePath() {
final UUID bookingReference = randomUUID();
final JudicialResult result = resultWithNextHearingDateTobeFixedAndBookingReference(bookingReference);
final Offence offence = createOffenceWithJR(asList(result));
final Hearing hearing = createHearingWithOffences(asList(offence));

final List<HearingUnscheduledListingNeeds> unscheduledListingNeedsList = unscheduledCourtHearingListTransformer.transformHearing(hearing);

assertThat(unscheduledListingNeedsList.size(), is(1));
assertThat(unscheduledListingNeedsList.get(0).getBookingReference(), is(bookingReference));
}

@Test
public void shouldPropagateBookingReferenceFromNextHearingOnApplicationPath() {
final UUID bookingReference = randomUUID();
final JudicialResult result = resultWithNextHearingDateTobeFixedAndBookingReference(bookingReference);

final CourtApplication courtApplication = CourtApplication.courtApplication()
.withId(randomUUID())
.withJudicialResults(asList(result))
.build();
final Hearing hearing = Hearing.hearing()
.withJurisdictionType(JurisdictionType.MAGISTRATES)
.withCourtApplications(asList(courtApplication))
.build();

final List<HearingUnscheduledListingNeeds> unscheduledListingNeedsList = unscheduledCourtHearingListTransformer.transformHearing(hearing);

assertThat(unscheduledListingNeedsList.size(), is(1));
assertThat(unscheduledListingNeedsList.get(0).getBookingReference(), is(bookingReference));
}

@Test
public void shouldNotSetBookingReferenceWhenJudicialResultHasUnscheduledFlagOnly() {
final Offence offence = createOffenceWithJR(asList(wofnResult()));
final Hearing hearing = createHearingWithOffences(asList(offence));

final List<HearingUnscheduledListingNeeds> unscheduledListingNeedsList = unscheduledCourtHearingListTransformer.transformHearing(hearing);

assertThat(unscheduledListingNeedsList.size(), is(1));
assertThat(unscheduledListingNeedsList.get(0).getBookingReference(), is(nullValue()));
}


}
72 changes: 72 additions & 0 deletions ...a/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,23 @@
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static uk.gov.moj.cpp.progression.helper.TestHelper.buildNextHearing;
import static uk.gov.moj.cpp.progression.helper.TestHelper.buildNextHearingForApplication;
import static uk.gov.moj.cpp.progression.helper.TestHelper.buildProsecutionCase;
import static uk.gov.moj.cpp.progression.test.FileUtil.getPayload;

import uk.gov.justice.core.courts.CommittingCourt;
import uk.gov.justice.core.courts.CourtCentre;
import uk.gov.justice.core.courts.Defendant;
import uk.gov.justice.core.courts.Hearing;
import uk.gov.justice.core.courts.HearingListingNeeds;
import uk.gov.justice.core.courts.HearingType;
import uk.gov.justice.core.courts.JudicialResult;
import uk.gov.justice.core.courts.JurisdictionType;
import uk.gov.justice.core.courts.NextHearing;
import uk.gov.justice.core.courts.NextHearingsRequested;
import uk.gov.justice.core.courts.Offence;
import uk.gov.justice.core.courts.ProsecutionCase;
Expand Down Expand Up @@ -863,6 +868,73 @@ public void shouldReturnTwoHearingNeedsWhenTwoHearingTypeNotMatchWithBookingRefe
assertThat(defendant2.getOffences().get(0).getId(), equalTo(OFFENCE_ID_2));
}

@Test
public void shouldCarryBookingReferenceAndGroupOffencesWhenNhccNextHearingHasBookingReference() {
final Map<UUID, Set<UUID>> slotsMap = new HashMap<>();
slotsMap.put(BOOKING_REFERENCE_1, new HashSet<>(Arrays.asList(COURT_SCHEDULE_ID_1)));

when(provisionalBookingServiceAdapter.getSlots(anyList())).thenReturn(slotsMap);
when(offenceToCommittingCourtConverter.convert(any(), any(), any())).thenReturn(Optional.empty());

final Hearing hearing = TestHelper.buildHearing(Arrays.asList(
buildProsecutionCase(CASE_ID_1, DEFENDANT_ID_1, OFFENCE_ID_1,
buildNextHearing(HEARING_TYPE_1, BOOKING_REFERENCE_1, COURT_LOCATION, null, LISTED_START_DATETIME_1)),
buildProsecutionCase(CASE_ID_2, DEFENDANT_ID_2, OFFENCE_ID_2,
buildNextHearing(HEARING_TYPE_1, BOOKING_REFERENCE_1, COURT_LOCATION, null, LISTED_START_DATETIME_1))
));

final List<HearingListingNeeds> result = transformer.transform(hearing);

assertThat(result.size(), is(1));
final HearingListingNeeds needs = result.get(0);
assertThat(needs.getBookingReference(), equalTo(BOOKING_REFERENCE_1));
assertThat(needs.getProsecutionCases().size(), is(2));

final Optional<ProsecutionCase> case1 = needs.getProsecutionCases().stream().filter(pc -> pc.getId().equals(CASE_ID_1)).findFirst();
final Optional<ProsecutionCase> case2 = needs.getProsecutionCases().stream().filter(pc -> pc.getId().equals(CASE_ID_2)).findFirst();
assertThat(case1.isPresent(), is(true));
assertThat(case2.isPresent(), is(true));
assertThat(case1.get().getDefendants().get(0).getOffences().get(0).getId(), equalTo(OFFENCE_ID_1));
assertThat(case2.get().getDefendants().get(0).getOffences().get(0).getId(), equalTo(OFFENCE_ID_2));
}

@Test
public void shouldWarnAndSkipWhenNhccNextHearingBookingReferenceNotFoundInSlots() {
when(provisionalBookingServiceAdapter.getSlots(anyList())).thenReturn(new HashMap<>());

final Hearing hearing = TestHelper.buildHearing(Arrays.asList(
buildProsecutionCase(CASE_ID_1, DEFENDANT_ID_1, OFFENCE_ID_1,
buildNextHearing(HEARING_TYPE_1, BOOKING_REFERENCE_1, COURT_LOCATION, null, LISTED_START_DATETIME_1))
));

final List<HearingListingNeeds> result = transformer.transform(hearing);

assertThat(result.size(), is(0));
verify(logger).warn(any(String.class), eq(BOOKING_REFERENCE_1), eq(CASE_ID_1));
}

@Test
public void shouldSkipNhccsJudicialResultWithDateToBeFixedEvenWhenBookingReferenceIsPresent() {
final Map<UUID, Set<UUID>> slotsMap = new HashMap<>();
slotsMap.put(BOOKING_REFERENCE_1, new HashSet<>(Arrays.asList(COURT_SCHEDULE_ID_1)));
when(provisionalBookingServiceAdapter.getSlots(anyList())).thenReturn(slotsMap);

final NextHearing nhccsNextHearing = NextHearing.nextHearing()
.withDateToBeFixed(true)
.withBookingReference(BOOKING_REFERENCE_1)
.withType(HearingType.hearingType().withId(HEARING_TYPE_1).withDescription("desc").build())
.withCourtCentre(CourtCentre.courtCentre().withCourtHearingLocation(COURT_LOCATION).build())
.build();

final Hearing hearing = TestHelper.buildHearing(Arrays.asList(
buildProsecutionCase(CASE_ID_1, DEFENDANT_ID_1, OFFENCE_ID_1, nhccsNextHearing)
));

final List<HearingListingNeeds> result = transformer.transform(hearing);

assertThat(result.size(), is(0));
}

private JsonObject getHearing(final String path) {
return stringToJsonObjectConverter.convert(getPayload(path));
}
Expand Down
Loading