Dev/dd 41592

.gitignore

@@ -1,7 +1,6 @@
 # Java
 *.class
 
-
 # Package Files
 *.jar
 *.war

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.9-M2</version>
+        <version>17.104.4-M3</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.sjp</groupId>
     <artifactId>sjp-parent</artifactId>
-    <version>17.103.165-DD-41592-SNAPSHOT</version>
+    <version>17.104.182-DD-41592-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -42,18 +42,18 @@
         <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.124</referencedata.version>
+        <referencedata.version>17.103.133</referencedata.version>
         <referencedata.offences.version>17.0.38</referencedata.offences.version>
         <scheduling.version>17.0.11</scheduling.version>
         <authorisation.service.version>0.1.49</authorisation.service.version>
-        <usersgroups.version>17.0.41</usersgroups.version>
-        <progression.version>17.0.224</progression.version>
+        <usersgroups.version>17.104.48</usersgroups.version>
+        <progression.version>17.0.262</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>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <file.alfresco.version>2.3.0</file.alfresco.version>
-        <coredomain.version>17.103.11</coredomain.version>
+        <coredomain.version>17.104.4</coredomain.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <joda-time.version>2.10</joda-time.version>
@@ -66,8 +66,8 @@
         <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>
-        <stagingenforcement.version>17.103.73</stagingenforcement.version>
-        <unifiedsearch.version>17.103.2-DD-41592-SNAPSHOT</unifiedsearch.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>
         <junit4.version>4.13.1</junit4.version>
         <maven.cucumber.reporting.version>2.0.0</maven.cucumber.reporting.version>
@@ -145,7 +145,7 @@
     </dependencies>
 
     <distributionManagement>
-         <site>
+        <site>
             <id>site</id>
             <url>${mvn.site.url}</url>
         </site>

runIntegrationTests.sh

@@ -12,7 +12,7 @@ DOCKER_CONTAINER_REGISTRY_HOST_NAME=crmdvrepo01
 
 LIQUIBASE_COMMAND=update
 #LIQUIBASE_COMMAND=dropAll
-
+#
 #fail script on error
 set -e
 

sjp-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.103.165-DD-41592-SNAPSHOT</version>
+        <version>17.104.182-DD-41592-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

sjp-command/sjp-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-command</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.103.165-DD-41592-SNAPSHOT</version>
+        <version>17.104.182-DD-41592-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java

@@ -1,16 +1,15 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
+import static java.util.Objects.nonNull;
 import static java.util.Optional.ofNullable;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
-import static javax.json.Json.createArrayBuilder;
-import static java.util.Objects.nonNull;
-
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
+import static uk.gov.justice.services.messaging.JsonObjects.getBoolean;
 import static uk.gov.justice.services.messaging.JsonObjects.getLong;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 import static uk.gov.moj.cpp.sjp.command.api.service.ContactDetailsService.convertBlankEmailsToNull;
-import static uk.gov.justice.services.messaging.JsonObjects.getBoolean;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java

@@ -130,4 +130,16 @@ public void saveApplicationDecision(final JsonEnvelope decisionEnvelope) {
                     .build(),
                 applicationDecision));
     }
+
+
+    @Handles("sjp.case-complete-bdf")
+    public void caseCompleteBdf(final JsonEnvelope jsonEnvelope) {
+        final JsonObject jsonObject = jsonEnvelope.payloadAsJsonObject();
+        sender.send(
+                envelopeFrom(
+                        metadataFrom(jsonEnvelope.metadata())
+                                .withName("sjp.command.case-complete-bdf")
+                                .build(),
+                        jsonObject));
+    }
 }

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java

