Skip to content

adding prosecutor name and judiciary name #20

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
ertugrulduran merged 1 commit into from
Jul 2, 2026
Merged

adding prosecutor name and judiciary name #20

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 listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/DailyListPayloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void setUp() {
updateHearingSteps.whenHearingIsUpdatedForListing();
updateHearingSteps.verifyHearingAllocatedWhenQueryingFromAPIWithJmsDelay();

dailyListPayloadSteps = new DailyListPayloadSteps(updatedHearingData);
dailyListPayloadSteps = new DailyListPayloadSteps(hearingsData, updatedHearingData);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...integration-test/src/test/java/uk/gov/moj/cpp/listing/it/WeekCommencingListPayloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void setUp() {
updateHearingSteps.whenHearingIsUpdatedForListing();
updateHearingSteps.verifyHearingAllocatedWhenQueryingFromAPIWithJmsDelay();

weekCommencingListPayloadSteps = new DailyListPayloadSteps(updatedHearingData);
weekCommencingListPayloadSteps = new DailyListPayloadSteps(hearingsData, updatedHearingData);
}

@Test
Expand Down
19 changes: 16 additions & 3 deletions ...ng-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/DailyListPayloadSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
import static uk.gov.moj.cpp.listing.it.util.RestPollerHelper.pollWithDelayForJms;
import static uk.gov.moj.cpp.listing.utils.PropertyUtil.getBaseUri;
import static uk.gov.moj.cpp.listing.utils.PropertyUtil.readConfig;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetProsecutorPoliceFlag;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataCourtMappings;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataCpCourtRooms;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataJudiciaries;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubGetReferenceDataXhibitCourtRoomMappings;
import static uk.gov.moj.cpp.listing.utils.ReferenceDataStub.stubOrganisationUnit;

import uk.gov.moj.cpp.listing.it.AbstractIT;
import uk.gov.moj.cpp.listing.steps.data.CourtCentreData;
import uk.gov.moj.cpp.listing.steps.data.HearingsData;
import uk.gov.moj.cpp.listing.steps.data.UpdatedHearingData;

import java.time.LocalTime;
Expand All @@ -29,10 +32,12 @@ public class DailyListPayloadSteps extends AbstractIT {
private static final String MEDIA_TYPE = "application/vnd.listing.search.daily.list.payload+json";
private static final String DEFAULT_DURATION_HOURS_MINS = "6:30";
private static final LocalTime DEFAULT_START_TIME = LocalTime.of(10, 0);
private static final String EXPECTED_JUDICIARY_NAME = "Recorder Ainsworth judge";
private static final String EXPECTED_PROSECUTOR_ORGANISATION_NAME = "Transport for London";

private final UpdatedHearingData updatedHearingData;

public DailyListPayloadSteps(final UpdatedHearingData updatedHearingData) {
public DailyListPayloadSteps(final HearingsData hearingsData, final UpdatedHearingData updatedHearingData) {
this.updatedHearingData = updatedHearingData;
stubGetReferenceDataCourtMappings(new CourtCentreData(
updatedHearingData.getCourtCentreId(),
Expand All @@ -43,6 +48,8 @@ public DailyListPayloadSteps(final UpdatedHearingData updatedHearingData) {
stubGetReferenceDataCpCourtRooms(updatedHearingData.getCourtRoomId(), 1970);
stubGetReferenceDataXhibitCourtRoomMappings(updatedHearingData.getCourtRoomId());
stubOrganisationUnit(updatedHearingData.getCourtCentreId());
stubGetReferenceDataJudiciaries(updatedHearingData.getJudiciary().get(0).getJudicialId());
stubGetProsecutorPoliceFlag(hearingsData.getHearingData().get(0).getListedCases().get(0).getAuthorityId());
}

public void verifyDailyListPayloadContainsHearing(final String publishCourtListType) {
Expand All @@ -61,10 +68,13 @@ public void verifyDailyListPayloadContainsHearing(final String publishCourtListT
withJsonPath("$.courtLists[0].crestCourtSite", notNullValue()),
withJsonPath("$.courtLists[0].sittings", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].sittingDate", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].judiciary[0].judiciaryName", is(EXPECTED_JUDICIARY_NAME)),
withJsonPath("$.courtLists[0].sittings[0].hearings", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].startTime", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].hearingType.id",
is(updatedHearingData.getHearingTypData().getTypeId().toString()))
is(updatedHearingData.getHearingTypData().getTypeId().toString())),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].prosecutor.organisationName",
is(EXPECTED_PROSECUTOR_ORGANISATION_NAME))
)));
}

