diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java index d8d7feaefe..f17ba4d78c 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java @@ -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() diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformer.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformer.java index 9a25b723a3..cc8286d60b 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformer.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingToHearingListingNeedsTransformer.java @@ -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); } @@ -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())) { @@ -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); @@ -366,7 +368,7 @@ private Offence createOffence(final Defendant defendantInNeeds, final Offence of return offenceInNeeds; } - private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHearing, final List judiciaries, final Boolean isGroupProceedings) { + private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHearing, final List judiciaries, final Boolean isGroupProceedings, final Integer numberOfGroupCases) { WeekCommencingDate weekCommencingDate = null; if (nonNull(nextHearing.getWeekCommencingDate())) { weekCommencingDate = WeekCommencingDate.weekCommencingDate() @@ -399,6 +401,7 @@ private HearingListingNeeds createHearingListingNeeds(final NextHearing nextHear if(TRUE.equals(isGroupProceedings)) { hearingListingNeedsBuilder.withIsGroupProceedings(TRUE); + hearingListingNeedsBuilder.withNumberOfGroupCases(numberOfGroupCases); } return hearingListingNeedsBuilder.build(); }