Skip to content

CAD-1330: CPS notification email changes for civil cases #375

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
sriniJavaGit wants to merge 3 commits into
base: team/civil-t2
Choose a base branch
from
Open

CAD-1330: CPS notification email changes for civil cases #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0bbe60
CAD-1330: CPS notification email changes for civil cases
sriniJavaGit Jun 12, 2026
324df59
CAD-1330: CPS notification email changes for civil cases
sriniJavaGit Jun 12, 2026
b72a1e8
CAD-1330: CPS notification email changes for civil cases
sriniJavaGit Jun 12, 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
61 changes: 50 additions & 11 deletions ...sor/src/main/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,19 @@
public class CPSEmailNotificationProcessor {

private static final String PROGRESSION_COMMAND_FOR_DEFENCE_ORGANISATION_DISASSOCIATED = "progression.command.handler.disassociate-defence-organisation";
private static final String PROGRESSION_COMMAND_FOR_DEFENCE_ORGANISATION_DISASSOCIATED_FOR_APPLICATION = "progression.command.handler.disassociate-defence-organisation-for-application";
private static final String PROSECUTION_CASE = "prosecutionCase";
private static final String PROSECUTION_CASE_IDENTIFIER = "prosecutionCaseIdentifier";
private static final String PROSECUTION_AUTHORITY_CODE = "prosecutionAuthorityCode";
private static final String CPS_AUTHORITY_CODE_PREFIX = "CPS";
private static final String IS_LAA = "isLAA";
private static final String IS_CIVIL = "isCivil";
private static final String CASE_ID = "caseId";
private static final String FIRST_INSTRUCTION = "firstInstruction";
private static final String HEARINGS_AT_A_GLANCE = "hearingsAtAGlance";
private static final String CPS_EMAIL_ADDRESS = "cpsEmailAddress";
private static final String DEFENDANTS = "defendants";
private static final String ID = "id";
public static final String LINKED_APPLICATIONS = "linkedApplications";
public static final String APPLICATION_ID = "applicationId";
public static final String DEFENDANT_ID = "defendantId";
Expand Down Expand Up @@ -92,7 +104,7 @@ public class CPSEmailNotificationProcessor {
public void processDisassociatedEmailNotification(final JsonEnvelope jsonEnvelope) {
final JsonObject requestJson = jsonEnvelope.payloadAsJsonObject();
final boolean isLAA = parseBoolean(requestJson.containsKey(IS_LAA) ? requestJson.get(IS_LAA).toString() : "false");
final UUID caseId = fromString(requestJson.getString("caseId"));
final UUID caseId = fromString(requestJson.getString(CASE_ID));

if (!isLAA) {
sendCommandDisassociateDefenceOrganisation(jsonEnvelope, requestJson);
Expand Down Expand Up @@ -121,7 +133,7 @@ private void sendCommandDisassociateDefenceOrganisationForApplication(final Json
.add(ORGANISATION_ID, requestJson.getString(ORGANISATION_ID));
sender.send(
envelop(disassociateDefenceOrganisationForApplicationBuilder.build())
.withName("progression.command.handler.disassociate-defence-organisation-for-application")
.withName(PROGRESSION_COMMAND_FOR_DEFENCE_ORGANISATION_DISASSOCIATED_FOR_APPLICATION)
.withMetadataFrom(jsonEnvelope));
}
});
Expand All @@ -131,18 +143,25 @@ private void sendCommandDisassociateDefenceOrganisationForApplication(final Json
@Handles("public.defence.event.record-instruction-details")
public void processInstructedEmailNotification(final JsonEnvelope jsonEnvelope) {
final JsonObject requestJson = jsonEnvelope.payloadAsJsonObject();
final boolean isFirstInstruction = parseBoolean(requestJson.get("firstInstruction").toString());
final boolean isFirstInstruction = parseBoolean(requestJson.get(FIRST_INSTRUCTION).toString());
if (isFirstInstruction) {
populateCPSNotification(jsonEnvelope, requestJson, EmailTemplateType.INSTRUCTION);
}
}

private void populateCPSNotification(final JsonEnvelope jsonEnvelope, final JsonObject requestJson, final EmailTemplateType templateType) {
final String caseId = requestJson.getString("caseId");
final String caseId = requestJson.getString(CASE_ID);
final String defendantId = requestJson.getString(DEFENDANT_ID);
final UUID organisationId = fromString(requestJson.getString(ORGANISATION_ID));

final Optional<JsonObject> prosecutionCaseOptional = progressionService.getProsecutionCaseDetailById(jsonEnvelope, caseId);

final boolean isCivil = isCivilCase(prosecutionCaseOptional);
if (isCivil && !isCpsProsecutor(prosecutionCaseOptional)) {
log.info("Skipping CPS notification: civil case {} is not a CPS prosecution", caseId);
return;
}

final Optional<HearingVO> hearingVO = getHearingDetails(prosecutionCaseOptional);
final boolean isHearingPresent = hearingVO.isPresent() && hearingVO.get().getHearingDate() != null;

Expand Down Expand Up @@ -177,12 +196,32 @@ private void populateCPSNotificationAndSendEmail(final JsonEnvelope jsonEnvelope
}
}

private boolean isCivilCase(final Optional<JsonObject> prosecutionCaseOptional) {
if (prosecutionCaseOptional.isEmpty()) {
return false;
}
return prosecutionCaseOptional.get().getJsonObject(PROSECUTION_CASE).getBoolean(IS_CIVIL, false);
}

private boolean isCpsProsecutor(final Optional<JsonObject> prosecutionCaseOptional) {
if (prosecutionCaseOptional.isEmpty()) {
return false;
}
final JsonObject prosecutionCaseJson = prosecutionCaseOptional.get().getJsonObject(PROSECUTION_CASE);
if (!prosecutionCaseJson.containsKey(PROSECUTION_CASE_IDENTIFIER)) {
return false;
}
final String prosecutionAuthorityCode = prosecutionCaseJson.getJsonObject(PROSECUTION_CASE_IDENTIFIER)
.getString(PROSECUTION_AUTHORITY_CODE, "");
return prosecutionAuthorityCode.toUpperCase().startsWith(CPS_AUTHORITY_CODE_PREFIX);
}

private Optional<DefendantVO> getDefendantDetails(final String defendantId, final Optional<JsonObject> prosecutionCaseOptional) {

final Optional<DefendantVO> defendantVO = Optional.empty();

final JsonObject prosecutionCaseJson = prosecutionCaseOptional
.orElseThrow(() -> new RuntimeException("Prosecution Case not found")).getJsonObject("prosecutionCase");
.orElseThrow(() -> new RuntimeException("Prosecution Case not found")).getJsonObject(PROSECUTION_CASE);

final JsonObject defendantJson = getDefendantJson(prosecutionCaseJson, fromString(defendantId));

Expand Down Expand Up @@ -210,7 +249,7 @@ private Optional<DefendantVO> getDefendantDetails(final String defendantId, fina
private Optional<CaseVO> getCaseDetails(final Optional<JsonObject> prosecutionCaseOptional) {

final JsonObject prosecutionCaseJson = prosecutionCaseOptional
.orElseThrow(() -> new RuntimeException("Prosecution Case not found")).getJsonObject("prosecutionCase");
.orElseThrow(() -> new RuntimeException("Prosecution Case not found")).getJsonObject(PROSECUTION_CASE);

final ProsecutionCase prosecutionCase = jsonObjectToObjectConverter.convert(prosecutionCaseJson, ProsecutionCase.class);
final String caseURN = prosecutionCase.getProsecutionCaseIdentifier().getCaseURN();
Expand All @@ -228,7 +267,7 @@ private Optional<HearingVO> getHearingDetails(final Optional<JsonObject> prosecu

if (prosecutionCaseOptional.isPresent()) {

final JsonObject hearingAtAGlanceJsonObject = prosecutionCaseOptional.get().getJsonObject("hearingsAtAGlance");
final JsonObject hearingAtAGlanceJsonObject = prosecutionCaseOptional.get().getJsonObject(HEARINGS_AT_A_GLANCE);
final GetHearingsAtAGlance hearingAtAGlance = jsonObjectToObjectConverter.convert(hearingAtAGlanceJsonObject, GetHearingsAtAGlance.class);

final List<Hearings> futureHearings = getFutureHearings(hearingAtAGlance);
Expand Down Expand Up @@ -260,7 +299,7 @@ private List<Hearings> getFutureHearings(GetHearingsAtAGlance hearingsAtAGlance)
private Optional<HearingVO> getHearingVO(final String hearingDate, List<Hearings> futureHearings, final Optional<Entry<UUID, ZonedDateTime>> resultMap) {
final List<Hearings> resultHearing = futureHearings.stream()
.filter(hearing -> hearing.getId().equals(resultMap.get().getKey()))
.collect(Collectors.toList());
.toList();

final Hearings hearing = resultHearing.get(0);
final String courtName = hearing.getCourtCentre().getName();
Expand Down Expand Up @@ -298,7 +337,7 @@ private Optional<String> getCPSEmail(final JsonEnvelope jsonEnvelope, final UUID
.getOrganisationUnitById(courtCenterId, jsonEnvelope, requester);

if (organisationUnitJsonOptional.isPresent()) {
cpsEmail = Optional.ofNullable(organisationUnitJsonOptional.get().getString("cpsEmailAddress", null));
cpsEmail = Optional.ofNullable(organisationUnitJsonOptional.get().getString(CPS_EMAIL_ADDRESS, null));
if (cpsEmail.isPresent()) {
log.info("Found CPS email: {}", cpsEmail);
}
Expand All @@ -316,8 +355,8 @@ private static ZonedDateTime getEarliestHearingDay(final List<HearingDay> hearin
}

private JsonObject getDefendantJson(final JsonObject prosecutionCaseJson, final UUID defendantId) {
return prosecutionCaseJson.getJsonArray("defendants").getValuesAs(JsonObject.class).stream()
.filter(e -> defendantId.toString().equals(e.getString("id")))
return prosecutionCaseJson.getJsonArray(DEFENDANTS).getValuesAs(JsonObject.class).stream()
.filter(e -> defendantId.toString().equals(e.getString(ID)))
.findFirst()
.orElseThrow(IllegalArgumentException::new);
}
Expand Down
Loading
Loading