@@ -1,17 +1,17 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.enveloper.Enveloper;
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.messaging.JsonObjects;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
@@ -35,14 +35,14 @@ public class EmployerApi {
     public void updateEmployer(final JsonEnvelope envelope) {
         final JsonObject payloadAsJsonObject = envelope.payloadAsJsonObject();
         //TODO ATCM-3151: when the UI is adapted remove this code below
-        final JsonObjectBuilder employerDetails = JsonObjects.createObjectBuilderWithFilter(payloadAsJsonObject,
+        final JsonObjectBuilder employerDetails = createObjectBuilderWithFilter(payloadAsJsonObject,
                 key -> !(CASE_ID.equals(key) || DEFENDANT_ID.equals(key) || ADDRESS.equals(key)));
 
         if (payloadAsJsonObject.containsKey(ADDRESS)) {
             employerDetails.add(ADDRESS, normalizePostcodeInAddress(payloadAsJsonObject.getJsonObject(ADDRESS)));
         }
 
-        final JsonObject payload = Json.createObjectBuilder()
+        final JsonObject payload = createObjectBuilder()
                 .add(CASE_ID, payloadAsJsonObject.getString(CASE_ID))
                 .add(DEFENDANT_ID, payloadAsJsonObject.getString(DEFENDANT_ID))
                 .add("employer", employerDetails)

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java

@@ -3,7 +3,9 @@
 import static java.util.Arrays.asList;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
+import static uk.gov.justice.services.messaging.JsonObjects.createReader;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 
 import uk.gov.justice.json.schemas.domains.sjp.command.PleadAocpOnline;
@@ -19,22 +21,22 @@
 import uk.gov.justice.services.messaging.Envelope;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.moj.cpp.sjp.command.api.validator.PleadOnlineValidator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.StringReader;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonReader;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 @ServiceComponent(COMMAND_API)
 public class PleadOnlineApi {
 
@@ -82,7 +84,7 @@ public void pleadOnline(final Envelope<PleadOnline> envelope) {
         checkValidationErrors(validationErrors);
 
         final JsonObjectBuilder pleaOnlineObjectBuilder = createObjectBuilderWithFilter(payload, field -> !asList(PERSONAL_DETAILS, EMPLOYER).contains(field));
-        if (payload.containsKey(PERSONAL_DETAILS))  {
+        if (payload.containsKey(PERSONAL_DETAILS)) {
             pleaOnlineObjectBuilder.add(PERSONAL_DETAILS, replacePostcodeInPayload(payload, PERSONAL_DETAILS));
         }
 
@@ -143,7 +145,7 @@ private void checkValidationErrors(Map<String, List<String>> validationErrors) {
 
 
     private JsonObject getCaseDetail(final Envelope<PleadOnline> envelope) {
-        final JsonObject queryCasePayload = Json.createObjectBuilder()
+        final JsonObject queryCasePayload = createObjectBuilder()
                 .add("caseId", envelope.payload().getCaseId().toString())
                 .build();
 
@@ -166,7 +168,7 @@ private JsonObjectBuilder replacePostcodeInPayload(final JsonObject payload, fin
     }
 
     private static JsonObject jsonFromString(final String jsonObjectStr) {
-        final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr));
+        final JsonReader jsonReader = createReader(new StringReader(jsonObjectStr));
         final JsonObject object = jsonReader.readObject();
         jsonReader.close();
         return object;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java

@@ -3,6 +3,7 @@
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.adapter.rest.exception.BadRequestException;
 import uk.gov.justice.services.core.annotation.Handles;
@@ -16,7 +17,6 @@
 import uk.gov.moj.cpp.sjp.domain.SessionCourt;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
@@ -43,7 +43,7 @@ public void startSession(final JsonEnvelope startSessionCommand) {
         final SessionCourt sessionCourt = referenceDataService.getCourtByCourtHouseOUCode(courtHouseOUCode, startSessionCommand)
                 .orElseThrow(() -> new BadRequestException(String.format("Court house with ou code %s not found", courtHouseOUCode)));
 
-        final JsonObjectBuilder startSessionBuilder = Json.createObjectBuilder()
+        final JsonObjectBuilder startSessionBuilder = createObjectBuilder()
                 .add(SESSION_ID, commandPayload.getString(SESSION_ID))
                 .add("courtHouseCode", courtHouseOUCode)
                 .add("courtHouseName", sessionCourt.getCourtHouseName())

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/accesscontrol/RuleConstants.java

@@ -174,4 +174,8 @@ public static List<String> getRejectPendingDefendantChanges() {
     public static List<String> getDeleteCaseDocumentActionGroups() {
         return asList(SECOND_LINE_SUPPORT);
     }
+
+    public static List<String> getCaseCompleteBdfGroups() {
+        return asList(GROUP_SYSTEM_USERS);
+    }
 }

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java

@@ -1,8 +1,8 @@
 package uk.gov.moj.cpp.sjp.command.api.service;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.requester.Requester;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java

@@ -1,9 +1,9 @@
 package uk.gov.moj.cpp.sjp.command.api.service;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.enveloper.Enveloper;

sjp-command/sjp-command-api/src/main/resources/rules/command-case-complete-bdf-api.drl

@@ -0,0 +1,18 @@
+package uk.gov.moj.cpp.sjp.command.api.accesscontrol;
+
+import uk.gov.moj.cpp.accesscontrol.drools.Outcome;
+import uk.gov.moj.cpp.accesscontrol.drools.Action;
+import java.util.Arrays;
+import uk.gov.moj.cpp.sjp.command.api.accesscontrol.RuleConstants;
+
+global uk.gov.moj.cpp.accesscontrol.common.providers.UserAndGroupProvider userAndGroupProvider;
+
+rule "Command - Rule for case complete bdf"
+  when
+    $outcome: Outcome();
+    $action: Action(name == "sjp.case-complete-bdf");
+    eval(userAndGroupProvider.isMemberOfAnyOfTheSuppliedGroups($action, RuleConstants.getCaseCompleteBdfGroups()));
+  then
+    $outcome.setSuccess(true);
+end
+

sjp-command/sjp-command-api/src/raml/json/schema/sjp.case-complete-bdf.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://justice.gov.uk/json/schemas/domains/sjp/command/sjp.case-complete-bdf.json",
+  "additionalProperties": false
+}

sjp-command/sjp-command-api/src/raml/json/sjp.case-complete-bdf.json

@@ -0,0 +1,3 @@
+{
+
+}

sjp-command/sjp-command-api/src/raml/sjp-command-api.raml

@@ -983,4 +983,30 @@ baseUri: http://localhost:8080/sjp-command-api/command/api/rest/sjp
         202:
           description: Accepted
         500:
-          description: Internal Server Error
+          description: Internal Server Error
+
+
+/cases/{caseId}/complete-bdf:
+  uriParameters:
+    caseId:
+      description: Id of the case to complete
+      type: string
+  post:
+    description: |
+      decision
+      ...
+      (mapping):
+          requestType: application/vnd.sjp.case-complete-bdf+json
+          name: sjp.case-complete-bdf
+      ...
+    body:
+          application/vnd.sjp.case-complete-bdf+json:
+            example:
+              !include json/sjp.case-complete-bdf.json
+            schema:
+              !include json/schema/sjp.case-complete-bdf.json
+    responses:
+      500:
+        description: Internal Server Error
+      202:
+        description: Accepted

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java

@@ -3,7 +3,6 @@
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
 import static java.util.Collections.singletonMap;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,6 +11,7 @@
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java

@@ -3,7 +3,6 @@
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
 import static java.util.Collections.singletonMap;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,6 +11,7 @@
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson;