Skip to content

LPT-2348 - Change SJP to POST payload to new SJP publishing endpoint #123

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
ynegi merged 3 commits into from
Jul 16, 2026
Merged

LPT-2348 - Change SJP to POST payload to new SJP publishing endpoint #123

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
ca14566
LPT-2348 - Change SJP to POST payload to new SJP publishing endpoint
ynegi Jul 15, 2026
05c7d25
LPT-2348 - Change SJP to POST payload to new SJP publishing endpoint
ynegi Jul 15, 2026
363025a
Merge remote-tracking branch 'origin/LPT-2348' into LPT-2348
ynegi Jul 16, 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
51 changes: 0 additions & 51 deletions ...src/main/java/uk/gov/moj/cpp/sjp/event/transparency/PressTransparencyReportRequested.java
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions ...vent/src/main/java/uk/gov/moj/cpp/sjp/event/transparency/TransparencyReportRequested.java
View file
Open in desktop

This file was deleted.

54 changes: 18 additions & 36 deletions ...in/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.messaging.JsonObjects;
import uk.gov.moj.cpp.sjp.domain.ListType;
import uk.gov.moj.cpp.sjp.event.processor.service.CourtListPublishingService;
import uk.gov.moj.cpp.sjp.event.processor.service.ExportType;
import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataOffencesService;
import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService;
Expand All @@ -43,6 +44,7 @@
import uk.gov.moj.cpp.sjp.event.transparency.PressTransparencyPDFReportRequested;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.time.LocalDate;
import java.time.format.DateTimeParseException;
import java.util.List;
Expand All @@ -63,7 +65,8 @@
@ServiceComponent(EVENT_PROCESSOR)
public class PressTransparencyReportRequestedProcessor {

public static final String PUBLIC_SJP_PRESS_TRANSPARENCY_REPORT_GENERATED = "public.sjp.press-transparency-report-generated";
private static final String LIST_TYPE = "listType";
private static final String SJP_PRESS_LIST = "SJP_PRESS_LIST";
public static final String CASE_URN = "caseUrn";
public static final String FIRST_NAME = "firstName";
public static final String LAST_NAME = "lastName";
Expand Down Expand Up @@ -111,6 +114,8 @@ public class PressTransparencyReportRequestedProcessor {
@Inject
@FrameworkComponent(EVENT_PROCESSOR)
private Sender sender;
@Inject
private CourtListPublishingService courtListPublishingService;

private String getTemplateIdentifier(final String type, final String lang) {
return "PressPendingCases" + type + lang;
Expand Down Expand Up @@ -148,48 +153,25 @@ public void handlePressTransparencyJSONReportRequest(final JsonEnvelope envelope
final UUID reportId = fromString(eventPayload.getString(PRESS_TRANSPARENCY_REPORT_ID));
final boolean isWelsh = WELSH.name().equalsIgnoreCase(eventPayload.getString(LANGUAGE));
LOGGER.info("generating press transparency JSON report for press report {}", reportId);
sendPublicEvent(envelope, buildPayload(pendingCasesFromViewStore, true, envelope, isWelsh));
}

/**
* @deprecated with CCT-1587 now we are using two separate events for PDF and JSON report
* generation {@link PressTransparencyPDFReportRequested} and {@link
* PressTransparencyJSONReportRequested}
*/
@Deprecated(forRemoval = true)
@Handles("sjp.events.press-transparency-report-requested")
@Transactional
@SuppressWarnings({"squid:S00112", "squid:S1133"})
public void handlePressTransparencyRequest(final JsonEnvelope envelope) {
payloadHelper.initCache();

final List<JsonObject> pendingCasesFromViewStore = getPendingCasesFromViewStore(envelope);
final JsonObject eventPayload = envelope.payloadAsJsonObject();
final UUID reportId = fromString(eventPayload.getString(PRESS_TRANSPARENCY_REPORT_ID));
try {
final JsonObject payloadForDocumentGeneration = buildPayload(pendingCasesFromViewStore, false, envelope, false);
requestDocumentGeneration(envelope, reportId, payloadForDocumentGeneration);
sendPublicEvent(envelope, buildPayload(pendingCasesFromViewStore, true, envelope, false));
storeReportMetadata(envelope, reportId, pendingCasesFromViewStore);
} catch (FileServiceException e) {
throw new RuntimeException("IO Exception happened during press transparency report generation", e);
}
publishCourtList(envelope, buildPayload(pendingCasesFromViewStore, true, envelope, isWelsh));
}

private void sendPublicEvent(final JsonEnvelope envelope, final JsonObject payloadForDocumentGeneration) {
LOGGER.info("publishing public event for sjp pending cases for public list in english");
private void publishCourtList(final JsonEnvelope envelope, final JsonObject payloadForDocumentGeneration) {
LOGGER.info("publishing sjp press pending cases list to court list publishing service");
final String type = envelope.payloadAsJsonObject().getString(REQUEST_TYPE);
final String language = envelope.payloadAsJsonObject().getString(LANGUAGE);
final JsonObjectBuilder pendingListEnglishBuilder = createObjectBuilder()
final JsonObject courtListPublishRequest = createObjectBuilder()
.add(LIST_TYPE, SJP_PRESS_LIST)
.add(LANGUAGE, language)
.add(REQUEST_TYPE, type)
.add("listPayload", payloadForDocumentGeneration);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("publishing Sjp public event for press report {}, {}", PUBLIC_SJP_PRESS_TRANSPARENCY_REPORT_GENERATED, payloadForDocumentGeneration);
.add("listPayload", payloadForDocumentGeneration)
.build();

try {
courtListPublishingService.publishCourtList(courtListPublishRequest.toString());
} catch (IOException e) {
throw new RuntimeException("IO Exception happened while publishing sjp press court list", e);
}
sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata())
.withName(PUBLIC_SJP_PRESS_TRANSPARENCY_REPORT_GENERATED),
pendingListEnglishBuilder.build()));
}

private void storeReportMetadata(final JsonEnvelope envelope,
Expand Down
105 changes: 19 additions & 86 deletions ...rc/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.messaging.JsonObjects;
import uk.gov.moj.cpp.sjp.domain.ListType;
import uk.gov.moj.cpp.sjp.event.processor.service.CourtListPublishingService;
import uk.gov.moj.cpp.sjp.event.processor.service.ExportType;
import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataOffencesService;
import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService;
import uk.gov.moj.cpp.sjp.event.processor.service.SjpService;
import uk.gov.moj.cpp.sjp.event.processor.utils.PayloadHelper;
import uk.gov.moj.cpp.sjp.event.transparency.TransparencyJSONReportRequested;
import uk.gov.moj.cpp.sjp.event.transparency.TransparencyPDFReportRequested;
import uk.gov.moj.cpp.sjp.event.transparency.TransparencyReportRequested;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.time.LocalDate;
import java.time.Period;
import java.util.Comparator;
Expand All @@ -67,7 +68,8 @@ public class TransparencyReportRequestedProcessor {
private static final int DEFENDANT_IS_18 = 18;
private static final String SJP_OFFENCES = "sjpOffences";
private static final String OFFENCES = "offences";
private static final String PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED = "public.sjp.pending-cases-public-list-generated";
private static final String LIST_TYPE = "listType";
private static final String SJP_PUBLISH_LIST = "SJP_PUBLISH_LIST";
public static final String DEFENDANT_NAME = "defendantName";
public static final String PROSECUTOR_NAME = "prosecutorName";
public static final String TITLE = "title";
Expand Down Expand Up @@ -104,6 +106,9 @@ public class TransparencyReportRequestedProcessor {
@Inject
private PayloadHelper payloadHelper;

@Inject
private CourtListPublishingService courtListPublishingService;

private String getTemplateIdentifier(final String type, final String lang) {
return "PublicPendingCases" + type + lang;
}
Expand Down Expand Up @@ -140,67 +145,10 @@ public void createTransparencyJSONReport(final JsonEnvelope envelope) {
final boolean isWelsh = WELSH.name().equalsIgnoreCase(eventPayload.getString(LANGUAGE));
LOGGER.info("generating public transparency JSON report {}", transparencyReportId);
final List<JsonObject> filteredCases = getFilteredCases(allPendingCasesFromViewStore);
sendPublicEvent(envelope, buildPayload(filteredCases, isWelsh, true, envelope));
storeReportMetadata(envelope, transparencyReportId, filteredCases);
}

/**
* This method is deprecated with CCT-2079. Use the new method createTransparencyPDFReport or
* createTransparencyJSONReport
*
* @deprecated @Link{createTransparencyPDFReport} or @Link{createTransparencyJSONReport}
*/
@Deprecated(forRemoval = true)
@SuppressWarnings({"squid:S00112", "squid:S1133"})
@Handles(TransparencyReportRequested.EVENT_NAME)
@Transactional
public void createTransparencyReport(final JsonEnvelope envelope) {
payloadHelper.initCache();

final JsonObject eventPayload = envelope.payloadAsJsonObject();
final UUID transparencyReportId = fromString(eventPayload.getString(TRANSPARENCY_REPORT_ID));
final List<JsonObject> allPendingCasesFromViewStore = getPendingCasesFromViewStore(envelope);
final List<JsonObject> filteredCases = getFilteredCases(allPendingCasesFromViewStore);
publishCourtList(envelope, buildPayload(filteredCases, isWelsh, true, envelope));
storeReportMetadata(envelope, transparencyReportId, filteredCases);
try {
final JsonObject payloadForDocumentGenerationEnglish = buildPayload(filteredCases, false, false, envelope);
final String englishPayloadFileName = String.format("transparency-report-template-parameters.english.%s.json", transparencyReportId);
final UUID englishPayloadFileId = storeDocumentGeneratorPayload(payloadForDocumentGenerationEnglish, englishPayloadFileName, "type", LANGUAGE);
requestDocumentGeneration(envelope, transparencyReportId, englishPayloadFileId, "type", LANGUAGE);

final JsonObject payloadForPublicEventInEnglish = buildPayload(filteredCases, false, true, envelope);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("publishing Sjp public event for english report {}, {}", PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED, payloadForPublicEventInEnglish);
}
final JsonObjectBuilder pendingListEnglishBuilder = createObjectBuilder()
.add(LANGUAGE, "ENGLISH")
.add(LIST_PAYLOAD, payloadForPublicEventInEnglish);
sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata())
.withName(PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED),
pendingListEnglishBuilder.build()));

final JsonObject payloadForDocumentGenerationWelsh = buildPayload(filteredCases, true, false, envelope);
final String welshPayloadFileName = String.format("transparency-report-template-parameters.welsh.%s.json", transparencyReportId);
final UUID welshPayloadFileId = storeDocumentGeneratorPayload(payloadForDocumentGenerationWelsh, welshPayloadFileName, "type", LANGUAGE);
requestDocumentGeneration(envelope, transparencyReportId, welshPayloadFileId, "type", LANGUAGE);

final JsonObject payloadForPublicEventInWelsh = buildPayload(filteredCases, true, true, envelope);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("publishing Sjp public event for welsh report {}, {}", PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED, payloadForPublicEventInEnglish);
}
final JsonObjectBuilder pendingListWelshBuilder = createObjectBuilder()
.add(LANGUAGE, "WELSH")
.add(LIST_PAYLOAD, payloadForPublicEventInWelsh);
sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata())
.withName(PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED),
pendingListWelshBuilder.build()));

} catch (FileServiceException e) {
throw new RuntimeException("IO Exception happened during transparency report generation", e);
}
}


