From 427d1efa195a5fd29e3d4ed9a48d59d414f1a7ee Mon Sep 17 00:00:00 2001 From: Erol Kureli <> Date: Tue, 14 Jul 2026 15:26:11 +0100 Subject: [PATCH 1/2] CIMD-3915: set verdict in dismiss decision --- .../DismissDecisionResultAggregator.java | 8 ++++++++ .../DismissDecisionResultAggregatorTest.java | 20 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java index e8ace4c81..aa23c04e3 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java @@ -8,6 +8,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.decision.Dismiss; import uk.gov.moj.cpp.sjp.domain.decision.OffenceDecision; +import uk.gov.moj.cpp.sjp.event.processor.results.converter.ConvictionInfo; import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCachedReferenceData; import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.DecisionAggregate; @@ -49,6 +50,13 @@ public void aggregate(final OffenceDecision offenceDecision, setFinalOffence(decisionAggregate, offenceId, judicialResults); + // conviction information - a dismissal carries the FOUND_NOT_GUILTY verdict but has no + // conviction date or convicting court + decisionAggregate.putConvictionInfo(offenceId, + new ConvictionInfo(offenceId, + dismissOffenceDecision.getOffenceDecisionInformation().getVerdict(), + dismissOffenceDecision.getConvictionDate(), + null)); } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregatorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregatorTest.java index 5758a2ff8..f9d5c9b22 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregatorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregatorTest.java @@ -8,10 +8,11 @@ import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.moj.cpp.sjp.domain.decision.OffenceDecisionInformation.createOffenceDecisionInformation; -import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_GUILTY; +import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_NOT_GUILTY; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCaseResultsConstants.DATE_FORMAT; import uk.gov.moj.cpp.sjp.domain.decision.Dismiss; +import uk.gov.moj.cpp.sjp.event.processor.results.converter.ConvictionInfo; import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.DecisionAggregate; import org.hamcrest.Matchers; @@ -37,7 +38,7 @@ public void setUp() { @Test public void shouldPopulateResultWithRightPrompts() { final Dismiss offenceDecision - = new Dismiss(null, createOffenceDecisionInformation(offence1Id, FOUND_GUILTY)); + = new Dismiss(null, createOffenceDecisionInformation(offence1Id, FOUND_NOT_GUILTY)); aggregator.aggregate(offenceDecision, sjpSessionEnvelope, resultsAggregate, resultedOn); @@ -49,4 +50,19 @@ public void shouldPopulateResultWithRightPrompts() { hasProperty("judicialResultPrompts", is(nullValue())))))); assertThat(resultsAggregate.getFinalOffence(offenceDecision.getOffenceIds().get(0)),Matchers.is(true)); } + + @Test + public void shouldPopulateConvictionInfoWithFoundNotGuiltyVerdict() { + final Dismiss offenceDecision + = new Dismiss(null, createOffenceDecisionInformation(offence1Id, FOUND_NOT_GUILTY)); + + aggregator.aggregate(offenceDecision, sjpSessionEnvelope, resultsAggregate, resultedOn); + + final ConvictionInfo convictionInfo = resultsAggregate.getConvictionInfo(offence1Id); + assertThat(convictionInfo, is(Matchers.notNullValue())); + assertThat(convictionInfo.getOffenceId(), Matchers.is(offence1Id)); + assertThat(convictionInfo.getVerdictType(), Matchers.is(FOUND_NOT_GUILTY)); + assertThat(convictionInfo.getConvictionDate(), is(nullValue())); + assertThat(convictionInfo.getConvictingCourt(), is(nullValue())); + } } From 36c2f80966f5e5b9fc016f3f4c9a98170b204a16 Mon Sep 17 00:00:00 2001 From: Erol Kureli <> Date: Tue, 14 Jul 2026 20:21:20 +0100 Subject: [PATCH 2/2] CIMD-3915: pom update --- pom.xml | 2 +- sjp-command/pom.xml | 2 +- sjp-command/sjp-command-api/pom.xml | 2 +- sjp-command/sjp-command-controller/pom.xml | 2 +- sjp-command/sjp-command-handler/pom.xml | 2 +- sjp-domain/pom.xml | 2 +- sjp-domain/sjp-domain-aggregate/pom.xml | 2 +- sjp-domain/sjp-domain-common/pom.xml | 2 +- sjp-domain/sjp-domain-event-processor/pom.xml | 2 +- sjp-domain/sjp-domain-event/pom.xml | 2 +- sjp-domain/sjp-domain-prosecution/pom.xml | 2 +- sjp-domain/sjp-domain-transformation/pom.xml | 2 +- .../sjp-domain-transformation-anonymise/pom.xml | 2 +- .../sjp-domain-transformation-postcode/pom.xml | 2 +- sjp-event-sources/pom.xml | 2 +- sjp-event/pom.xml | 2 +- sjp-event/sjp-event-indexer/pom.xml | 2 +- sjp-event/sjp-event-listener/pom.xml | 2 +- sjp-event/sjp-event-processor/pom.xml | 2 +- sjp-healthchecks/pom.xml | 2 +- sjp-integration-test/pom.xml | 2 +- sjp-json/pom.xml | 2 +- sjp-query/pom.xml | 2 +- sjp-query/sjp-query-api/pom.xml | 2 +- sjp-query/sjp-query-view/pom.xml | 2 +- sjp-service/pom.xml | 2 +- sjp-viewstore/pom.xml | 2 +- sjp-viewstore/sjp-viewstore-liquibase/pom.xml | 2 +- sjp-viewstore/sjp-viewstore-persistence/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 253ce2839..a54a7c1af 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT pom diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml index a447bb724..4970a00dd 100644 --- a/sjp-command/pom.xml +++ b/sjp-command/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml index 0a97762df..3e4622411 100644 --- a/sjp-command/sjp-command-api/pom.xml +++ b/sjp-command/sjp-command-api/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml index d81189cb7..37c65db4a 100644 --- a/sjp-command/sjp-command-controller/pom.xml +++ b/sjp-command/sjp-command-controller/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml index 2b3106fed..14be69262 100644 --- a/sjp-command/sjp-command-handler/pom.xml +++ b/sjp-command/sjp-command-handler/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-domain/pom.xml b/sjp-domain/pom.xml index 76ad98e20..791e622b2 100644 --- a/sjp-domain/pom.xml +++ b/sjp-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-domain diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml index 6994a3c97..b9bbbd948 100644 --- a/sjp-domain/sjp-domain-aggregate/pom.xml +++ b/sjp-domain/sjp-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-domain-aggregate diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml index 542fb4081..d121e277b 100644 --- a/sjp-domain/sjp-domain-common/pom.xml +++ b/sjp-domain/sjp-domain-common/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml index ea03557ad..f4f6ac372 100644 --- a/sjp-domain/sjp-domain-event-processor/pom.xml +++ b/sjp-domain/sjp-domain-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml index 98775037f..5a29351b6 100644 --- a/sjp-domain/sjp-domain-event/pom.xml +++ b/sjp-domain/sjp-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-domain-event diff --git a/sjp-domain/sjp-domain-prosecution/pom.xml b/sjp-domain/sjp-domain-prosecution/pom.xml index 773e0deb4..7c613e196 100644 --- a/sjp-domain/sjp-domain-prosecution/pom.xml +++ b/sjp-domain/sjp-domain-prosecution/pom.xml @@ -4,7 +4,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-domain-prosecution diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml index 6eb14666d..b85f84746 100644 --- a/sjp-domain/sjp-domain-transformation/pom.xml +++ b/sjp-domain/sjp-domain-transformation/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml index f53c0a3db..90b088824 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml index 0f523a67c..61692869e 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-event-sources/pom.xml b/sjp-event-sources/pom.xml index 8d5a0424a..0f01baef4 100644 --- a/sjp-event-sources/pom.xml +++ b/sjp-event-sources/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml index 21716df14..ed6b821ee 100644 --- a/sjp-event/pom.xml +++ b/sjp-event/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml index b3cb2ae29..25c676483 100644 --- a/sjp-event/sjp-event-indexer/pom.xml +++ b/sjp-event/sjp-event-indexer/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-listener/pom.xml b/sjp-event/sjp-event-listener/pom.xml index 9840673d3..c449e3541 100644 --- a/sjp-event/sjp-event-listener/pom.xml +++ b/sjp-event/sjp-event-listener/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml index 8a76656eb..e21ffe25c 100644 --- a/sjp-event/sjp-event-processor/pom.xml +++ b/sjp-event/sjp-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-healthchecks/pom.xml b/sjp-healthchecks/pom.xml index 80d875357..dbb168e56 100644 --- a/sjp-healthchecks/pom.xml +++ b/sjp-healthchecks/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-integration-test/pom.xml b/sjp-integration-test/pom.xml index 5e1107a49..16ad598c0 100644 --- a/sjp-integration-test/pom.xml +++ b/sjp-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml index bdbe347df..624b760f5 100644 --- a/sjp-json/pom.xml +++ b/sjp-json/pom.xml @@ -2,7 +2,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml index 7917e49ef..78d183d84 100644 --- a/sjp-query/pom.xml +++ b/sjp-query/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml index ccf1a9251..9c329bf97 100644 --- a/sjp-query/sjp-query-api/pom.xml +++ b/sjp-query/sjp-query-api/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml index 4c216934c..07fbcc233 100644 --- a/sjp-query/sjp-query-view/pom.xml +++ b/sjp-query/sjp-query-view/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 diff --git a/sjp-service/pom.xml b/sjp-service/pom.xml index 2e268d530..5369dea95 100644 --- a/sjp-service/pom.xml +++ b/sjp-service/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-service war diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml index 06ee63ae0..9a9287285 100644 --- a/sjp-viewstore/pom.xml +++ b/sjp-viewstore/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0 sjp-viewstore diff --git a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml index 32fb8e928..fd0c42802 100644 --- a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml +++ b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-viewstore - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT sjp-viewstore-liquibase diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml index 7cf9c1358..90a0007d9 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/pom.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ sjp-viewstore uk.gov.moj.cpp.sjp - 17.104.182-SNAPSHOT + 17.104.182-CIMD-3915-SNAPSHOT 4.0.0