Expand All @@ -87,10 +97,13 @@ public void verifyWeekCommencingListPayloadContainsHearing(final String publishC
withJsonPath("$.courtLists[0].crestCourtSite", notNullValue()),
withJsonPath("$.courtLists[0].sittings", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].sittingDate", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].judiciary[0].judiciaryName", is(EXPECTED_JUDICIARY_NAME)),
withJsonPath("$.courtLists[0].sittings[0].hearings", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].startTime", notNullValue()),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].hearingType.id",
is(updatedHearingData.getHearingTypData().getTypeId().toString()))
is(updatedHearingData.getHearingTypData().getTypeId().toString())),
withJsonPath("$.courtLists[0].sittings[0].hearings[0].prosecutor.organisationName",
is(EXPECTED_PROSECUTOR_ORGANISATION_NAME))
)));
}
}
133 changes: 131 additions & 2 deletions ...ery/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
import uk.gov.moj.cpp.listing.domain.CourtListType;
import uk.gov.moj.cpp.listing.domain.referencedata.OrganisationUnit;
import uk.gov.moj.cpp.listing.query.api.service.ReferenceDataService;
import uk.gov.moj.cpp.listing.query.document.generator.JudiciaryNameMapper;
import uk.gov.moj.cpp.listing.query.document.generator.StandardPublicCourtListTemplateAssembler;
import uk.gov.moj.cpp.listing.query.view.HearingQueryView;
import uk.gov.moj.cpp.listing.query.view.service.ProgressionService;