private void requestDocumentGeneration(final JsonEnvelope envelope, final UUID reportId, final JsonObject payload) throws FileServiceException {
final String payloadFileName = String.format("transparency-report-template-parameters.%s.json", reportId.toString());
String type = envelope.payloadAsJsonObject().getString(REQUEST_TYPE).toLowerCase();
Expand Down Expand Up @@ -231,18 +179,22 @@ private void sendDocumentGenerationRequest(final JsonEnvelope eventEnvelope,
);
}

private void sendPublicEvent(final JsonEnvelope envelope, final JsonObject payloadForDocumentGeneration) {
LOGGER.info("publishing public event for sjp pending cases for public list in english");
private void publishCourtList(final JsonEnvelope envelope, final JsonObject payloadForDocumentGeneration) {
LOGGER.info("publishing sjp pending cases public list to court list publishing service");
final String type = envelope.payloadAsJsonObject().getString(REQUEST_TYPE);
final String language = envelope.payloadAsJsonObject().getString(LANGUAGE);
final JsonObjectBuilder pendingListEnglishBuilder = createObjectBuilder()
final JsonObject courtListPublishRequest = createObjectBuilder()
.add(LIST_TYPE, SJP_PUBLISH_LIST)
.add(LANGUAGE, language)
.add(REQUEST_TYPE, type)
.add(LIST_PAYLOAD, payloadForDocumentGeneration);
.add(LIST_PAYLOAD, payloadForDocumentGeneration)
.build();

sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata())
.withName(PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED),
pendingListEnglishBuilder.build()));
try {
courtListPublishingService.publishCourtList(courtListPublishRequest.toString());
} catch (IOException e) {
throw new RuntimeException("IO Exception happened while publishing sjp court list", e);
}
}

