Skip to content

CAD-1339 fix bulk hearing when adjourned #361

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
rajkumarmeena merged 1 commit into from
Jun 4, 2026
Merged

CAD-1339 fix bulk hearing when adjourned #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ public void updateHearingListingStatusToSentForListingWithMultipleRequest(final
public void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonEnvelope, final ListNextHearingsV3 listNextHearings) {
final SeedingHearing seedingHearing = listNextHearings.getSeedingHearing();
listNextHearings.getHearings().forEach(hearingListingNeeds -> {
final Hearing hearing = transformHearingListingNeeds(hearingListingNeeds, seedingHearing, false, null);
final Hearing hearing = transformHearingListingNeeds(hearingListingNeeds, seedingHearing, hearingListingNeeds.getIsGroupProceedings(), hearingListingNeeds.getNumberOfGroupCases());

if (isNotEmpty(hearing.getProsecutionCases())) {
final JsonObjectBuilder hearingListingStatusCommandBuilder = Json.createObjectBuilder()
Expand Down
9 changes: 6 additions & 3 deletions .../java/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ private void transform(final ProsecutionCase prosecutionCase,
if (hearingListingNeedsMap.containsKey(key)) {
hearingListingNeeds = hearingListingNeedsMap.get(key);
} else {
hearingListingNeeds = createHearingListingNeeds(nextHearing, hearing.getJudiciary(), prosecutionCase.getIsGroupMaster());
hearingListingNeeds = createHearingListingNeeds(nextHearing, hearing.getJudiciary(), hearing.getIsGroupProceedings(), hearing.getNumberOfGroupCases());
hearingListingNeedsMap.put(key, hearingListingNeeds);
}

Expand Down Expand Up @@ -242,7 +242,7 @@ private void transform(final CourtApplication courtApplication,

final String key = getKey(bookingReferenceCourtScheduleIdMap, nextHearing, bookingReference);

final HearingListingNeeds hearingListingNeeds = addCourtApplication(createHearingListingNeeds(nextHearing, judiciaries, false), courtApplication, prosecutionCases, seedingHearing);
final HearingListingNeeds hearingListingNeeds = addCourtApplication(createHearingListingNeeds(nextHearing, judiciaries, false, null), courtApplication, prosecutionCases, seedingHearing);

if (hearingListingNeedsMap.containsKey(key)) {
if (isNull(hearingListingNeedsMap.get(key).getCourtApplications())) {
Expand All @@ -251,6 +251,8 @@ private void transform(final CourtApplication courtApplication,
} else if (nonNull(hearingListingNeedsMap.get(key).getCourtApplications())
&& isNewApplication(hearingListingNeedsMap.get(key), courtApplication)) {
hearingListingNeedsMap.get(key).getCourtApplications().add(courtApplication);
} else {
logger.info("Either the application is already present in the hearingListingNeeds or the application is not new. Hence not adding the application to the hearingListingNeeds");
}
} else {
hearingListingNeedsMap.put(key, hearingListingNeeds);
Expand Down Expand Up @@ -366,7 +368,7 @@ private Offence createOffence(final Defendant defendantInNeeds, final Offence of
return offenceInNeeds;
}

private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHearing, final List<JudicialRole> judiciaries, final Boolean isGroupProceedings) {
private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHearing, final List<JudicialRole> judiciaries, final Boolean isGroupProceedings, final Integer numberOfGroupCases) {
WeekCommencingDate weekCommencingDate = null;
if (nonNull(nextHearing.getWeekCommencingDate())) {
weekCommencingDate = WeekCommencingDate.weekCommencingDate()
Expand Down Expand Up @@ -399,6 +401,7 @@ private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHear

if(TRUE.equals(isGroupProceedings)) {
hearingListingNeedsBuilder.withIsGroupProceedings(TRUE);
hearingListingNeedsBuilder.withNumberOfGroupCases(numberOfGroupCases);
}
return hearingListingNeedsBuilder.build();
}
Expand Down
Loading