DTSPB-4663 fix CCD Concurrency in SS

build.gradle

@@ -170,8 +170,8 @@ def versions = [
         lombok                          : '1.18.38',
         mapStruct                       : '1.3.0.Final',
         pact_version                    : '4.1.34',
-        piTest                          : '1.19.1',
-        probateCommonsVersion           : '2.0.56',
+        piTest                          : '1.19.0',
+        probateCommonsVersion           : '2.0.58',
         restAssured                     : '5.5.1',
         serenity                        : '4.2.17',
         serviceAuthProviderClient       : '5.3.0',
@@ -247,7 +247,7 @@ dependencies {
     implementation group: 'org.sonarsource.api.plugin', name: 'sonar-plugin-api', version: '11.3.0.2824'
     implementation group: 'org.mapstruct', name: 'mapstruct-processor', version: versions.mapStruct
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jacksonDatabind
-    implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.1'
+    implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.0'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: versions.lombok
     annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: versions.mapStruct
 

charts/probate-orchestrator-service/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: probate-orchestrator-service
 home: https://github.com/hmcts/probate-orchestrator-service
-version: 1.0.49
+version: 1.0.50
 description: HMCTS Probate Orchestrator Service
 maintainers:
   - name: HMCTS Probate Team

charts/probate-orchestrator-service/values.yaml

@@ -14,7 +14,7 @@ java:
     SERVICES_CORECASEDATA_BASEURL: "http://ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
     SERVICES_AUTH_PROVIDER_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
     AUTH_IDAM_CLIENT_BASEURL: "https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net"
-    SUBMIT_SERVICE_API_URL: "http://probate-submit-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
+    SUBMIT_SERVICE_API_URL: "http://probate-submit-service-pr-1092-java"
     BUSINESS_SERVICE_API_URL: "http://probate-business-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
     BACK_OFFICE_API_URL: "http://probate-back-office-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
     MAIL_JAVAMAILPROPERTIES_MAIL_SMTP_SSL_ENABLE: false

src/functionalTest/java/uk/gov/hmcts/probate/functional/tests/FormsFunctionalTests.java

@@ -149,7 +149,7 @@ public void shouldSaveFormSuccessfully() {
                 .headers(utils.getCitizenHeaders())
                 .body(draftJsonStr)
                 .when()
-                .post(FORMS_CASES + caseId)
+                .post(FORMS_CASES + caseId + "/" + "2099-01-01T12:12:12.123")
                 .then()
                 .assertThat()
                 .statusCode(200)

src/integrationTest/java/uk/gov/hmcts/probate/controller/FormsControllerIT.java

@@ -23,6 +23,7 @@
 import uk.gov.hmcts.reform.probate.model.payments.PaymentDto;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
@@ -40,6 +41,9 @@
 public class FormsControllerIT {
 
     private static final String EMAIL_ADDRESS = "1570130475566595";
+    private static final LocalDateTime LAST_MODIFIED_DATE_TIME = LocalDateTime.of(2018, 1, 1,
+            12, 12, 12).withNano(123 * 1_000_000);
+    private static final String LAST_MODIFIED_DATE_TIME_STRING = "2018-01-01T12:12:12.123";
 
     private static final String FORMS_ENDPOINT = "/forms";
     private static final String FORMS_CASE_ENDPOINT = "/forms/case";
@@ -105,27 +109,33 @@ public void setUp() throws Exception {
 
     @Test
     public void shouldSaveCaveatForm() throws Exception {
-        when(submitService.saveCase(eq(EMAIL_ADDRESS), eq(caveatForm))).thenReturn(caveatForm);
+        when(submitService.saveCase(eq(EMAIL_ADDRESS), eq(LAST_MODIFIED_DATE_TIME),
+                eq(caveatForm))).thenReturn(caveatForm);
 
-        mockMvc.perform(post(FORMS_CASE_ENDPOINT + "/" + EMAIL_ADDRESS)
+        mockMvc.perform(post(FORMS_CASE_ENDPOINT + "/" + EMAIL_ADDRESS
+                        + "/" + LAST_MODIFIED_DATE_TIME_STRING)
             .content(caveatFormJsonStr)
             .contentType(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().json(caveatFormJsonStr, true));
-        verify(submitService, times(1)).saveCase(eq(EMAIL_ADDRESS), eq(caveatForm));
+        verify(submitService, times(1)).saveCase(eq(EMAIL_ADDRESS),
+                eq(LAST_MODIFIED_DATE_TIME), eq(caveatForm));
     }
 
     @Test
     public void shouldSaveIntestacyForm() throws Exception {
-        when(submitService.saveCase(eq(EMAIL_ADDRESS), eq(intestacyForm))).thenReturn(intestacyForm);
+        when(submitService.saveCase(eq(EMAIL_ADDRESS), eq(LAST_MODIFIED_DATE_TIME),
+                eq(intestacyForm))).thenReturn(intestacyForm);
 
-        mockMvc.perform(post(FORMS_CASE_ENDPOINT + "/" + EMAIL_ADDRESS)
+        mockMvc.perform(post(FORMS_CASE_ENDPOINT + "/" + EMAIL_ADDRESS
+                        + "/" + LAST_MODIFIED_DATE_TIME_STRING)
             .content(intestacyFormJsonStr)
             .contentType(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().json(intestacyFormJsonStr, true));
 
-        verify(submitService, times(1)).saveCase(eq(EMAIL_ADDRESS), eq(intestacyForm));
+        verify(submitService, times(1)).saveCase(eq(EMAIL_ADDRESS),
+                eq(LAST_MODIFIED_DATE_TIME), eq(intestacyForm));
     }
 
     @Test
@@ -154,7 +164,8 @@ public void shouldSubmitPaFormWithPayment() throws Exception {
             .andExpect(status().isOk())
             .andExpect(content().json(paFormJsonStr, true));
 
-        verify(submitService, times(1)).update(eq(EMAIL_ADDRESS), eq(ProbateType.PA), eq(paymentDto));
+        verify(submitService, times(1)).update(eq(EMAIL_ADDRESS),
+                eq(ProbateType.PA), eq(paymentDto));
     }
 
 
@@ -172,7 +183,8 @@ public void shouldSubmitIntestacyFormWithPayment() throws Exception {
             .andExpect(status().isOk())
             .andExpect(content().json(paFormJsonStr, true));
 
-        verify(submitService, times(1)).update(eq("123456"), eq(ProbateType.INTESTACY), eq(paymentDto));
+        verify(submitService, times(1)).update(eq("123456"),
+                eq(ProbateType.INTESTACY), eq(paymentDto));
     }
 
     @Test

src/main/java/uk/gov/hmcts/probate/client/submit/SubmitServiceApi.java

@@ -93,7 +93,7 @@ ProbateCaseDetails saveCase(
     );
 
     @PostMapping(
-            value = "/cases/initate",
+            value = "/cases/initiate",
             headers = CONTENT_TYPE + "=" + APPLICATION_JSON_VALUE
     )
     ProbateCaseDetails initiateCase(

src/main/java/uk/gov/hmcts/probate/controller/FormsController.java

@@ -23,21 +23,25 @@
 import uk.gov.hmcts.reform.probate.model.forms.Form;
 import uk.gov.hmcts.reform.probate.model.payments.PaymentDto;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 @Tag(name = "FormsController", description = "Forms API")
 @RestController
 @Slf4j
 @RequiredArgsConstructor
 public class FormsController {
 
     private static final String FORMS_CASE_ENDPOINT = "/forms/case/{identifier}";
+    private static final String FORMS_SAVE_CASE_ENDPOINT = "/forms/case/{identifier}/{lastModifiedDateTime}";
     private static final String FORMS_CASES_ENDPOINT = "/forms/cases";
     private static final String FORMS_NEW_CASE_ENDPOINT = "/forms/newcase";
     private static final String SUBMISSIONS_ENDPOINT = "/submissions";
     private static final String FORMS_SUBMISSIONS_ENDPOINT = "/forms/{identifier}";
     private static final String VALIDATIONS_ENDPOINT = "/validations";
     private static final String PAYMENTS_ENDPOINT = "/payments";
     private static final String MIGRATE_DATA_ENDPOINT = "/migrateData";
-
+    private static final DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS");
     private final SubmitService submitService;
 
 
@@ -61,13 +65,15 @@ public ResponseEntity<CaseSummaryHolder> initiateForm(@RequestParam("probateType
         @ApiResponse(responseCode = "400", description = "Saving form failed"),
         @ApiResponse(responseCode = "422", description = "Invalid or missing attribute")
     })
-    @PostMapping(path = FORMS_CASE_ENDPOINT, consumes = MediaType.APPLICATION_JSON_VALUE,
+    @PostMapping(path = FORMS_SAVE_CASE_ENDPOINT, consumes = MediaType.APPLICATION_JSON_VALUE,
         produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public ResponseEntity<Form> saveForm(@RequestBody Form form,
-                                         @PathVariable("identifier") String identifier) {
-        log.info("Save form called");
-        return new ResponseEntity<>(submitService.saveCase(identifier, form), HttpStatus.OK);
+                                         @PathVariable("identifier") String identifier,
+                                         @PathVariable("lastModifiedDateTime") String lastModifiedDateTime) {
+        log.info("Save form called with identifier {} lastModifiedDateTime {}", identifier, lastModifiedDateTime);
+        LocalDateTime lastModifiedDateTimeParsed = LocalDateTime.parse(lastModifiedDateTime, DATE_TIME_FORMAT);
+        return new ResponseEntity<>(submitService.saveCase(identifier,lastModifiedDateTimeParsed, form), HttpStatus.OK);
     }
 
     @Operation(summary = "Get form data", description = "Get form data")

src/main/java/uk/gov/hmcts/probate/core/service/SubmitServiceImpl.java

@@ -15,6 +15,7 @@
 import uk.gov.hmcts.reform.probate.model.PaymentStatus;
 import uk.gov.hmcts.reform.probate.model.ProbateType;
 import uk.gov.hmcts.reform.probate.model.cases.CaseData;
+import uk.gov.hmcts.reform.probate.model.cases.CaseInfo;
 import uk.gov.hmcts.reform.probate.model.cases.CasePayment;
 import uk.gov.hmcts.reform.probate.model.cases.CaseType;
 import uk.gov.hmcts.reform.probate.model.cases.CollectionMember;
@@ -30,6 +31,7 @@
 import uk.gov.hmcts.reform.probate.model.forms.pa.PaForm;
 import uk.gov.hmcts.reform.probate.model.payments.PaymentDto;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -149,16 +151,19 @@ private Form initiateForm(ProbateType probateType) {
 
 
     @Override
-    public Form saveCase(String identifier, Form form) {
-        log.info("Save case called");
+    public Form saveCase(String identifier, LocalDateTime lastModefiedDateTime, Form form) {
+        log.info("Save case called lastModefiedDateTime {} :", lastModefiedDateTime);
         assertIdentifier(identifier, form);
         FormMapper formMapper = mappers.get(form.getType());
+        CaseInfo caseInfo = new CaseInfo();
+        caseInfo.setLastModifiedDateTime(lastModefiedDateTime);
+        log.info("Save case called submitServiceApi.saveCase");
         ProbateCaseDetails probateCaseDetails = submitServiceApi.saveCase(
             securityUtils.getAuthorisation(),
             securityUtils.getServiceAuthorisation(),
             identifier,
             form.getEventDescription(),
-            ProbateCaseDetails.builder().caseData(mapToCase(form, formMapper)).build()
+            ProbateCaseDetails.builder().caseData(mapToCase(form, formMapper)).caseInfo(caseInfo).build()
         );
         return mapFromCase(formMapper, probateCaseDetails);
     }
@@ -223,6 +228,7 @@ private void updateCcdCase(ProbateCaseDetails probateCaseDetails, Form formRespo
             .id(Long.valueOf(probateCaseDetails.getCaseInfo().getCaseId()))
             .state(probateCaseDetails.getCaseInfo().getState().getName())
             .lastModifiedDate(probateCaseDetails.getCaseInfo().getLastModifiedDate())
+            .lastModifiedDateTime(probateCaseDetails.getCaseInfo().getLastModifiedDateTime())
             .build());
     }
 

src/main/java/uk/gov/hmcts/probate/service/SubmitService.java

@@ -7,6 +7,7 @@
 import uk.gov.hmcts.reform.probate.model.forms.Form;
 import uk.gov.hmcts.reform.probate.model.payments.PaymentDto;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -20,7 +21,7 @@ public interface SubmitService {
 
     CaseSummaryHolder getAllCases();
 
-    Form saveCase(String identifier, Form form);
+    Form saveCase(String identifier, LocalDateTime lastModefidDateTime, Form form);
 
     Form submit(String identifier, Form form);
 

src/test/java/uk/gov/hmcts/probate/core/service/SubmitServiceImplTest.java

@@ -1,6 +1,9 @@
 package uk.gov.hmcts.probate.core.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.junit.jupiter.api.Assertions;
@@ -40,6 +43,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -71,6 +75,7 @@ public class SubmitServiceImplTest {
     private static final CaseState STATE = CaseState.DRAFT;
     private static final String CAVEAT_IDENTIFIER = "Id";
     private static final String CAVEAT_EXPIRY_DATE = "2020-12-31";
+    private static final LocalDateTime LAST_MODIFIED_DATE_TIME = LocalDateTime.of(2019, 1, 1, 0, 0, 0);
     private Map<ProbateType, FormMapper> mappers;
 
     @Mock
@@ -132,6 +137,9 @@ public void setUp() throws Exception {
         when(securityUtils.getServiceAuthorisation()).thenReturn(SERVICE_AUTHORIZATION);
         caseInfo = CaseInfo.builder().state(STATE).caseId(CASE_ID).build();
 
+        objectMapper.registerModule(new Jdk8Module());
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         // Intestacy setup
         String intestacyFormStr = TestUtils.getJsonFromFile("intestacyFormTest.json");
         intestacyForm = objectMapper.readValue(intestacyFormStr, IntestacyForm.class);
@@ -253,7 +261,7 @@ private void shouldSaveDraftForm(Form form, ProbateCaseDetails caseDetails, Stri
         when(submitServiceApi.saveCase(eq(AUTHORIZATION), eq(SERVICE_AUTHORIZATION),
             eq(identifier),eq("event description"), any(ProbateCaseDetails.class))).thenReturn(caseDetails);
 
-        Form formResponse = submitService.saveCase(identifier, form);
+        Form formResponse = submitService.saveCase(identifier, LAST_MODIFIED_DATE_TIME, form);
 
         assertThat(formResponse, is(form));
         verify(submitServiceApi, times(1)).saveCase(eq(AUTHORIZATION), eq(SERVICE_AUTHORIZATION),
@@ -272,7 +280,7 @@ public void shouldThrowErrorOnSaveDraftIfEmailAddressDoesNotMatchForm() {
         ((CaveatForm) caveatForm).setApplicationId("[email protected]");
 
         Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            submitService.saveCase(EMAIL_ADDRESS, caveatForm);
+            submitService.saveCase(EMAIL_ADDRESS, LAST_MODIFIED_DATE_TIME, caveatForm);
         });
     }
 

src/test/resources/caseSummary.json

@@ -7,7 +7,8 @@
       "ccdCase": {
         "id": 1234567890123456,
         "state": "Draft",
-        "lastModifiedDate": "2018-01-01"
+        "lastModifiedDate": "2018-01-01",
+        "lastModifiedDateTime": "2018-01-01T12:12:12.123"
       }
     },
     {
@@ -17,7 +18,8 @@
       "ccdCase": {
         "id": 1535574519543819,
         "state": "CaseCreated",
-        "lastModifiedDate": "2018-01-01"
+        "lastModifiedDate": "2018-01-01",
+        "lastModifiedDateTime": "2018-01-01T12:12:12.123"
       }
     }
   ]

src/test/resources/caveatForm.json

@@ -30,7 +30,8 @@
   "ccdCase": {
     "id": 1535574519543819,
     "state": "CaseCreated",
-    "lastModifiedDate": "2018-01-01"
+    "lastModifiedDate": "2018-01-01",
+    "lastModifiedDateTime": "2018-01-01T12:12:12.123"
   },
   "registry": {
     "name": "Birmingham"

src/test/resources/intestacyFormTest.json

@@ -97,7 +97,8 @@
   "ccdCase": {
     "id": 1535574519543818,
     "state": "CaseCreated",
-    "lastModifiedDate": "2018-01-01"
+    "lastModifiedDate": "2018-01-01",
+    "lastModifiedDateTime": "2018-01-01T12:12:12.123"
   },
   "registry": {
     "name": "Birmingham",

src/test/resources/paForm.json

@@ -43,7 +43,8 @@
   "ccdCase": {
     "id": 1551365512754035,
     "state": "CaseCreated",
-    "lastModifiedDate": "2018-01-01"
+    "lastModifiedDate": "2018-01-01",
+    "lastModifiedDateTime": "2018-01-01T12:12:12.123"
   },
   "payments": [
     {