private List<JsonObject> getPendingCasesFromViewStore(final JsonEnvelope envelope) {
Expand Down Expand Up @@ -286,25 +238,6 @@ private JsonObject buildPayload(final List<JsonObject> pendingCases, boolean isW
.build();
}

private void requestDocumentGeneration(final JsonEnvelope eventEnvelope,
final UUID transparencyReportId,
final UUID payloadFileServiceUUID, final String type, final String language) {

final JsonObject docGeneratorPayload = createObjectBuilder()
.add("originatingSource", "sjp")
.add(TEMPLATE_IDENTIFIER_STRING, payloadHelper.getTemplateIdentifier(type, language, ExportType.PUBLIC.name()))
.add(CONVERSION_FORMAT_STRING, CONVERSION_FORMAT)
.add("sourceCorrelationId", transparencyReportId.toString())
.add("payloadFileServiceId", payloadFileServiceUUID.toString())
.build();
sender.sendAsAdmin(
Envelope.envelopeFrom(
metadataFrom(eventEnvelope.metadata()).withName("systemdocgenerator.generate-document"),
docGeneratorPayload
)
);
}

private UUID storeDocumentGeneratorPayload(final JsonObject documentGeneratorPayload, final String fileName, final String type, final String language) throws FileServiceException {
final byte[] jsonPayloadInBytes = jsonObjectAsByteArray(documentGeneratorPayload);

Expand Down
11 changes: 10 additions & 1 deletion ...essor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ApplicationParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ public class ApplicationParameters {
@Value(key = "RELAY_CASE_ON_CPP_FUNCTION_PATH")
private String relayCaseOnCppFunctionPath;


@Inject
@Value(key = "COURT_LIST_PUBLISHING_SERVICE_URL", defaultValue = "http://localhost:8080")
private String courtListPublishingServiceUrl;


public String getAzureFunctionHostName() {

return azureFunctionHostName;
Expand All @@ -25,4 +29,9 @@ public String getRelayCaseOnCppFunctionPath() {

return relayCaseOnCppFunctionPath;
}

public String getCourtListPublishingServiceUrl() {

return courtListPublishingServiceUrl;
}
}
Loading
Loading