Skip to content

merge main into cct-1981 branch SJP #136

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
arcadiushmcts merged 1 commit into from
Aug 17, 2026
Merged

merge main into cct-1981 branch SJP #136

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
14 changes: 12 additions & 2 deletions ...ov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static java.lang.System.lineSeparator;
import static java.util.UUID.fromString;
import static java.util.stream.Collectors.joining;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static uk.gov.justice.core.courts.JudicialResult.judicialResult;

import uk.gov.justice.core.courts.JudicialResult;
Expand Down Expand Up @@ -65,6 +66,7 @@ public class JudicialResultHelper {
"I", "INTERMEDIARY");

public static final String Y = "Y";
public static final String DURATION = "duration";


private JudicialResultHelper() {
Expand Down Expand Up @@ -93,13 +95,21 @@ public static JudicialResultPrompt.Builder populatePromptDefinitionAttributesBas
resultDefinition.getJsonArray("prompts")
.getValuesAs(JsonObject.class)
.stream()
.filter(prompt -> prompt.getString("id").equals(jsPrompt.getId().toString())
&& duration.equals(prompt.getString("duration")))
.filter(prompt -> prompt.getString("id").equals(jsPrompt.getId().toString()))
.filter(prompt -> prompt.containsKey(DURATION))
.filter(prompt -> isNotBlank(prompt.getString(DURATION)) && isNotBlank(duration))
.filter(prompt -> isDurationStringMatchesPromptValue(duration, prompt))
.findFirst();

return populatePrompt(jsPrompt, promptJson);
}

private static boolean isDurationStringMatchesPromptValue(final String duration, final JsonObject prompt) {
final String alphaOnlyPattern = "[^a-zA-Z]";
final String promptValue = prompt.getString(DURATION).replaceAll(alphaOnlyPattern, "");
return duration.equals(promptValue) || duration.toUpperCase().contains(promptValue.toUpperCase()) || promptValue.toUpperCase().contains(duration.toUpperCase());
}

@SuppressWarnings("squid:S00112")
private static JudicialResultPrompt.Builder populatePrompt(final JPrompt jsPrompt,
final Optional<JsonObject> promptJson) {
Expand Down
8 changes: 8 additions & 0 deletions ...rocessor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -49,6 +50,13 @@ public void aggregate(final OffenceDecision offenceDecision,

setFinalOffence(decisionAggregate, offenceId, judicialResults);

// conviction information - a dismissal carries the FOUND_NOT_GUILTY verdict dated on the
// resulting date but has no convicting court
decisionAggregate.putConvictionInfo(offenceId,
new ConvictionInfo(offenceId,
dismissOffenceDecision.getOffenceDecisionInformation().getVerdict(),
resultedOn.toLocalDate(),
null));
}

}
162 changes: 162 additions & 0 deletions ...oj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
package uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult;

import static java.util.UUID.fromString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JPrompt.DDP_DISQUALIFICATION_PERIOD;
import static uk.gov.moj.cpp.sjp.event.processor.utils.FileUtil.getFileContentAsJson;

import uk.gov.justice.core.courts.JudicialResultPrompt;

import java.math.BigDecimal;
import java.util.HashMap;
import java.util.UUID;

import javax.json.Json;
import javax.json.JsonObject;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class JudicialResultHelperTest {

private static final String RESULT_DEFINITION_FILE = "ddq-result-definition.json";
private static final UUID DISQUALIFICATION_PERIOD_PROMPT_ID = fromString("2bf54447-328c-4c1b-a123-341adbd52172");

private JsonObject resultDefinition;

@BeforeEach
public void setUp() {
resultDefinition = getFileContentAsJson(RESULT_DEFINITION_FILE, new HashMap<>());
}

@Test
public void shouldPopulatePromptDefinitionAttributesForYearsDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Years");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getLabel(), is("Disqualification period"));
assertThat(prompt.getWelshLabel(), is("Cyfnod gwahardd"));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
assertThat(prompt.getType(), is("INTM"));
assertThat(prompt.getCourtExtract(), is("Y"));
assertThat(prompt.getDurationSequence(), is(1));
assertThat(prompt.getPromptSequence(), is(new BigDecimal(100)));
assertThat(prompt.getIsFinancialImposition(), is(false));
}

@Test
public void shouldPopulatePromptDefinitionAttributesForMonthsDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Months");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getLabel(), is("Disqualification period"));
assertThat(prompt.getWelshLabel(), is("Cyfnod gwahardd"));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
assertThat(prompt.getType(), is("INTM"));
assertThat(prompt.getCourtExtract(), is("Y"));
assertThat(prompt.getDurationSequence(), is(1));
assertThat(prompt.getPromptSequence(), is(new BigDecimal(100)));
assertThat(prompt.getIsFinancialImposition(), is(false));
}

@Test
public void shouldPopulatePromptDefinitionAttributesForDaysDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Days");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getLabel(), is("Disqualification period"));
assertThat(prompt.getWelshLabel(), is("Cyfnod gwahardd"));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
assertThat(prompt.getType(), is("INTM"));
assertThat(prompt.getCourtExtract(), is("Y"));
assertThat(prompt.getDurationSequence(), is(1));
assertThat(prompt.getPromptSequence(), is(new BigDecimal(100)));
assertThat(prompt.getIsFinancialImposition(), is(false));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenDurationDiffersOnlyByCase() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "months");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenDurationIsSingularFormOfPromptValue() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Year");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenPromptValueIsSubstringOfDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "CalendarDays");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldThrowRuntimeExceptionWhenPromptNotFoundForDuration() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
JPrompt.AMOUNT_OF_FINE, resultDefinition, "Years"));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationDoesNotMatchAnyPromptValue() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Weeks"));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationIsBlank() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, ""));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationIsNull() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, null));
}

@Test
public void shouldThrowRuntimeExceptionWhenMatchingPromptHasBlankDurationValue() {
final JsonObject resultDefinitionWithBlankDuration = Json.createObjectBuilder()
.add("prompts", Json.createArrayBuilder()
.add(Json.createObjectBuilder()
.add("id", DISQUALIFICATION_PERIOD_PROMPT_ID.toString())
.add("duration", "")))
.build();

assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinitionWithBlankDuration, "Years"));
}
}
20 changes: 18 additions & 2 deletions ...ssor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand All @@ -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(resultedOn.toLocalDate()));
assertThat(convictionInfo.getConvictingCourt(), is(nullValue()));
}
}
Loading
Loading