Merge branch 'master' into feat/civ-11158

Jenkinsfile_nightly

@@ -14,6 +14,8 @@ properties([
       description: 'The URL of service auth provider'),
     string(name: 'CCD_DATA_STORE_URL', defaultValue: 'http://ccd-data-store-api-aat.service.core-compute-aat.internal',
       description: 'The URL of ccd data store'),
+    string(name: 'AAC_API_URL', defaultValue: 'http://aac-manage-case-assignment-aat.service.core-compute-aat.internal',
+      description: 'The URL of AAC service'),
     string(name: 'CIVIL_SERVICE_URL', defaultValue: 'http://civil-service-aat.service.core-compute-aat.internal',
       description: 'The URL of civil service'),
     string(name: 'WAIT_FOR_TIMEOUT_MS',
@@ -60,6 +62,7 @@ withNightlyPipeline(type, product, component) {
   env.URL_FOR_SECURITY_SCAN = params.CIVIL_SERVICE_URL
   env.TESTS_FOR_ACCESSIBILITY = true
   env.NIGHTLY_RUN = true
+  env.AAC_API_URL = params.AAC_API_URL
   overrideVaultEnvironments([
   'aat': params.ENVIRONMENT
   ])

src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/cases/CasesControllerTest.java

@@ -12,13 +12,12 @@
 import uk.gov.hmcts.reform.civil.exceptions.CaseDataInvalidException;
 import uk.gov.hmcts.reform.civil.exceptions.CaseNotFoundException;
 import uk.gov.hmcts.reform.civil.exceptions.UserNotFoundOnCaseException;
-import uk.gov.hmcts.reform.civil.exceptions.CaseNotFoundException;
-import uk.gov.hmcts.reform.civil.exceptions.UserNotFoundOnCaseException;
 import uk.gov.hmcts.reform.civil.helpers.CaseDetailsConverter;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.bulkclaims.CaseworkerSubmitEventDTo;
 import uk.gov.hmcts.reform.civil.model.citizenui.DashboardClaimInfo;
 import uk.gov.hmcts.reform.civil.model.citizenui.DashboardResponse;
+import uk.gov.hmcts.reform.civil.model.citizenui.dto.ExtendedDeadlineDto;
 import uk.gov.hmcts.reform.civil.model.citizenui.dto.EventDto;
 import uk.gov.hmcts.reform.civil.model.repaymentplan.ClaimantProposedPlan;
 import uk.gov.hmcts.reform.civil.service.CoreCaseDataService;
@@ -42,6 +41,7 @@
 import java.util.Map;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -228,10 +228,10 @@ void shouldSubmitEventSuccessfully() {
     @SneakyThrows
     void shouldCalculateDeadlineSuccessfully() {
         LocalDate extensionDate = LocalDate.of(2022, 6, 6);
-        when(deadlineExtensionCalculatorService.calculateExtendedDeadline(any())).thenReturn(extensionDate);
+        when(deadlineExtensionCalculatorService.calculateExtendedDeadline(any(), anyInt())).thenReturn(extensionDate);
         doPost(
             BEARER_TOKEN,
-            extensionDate,
+            ExtendedDeadlineDto.builder().responseDate(extensionDate).plusDays(5).build(),
             CALCULATE_DEADLINE_URL
         )
             .andExpect(content().json(toJson(extensionDate)))

src/main/java/uk/gov/hmcts/reform/civil/controllers/cases/CasesController.java

@@ -24,6 +24,7 @@
 import uk.gov.hmcts.reform.civil.exceptions.CaseDataInvalidException;
 import uk.gov.hmcts.reform.civil.model.bulkclaims.CaseworkerSubmitEventDTo;
 import uk.gov.hmcts.reform.civil.model.citizenui.DashboardResponse;
+import uk.gov.hmcts.reform.civil.model.citizenui.dto.ExtendedDeadlineDto;
 import uk.gov.hmcts.reform.civil.model.citizenui.dto.EventDto;
 import uk.gov.hmcts.reform.civil.model.citizenui.dto.RepaymentDecisionType;
 import uk.gov.hmcts.reform.civil.model.repaymentplan.ClaimantProposedPlan;
@@ -174,8 +175,9 @@ public ResponseEntity<CaseDetails> submitEvent(
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "OK"),
         @ApiResponse(responseCode = "401", description = "Not Authorized")})
-    public ResponseEntity<LocalDate> calculateNewResponseDeadline(@RequestBody LocalDate extendedDeadline) {
-        LocalDate calculatedDeadline = deadlineExtensionCalculatorService.calculateExtendedDeadline(extendedDeadline);
+    public ResponseEntity<LocalDate> calculateNewResponseDeadline(@RequestBody ExtendedDeadlineDto deadlineDateDetails) {
+        LocalDate calculatedDeadline = deadlineExtensionCalculatorService.calculateExtendedDeadline(
+            deadlineDateDetails.getResponseDate(), deadlineDateDetails.getPlusDays());
         return new ResponseEntity<>(calculatedDeadline, HttpStatus.OK);
     }
 

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/camunda/notification/NotificationData.java

@@ -84,6 +84,9 @@ public interface NotificationData {
     String OTHER_SOL_NAME = "other solicitor name";
     String EXTERNAL_ID = "externalId";
 
+    // evidence upload
+    String UPLOADED_DOCUMENTS = "uploaded documents";
+
     Map<String, String> addProperties(CaseData caseData);
 
 }

src/main/java/uk/gov/hmcts/reform/civil/handler/callback/user/ClaimantResponseCuiCallbackHandler.java

@@ -14,6 +14,7 @@
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.service.citizenui.ResponseOneVOneShowTagService;
+import uk.gov.hmcts.reform.civil.service.citizen.UpdateCaseManagementDetailsService;
 
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -35,6 +36,7 @@ public class ClaimantResponseCuiCallbackHandler extends CallbackHandler {
     private final ResponseOneVOneShowTagService responseOneVOneService;
 
     private final ObjectMapper objectMapper;
+    private final UpdateCaseManagementDetailsService updateCaseManagementLocationDetailsService;
 
     @Override
     protected Map<String, Callback> callbacks() {
@@ -62,14 +64,16 @@ private CallbackResponse populateCaseData(CallbackParams callbackParams) {
 
     private CallbackResponse aboutToSubmit(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
-        CaseData updatedData = caseData.toBuilder()
-            .applicant1ResponseDate(LocalDateTime.now())
-            .businessProcess(BusinessProcess.ready(CLAIMANT_RESPONSE_CUI))
-            .build();
+        CaseData.CaseDataBuilder<?, ?> builder = caseData.toBuilder()
+                .applicant1ResponseDate(LocalDateTime.now())
+                .businessProcess(BusinessProcess.ready(CLAIMANT_RESPONSE_CUI));
+
+        updateCaseManagementLocationDetailsService.updateCaseManagementDetails(builder, callbackParams);
 
+        CaseData updatedData = builder.build();
         AboutToStartOrSubmitCallbackResponse.AboutToStartOrSubmitCallbackResponseBuilder response =
-            AboutToStartOrSubmitCallbackResponse.builder()
-                .data(updatedData.toMap(objectMapper));
+                AboutToStartOrSubmitCallbackResponse.builder()
+                        .data(updatedData.toMap(objectMapper));
 
         updateClaimEndState(response, updatedData);