Dev/dd 41592

pom.xml

@@ -42,12 +42,12 @@
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
         <material.version>17.0.57</material.version>
         <notification.notify.version>17.0.1</notification.notify.version>
-        <referencedata.version>17.103.133</referencedata.version>
-        <referencedata.offences.version>17.0.38</referencedata.offences.version>
+        <referencedata.version>17.104.137</referencedata.version>
+        <referencedata.offences.version>17.104.52</referencedata.offences.version>
         <scheduling.version>17.0.11</scheduling.version>
         <authorisation.service.version>0.1.49</authorisation.service.version>
         <usersgroups.version>17.104.48</usersgroups.version>
-        <progression.version>17.0.262</progression.version>
+        <progression.version>17.0.286</progression.version>
         <prosecutioncasefile.version>17.0.66</prosecutioncasefile.version>
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
@@ -65,7 +65,7 @@
         <apache.pdfbox.version>2.0.11</apache.pdfbox.version>
         <argLine>-Djava.locale.providers=CLDR</argLine>
         <elasticsearch-maven-plugin.version>6.13</elasticsearch-maven-plugin.version>
-        <elasticsearch.embedded.version>9.2.2</elasticsearch.embedded.version>
+        <elasticsearch.embedded.version>7.16.2</elasticsearch.embedded.version>
         <stagingenforcement.version>17.104.81</stagingenforcement.version>
         <unifiedsearch.version>17.104.4-DD-41592-SNAPSHOT</unifiedsearch.version>
         <jsonassert.version>1.5.0</jsonassert.version>

sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java

@@ -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;
@@ -65,6 +66,7 @@ public class JudicialResultHelper {
             "I", "INTERMEDIARY");
 
     public static final String Y = "Y";
+    public static final String DURATION = "duration";
 
 
     private JudicialResultHelper() {
@@ -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) {

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 dated on the
+        // resulting date but has no convicting court
+        decisionAggregate.putConvictionInfo(offenceId,
+                new ConvictionInfo(offenceId,
+                        dismissOffenceDecision.getOffenceDecisionInformation().getVerdict(),
+                        resultedOn.toLocalDate(),
+                        null));
     }
 
 }

sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java

@@ -34,6 +34,7 @@
 import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.DecisionAggregate;
 import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCachedReferenceData;
 
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -160,7 +161,8 @@ private void populateCourtTimingDetails(final JsonObject resultDefinition,
                 .withJudicialResultPromptTypeId(NHMC_DURATION_IN_MINUTES.getId())
                 .withValue(caseOffenceListedInCriminalCourts.getHearingDays().get(0).getListedDurationMinutes().toString()).build());
 
-        final ZonedDateTime sittingDateTime = caseOffenceListedInCriminalCourts.getHearingDays().get(0).getSittingDay();
+        final ZonedDateTime sittingDateTime = caseOffenceListedInCriminalCourts.getHearingDays().get(0).getSittingDay()
+                .withZoneSameInstant(ZoneId.of("Europe/London"));
 
         judicialResultPrompts.add(getPrompt(NHMC_HOUSE_HEARING_TIME, resultDefinition)
                 .withJudicialResultPromptTypeId(NHMC_HOUSE_HEARING_TIME.getId())

sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java

@@ -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"));
+    }
+}

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