import java.io.IOException;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -78,6 +81,15 @@ public class HearingQueryApi {
public static final String CREST_COURT_SITE = "crestCourtSite";
private static final String WEEK_COMMENCING_START_DATE = "weekCommencingStartDate";
private static final String WEEK_COMMENCING_END_DATE = "weekCommencingEndDate";
private static final String SITTINGS = "sittings";
private static final String JUDICIARY = "judiciary";
private static final String JUDICIAL_ID = "judicialId";
private static final String JUDICIARY_NAME = "judiciaryName";
private static final String JUDICIARIES = "judiciaries";
private static final String ID = "id";
private static final String PROSECUTOR = "prosecutor";
private static final String PROSECUTOR_ID = "prosecutorId";
private static final String FULL_NAME = "fullName";

@Inject
private HearingQueryView hearingQueryView;
Expand All @@ -104,6 +116,9 @@ public class HearingQueryApi {
@Inject
private JsonObjectToObjectConverter jsonObjectToObjectConverter;

@Inject
private JudiciaryNameMapper judiciaryNameMapper;

@Handles("listing.search.hearings")
public JsonEnvelope searchHearings(final JsonEnvelope query) {
return enrichWithApplicationTypeCode(hearingQueryView.searchHearings(query));
Expand Down Expand Up @@ -229,10 +244,12 @@ public JsonEnvelope getDailyList(final JsonEnvelope query) {
final String welshAddress2 = courtCentreJson.getString("welshAddress2", null);

final JsonObject responsePayload = response.payloadAsJsonObject();
final Map<String, String> judiciaryNamesById = resolveJudiciaryNames(responsePayload, query);
final Map<String, String> prosecutorOrganisationNamesById = resolveProsecutorOrganisationNames(responsePayload, query);
final JsonObjectBuilder enrichedBuilder = JsonObjects.createObjectBuilder();
responsePayload.forEach((key, value) -> {
if (COURT_LISTS.equals(key)) {
enrichedBuilder.add(COURT_LISTS, enrichCourtListsWithAddress(responsePayload.getJsonArray(COURT_LISTS), address1, address2, welshAddress1, welshAddress2));
enrichedBuilder.add(COURT_LISTS, enrichCourtListsWithAddress(responsePayload.getJsonArray(COURT_LISTS), address1, address2, welshAddress1, welshAddress2, judiciaryNamesById, prosecutorOrganisationNamesById));
} else {
enrichedBuilder.add(key, value);
}
Expand All @@ -258,7 +275,7 @@ public JsonEnvelope getDailyList(final JsonEnvelope query) {
return envelopeFrom(metadataFrom(query.metadata()).withName("listing.search.daily.list.payload"), enrichedBuilder.build());
}

private JsonArray enrichCourtListsWithAddress(final JsonArray courtLists, final String address1, final String address2, final String welshAddress1, final String welshAddress2) {
private JsonArray enrichCourtListsWithAddress(final JsonArray courtLists, final String address1, final String address2, final String welshAddress1, final String welshAddress2, final Map<String, String> judiciaryNamesById, final Map<String, String> prosecutorOrganisationNamesById) {
final JsonArrayBuilder enrichedCourtListsBuilder = createArrayBuilder();
courtLists.getValuesAs(JsonObject.class).forEach(courtList -> {
final JsonObject crestCourtSite = courtList.getJsonObject(CREST_COURT_SITE);
Expand All @@ -280,6 +297,8 @@ private JsonArray enrichCourtListsWithAddress(final JsonArray courtLists, final
courtList.forEach((key, value) -> {
if (CREST_COURT_SITE.equals(key)) {
enrichedCourtListBuilder.add(CREST_COURT_SITE, enrichedSiteBuilder.build());
} else if (SITTINGS.equals(key)) {
enrichedCourtListBuilder.add(SITTINGS, enrichSittings(courtList.getJsonArray(SITTINGS), judiciaryNamesById, prosecutorOrganisationNamesById));
} else {
enrichedCourtListBuilder.add(key, value);
}
Expand All @@ -289,6 +308,116 @@ private JsonArray enrichCourtListsWithAddress(final JsonArray courtLists, final
return enrichedCourtListsBuilder.build();
}

private Map<String, String> resolveJudiciaryNames(final JsonObject responsePayload, final JsonEnvelope query) {
if (!responsePayload.containsKey(COURT_LISTS)) {
return Map.of();
}

final List<UUID> judicialIds = responsePayload.getJsonArray(COURT_LISTS).getValuesAs(JsonObject.class).stream()
.filter(courtList -> courtList.containsKey(SITTINGS))
.flatMap(courtList -> courtList.getJsonArray(SITTINGS).getValuesAs(JsonObject.class).stream())
.filter(sitting -> sitting.containsKey(JUDICIARY))
.flatMap(sitting -> sitting.getJsonArray(JUDICIARY).getValuesAs(JsonObject.class).stream())
.filter(judiciary -> judiciary.containsKey(JUDICIAL_ID))
.map(judiciary -> UUID.fromString(judiciary.getString(JUDICIAL_ID)))
.distinct()
.collect(Collectors.toList());

if (judicialIds.isEmpty()) {
return Map.of();
}

final JsonObject judiciariesPayload = referenceDataService.getJudiciariesByIdList(judicialIds, query).payloadAsJsonObject();
return judiciariesPayload.getJsonArray(JUDICIARIES).getValuesAs(JsonObject.class).stream()
.collect(Collectors.toMap(judge -> judge.getString(ID), judiciaryNameMapper::getName));
}

private Map<String, String> resolveProsecutorOrganisationNames(final JsonObject responsePayload, final JsonEnvelope query) {
if (!responsePayload.containsKey(COURT_LISTS)) {
return Map.of();
}

final List<String> prosecutorIds = responsePayload.getJsonArray(COURT_LISTS).getValuesAs(JsonObject.class).stream()
.filter(courtList -> courtList.containsKey(SITTINGS))
.flatMap(courtList -> courtList.getJsonArray(SITTINGS).getValuesAs(JsonObject.class).stream())
.filter(sitting -> sitting.containsKey(HEARINGS))
.flatMap(sitting -> sitting.getJsonArray(HEARINGS).getValuesAs(JsonObject.class).stream())
.filter(hearing -> hearing.containsKey(PROSECUTOR))
.map(hearing -> hearing.getJsonObject(PROSECUTOR))
.filter(prosecutor -> prosecutor.containsKey(PROSECUTOR_ID))
.map(prosecutor -> prosecutor.getString(PROSECUTOR_ID))
.distinct()
.collect(Collectors.toList());

final Map<String, String> organisationNamesById = new HashMap<>();
prosecutorIds.forEach(prosecutorId -> {
final JsonEnvelope prosecutorEnvelope = referenceDataService.getProsecutorById(prosecutorId, query);
if (!prosecutorEnvelope.payloadIsNull()) {
final JsonObject prosecutorPayload = prosecutorEnvelope.payloadAsJsonObject();
if (prosecutorPayload.containsKey(FULL_NAME)) {
organisationNamesById.put(prosecutorId, prosecutorPayload.getString(FULL_NAME));
}
}
});
return organisationNamesById;
}

private JsonArray enrichSittings(final JsonArray sittings, final Map<String, String> judiciaryNamesById, final Map<String, String> prosecutorOrganisationNamesById) {
final JsonArrayBuilder enrichedSittingsBuilder = createArrayBuilder();
sittings.getValuesAs(JsonObject.class).forEach(sitting -> {
final JsonObjectBuilder enrichedSittingBuilder = JsonObjects.createObjectBuilder();
sitting.forEach((key, value) -> {
if (JUDICIARY.equals(key)) {
enrichedSittingBuilder.add(JUDICIARY, enrichJudiciaryWithNames(sitting.getJsonArray(JUDICIARY), judiciaryNamesById));
} else if (HEARINGS.equals(key)) {
enrichedSittingBuilder.add(HEARINGS, enrichHearingsWithProsecutorOrganisationNames(sitting.getJsonArray(HEARINGS), prosecutorOrganisationNamesById));
} else {
enrichedSittingBuilder.add(key, value);
}
});
enrichedSittingsBuilder.add(enrichedSittingBuilder.build());
});
return enrichedSittingsBuilder.build();
}

private JsonArray enrichHearingsWithProsecutorOrganisationNames(final JsonArray hearings, final Map<String, String> prosecutorOrganisationNamesById) {
final JsonArrayBuilder enrichedHearingsBuilder = createArrayBuilder();
hearings.getValuesAs(JsonObject.class).forEach(hearing -> {
final JsonObjectBuilder enrichedHearingBuilder = JsonObjects.createObjectBuilder();
hearing.forEach((key, value) -> {
if (PROSECUTOR.equals(key)) {
final JsonObject prosecutor = hearing.getJsonObject(PROSECUTOR);
final String organisationName = prosecutor.containsKey(PROSECUTOR_ID)
? prosecutorOrganisationNamesById.get(prosecutor.getString(PROSECUTOR_ID))
: null;
if (organisationName != null) {
enrichedHearingBuilder.add(PROSECUTOR, JsonObjects.createObjectBuilder().add(ORGANISATION_NAME, organisationName).build());
} else {
enrichedHearingBuilder.add(key, value);
}
} else {
enrichedHearingBuilder.add(key, value);
}
});
enrichedHearingsBuilder.add(enrichedHearingBuilder.build());
});
return enrichedHearingsBuilder.build();
}

private JsonArray enrichJudiciaryWithNames(final JsonArray judiciaryArray, final Map<String, String> judiciaryNamesById) {
final JsonArrayBuilder enrichedJudiciaryBuilder = createArrayBuilder();
judiciaryArray.getValuesAs(JsonObject.class).forEach(judiciary -> {
final JsonObjectBuilder enrichedJudiciaryEntryBuilder = JsonObjects.createObjectBuilder();
judiciary.forEach(enrichedJudiciaryEntryBuilder::add);
final String judiciaryName = judiciaryNamesById.get(judiciary.getString(JUDICIAL_ID, null));
if (judiciaryName != null) {
enrichedJudiciaryEntryBuilder.add(JUDICIARY_NAME, judiciaryName);
}
enrichedJudiciaryBuilder.add(enrichedJudiciaryEntryBuilder.build());
});
return enrichedJudiciaryBuilder.build();
}

@Handles("listing.search.hearing")
public JsonEnvelope searchForHearingById(final JsonEnvelope query) {
ensureThatHearingIdIsAValidUUID(query);
Expand Down
12 changes: 12 additions & 0 deletions ...uery-api/src/main/java/uk/gov/moj/cpp/listing/query/api/service/ReferenceDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ReferenceDataService {
private static final String HEARING_TYPE_ID = "id";
private static final String REFERENCEDATA_QUERY_HEARING_TYPES = "referencedata.query.hearing-types";
private static final String WELSH_HEARING_DESCRIPTION = "welshHearingDescription";
private static final String REFERENCEDATA_QUERY_PROSECUTOR = "referencedata.query.prosecutor";

@Inject
private Enveloper enveloper;
Expand Down Expand Up @@ -66,6 +67,17 @@ public JsonEnvelope getJudiciariesByIdList(final List<UUID> judiciaryIds, final
return requester.requestAsAdmin(envelopeFrom(requestEnvelope.metadata(), requestEnvelope.payload()));
}

public JsonEnvelope getProsecutorById(final String prosecutorId, final JsonEnvelope event) {
final JsonObject payload = createObjectBuilder().add("id", prosecutorId).build();
LOGGER.info("'referencedata.query.prosecutor' request with payload {}", payload);

final Envelope<JsonObject> requestEnvelope = Enveloper.envelop(payload)
.withName(REFERENCEDATA_QUERY_PROSECUTOR)
.withMetadataFrom(event);

return requester.requestAsAdmin(envelopeFrom(requestEnvelope.metadata(), requestEnvelope.payload()));
}

public Optional<Boolean> isHearingLanguageWelsh(final JsonEnvelope envelope, final String courtCentreId) {
final JsonEnvelope courtCentreEnvelope = getCourtCentreById(UUID.fromString(courtCentreId), envelope);
final JsonObject jsonObject = courtCentreEnvelope.payloadAsJsonObject();
Expand Down
Loading
Loading