Skip to content

Dev/rebase from main 1923 #112

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
erolkurelihmcts merged 17 commits into from
Jun 4, 2026
Merged

Dev/rebase from main 1923 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
445e4f5
CCT-2411 Code merge (#103)
yilmazsaritemur2 May 28, 2026
5f8b409
updating poms for 17.103.172 branch with snapshot versions
May 28, 2026
b07f860
updating poms for 17.103.173-SNAPSHOT development
May 28, 2026
a03789b
updating poms for branch'dev/release-17.103.172' with non-snapshot ve…
May 28, 2026
3486533
Merge branch 'dev/release-17.103.172' into dev/release
May 28, 2026
4ab9f96
updating develop poms to master versions to avoid merge conflicts
May 28, 2026
9c19e78
Merge branch 'dev/release' into main
May 28, 2026
f0d1f81
Updating develop poms back to pre merge state
May 28, 2026
80d2eda
updating poms for 17.103.174-SNAPSHOT development
May 29, 2026
eef3b03
updating poms for 17.103.174 branch with snapshot versions
May 29, 2026
19bea27
updating poms for 17.103.175-SNAPSHOT development
May 29, 2026
7b271eb
updating poms for branch'dev/release-17.103.174' with non-snapshot ve…
May 29, 2026
89a3cd1
Merge branch 'dev/release-17.103.174' into dev/release
May 29, 2026
7a3f63d
updating develop poms to master versions to avoid merge conflicts
May 29, 2026
6090a41
Merge branch 'dev/release' into main
May 29, 2026
8412b1a
Updating develop poms back to pre merge state
May 29, 2026
0d52304
Merge remote-tracking branch 'origin/main' into team/cimd3210
Jun 4, 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
22 changes: 0 additions & 22 deletions ...cessor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;

import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails;
import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
import uk.gov.justice.services.core.annotation.Handles;
import uk.gov.justice.services.core.annotation.ServiceComponent;
import uk.gov.justice.services.core.sender.Sender;
import uk.gov.justice.services.fileservice.api.FileServiceException;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.moj.cpp.sjp.event.decision.ApplicationDecisionSetAside;
import uk.gov.moj.cpp.sjp.event.processor.service.SjpService;
import uk.gov.moj.cpp.sjp.event.processor.service.models.CaseDetailsDecorator;
import uk.gov.moj.cpp.sjp.event.processor.service.notification.EndorsementRemovalNotificationService;

import javax.inject.Inject;

Expand All @@ -32,32 +28,14 @@ public class ApplicationSetAsideProcessor {
@ServiceComponent(EVENT_PROCESSOR)
@Inject
private Sender sender;
@Inject
private SjpService sjpService;
@Inject
private EndorsementRemovalNotificationService endorsementRemovalNotificationService;

@Handles(ApplicationDecisionSetAside.EVENT_NAME)
public void handleApplicationDecisionSetAside(final JsonEnvelope envelope) throws FileServiceException {
sendApplicationSetAsidePublicEvent(envelope);
sendNotificationToDvlaToRemoveEndorsements(envelope);
}

private void sendApplicationSetAsidePublicEvent(final JsonEnvelope envelope) {
LOGGER.info("Sending public.sjp.application-decision-set-aside for caseId: {}", envelope.payloadAsJsonObject().getString("caseId"));
sender.send(envelopeFrom(metadataFrom(envelope.metadata()).withName(PUBLIC_APPLICATION_SET_ASIDE_EVENT), envelope.payload()));
}

private void sendNotificationToDvlaToRemoveEndorsements(final JsonEnvelope envelope) throws FileServiceException {
final ApplicationDecisionSetAside decision = converter.convert(envelope.payloadAsJsonObject(), ApplicationDecisionSetAside.class);
final CaseDetails caseDetails = sjpService.getCaseDetails(decision.getCaseId(), envelope);
final CaseDetailsDecorator caseDetailsDecorator = new CaseDetailsDecorator(caseDetails);

if (endorsementRemovalNotificationService.hasEndorsementsToBeRemoved(caseDetailsDecorator)) {
LOGGER.info("Case has endorsements to be removed. Preparing notification to DVLA for caseId: {}", decision.getCaseId());
endorsementRemovalNotificationService.generateNotification(caseDetailsDecorator, envelope);
} else {
LOGGER.info("Case noes not have endorsements to be removed for caseId: {}", decision.getCaseId());
}
}
}
17 changes: 10 additions & 7 deletions ...ssor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,15 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) {
}
hearing.getCourtApplications().stream().forEach(courtApplication -> {
final String applicationType = courtApplication.getType().getType();
final String applicationCode = courtApplication.getType().getCode();
final String applicationId = courtApplication.getId().toString();
courtApplication.getCourtApplicationCases().stream().filter(CourtApplicationCase::getIsSJP).forEach(courtApplicationCase -> {
final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString();
final String applicationStatus = getApplicationStatus(courtApplication, applicationType);
sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus);
});
if(courtApplication.getCourtApplicationCases() != null && courtApplication.getJudicialResults() != null) {
courtApplication.getCourtApplicationCases().stream().filter(CourtApplicationCase::getIsSJP).forEach(courtApplicationCase -> {
final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString();
final String applicationStatus = getApplicationStatus(courtApplication, applicationType, applicationCode);
sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus);
});
}
});

}
Expand All @@ -81,13 +84,13 @@ private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicati
sender.send(envelopeToSend);
}

private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType) {
private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType, final String applicationCode) {

final Optional<String> applicationStatus =
courtApplication
.getJudicialResults()
.stream()
.map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId()))
.map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId(), applicationCode))
.filter(Objects::nonNull)
.findFirst();

Expand Down
9 changes: 5 additions & 4 deletions ...-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,16 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) {

hearing.getCourtApplications().stream().forEach(courtApplication -> {
final String applicationType = courtApplication.getType().getType();
final String applicationCode = courtApplication.getType().getCode();
final String applicationId = courtApplication.getId().toString();
if(courtApplication.getCourtApplicationCases() != null ) {
if(courtApplication.getCourtApplicationCases() != null && courtApplication.getJudicialResults() != null) {
courtApplication
.getCourtApplicationCases()
.stream()
.filter(CourtApplicationCase::getIsSJP)
.forEach(courtApplicationCase -> {
final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString();
final String applicationStatus = getApplicationStatus(courtApplication, applicationType);
final String applicationStatus = getApplicationStatus(courtApplication, applicationType, applicationCode);
sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus);
});
}
Expand All @@ -93,13 +94,13 @@ private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicati
sender.send(envelopeToSend);
}

private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType) {
private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType, final String applicationCode) {

final Optional<String> applicationStatus =
courtApplication
.getJudicialResults()
.stream()
.map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId()))
.map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId(), applicationCode))
.filter(Objects::nonNull)
.findFirst();

Expand Down
4 changes: 3 additions & 1 deletion ...t-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ public enum ApplicationResult {
APA("48b8ff83-2d5d-4891-bab1-b0f5edcd3822"),

// Appeal withdrawn
AW("453539d1-c1a0-475d-9a02-16a659e6bc34");
AW("453539d1-c1a0-475d-9a02-16a659e6bc34"),

DISM("14d66587-8fbe-424f-a369-b1144f1684e3");

private final String resultId;

Expand Down
Loading
Loading