Merge branch 'master' into feat/CIV-8997

hmcts · Nov 14, 2023 · 78fdb96 · 78fdb96
2 parents 266ba4e + ef0198c
commit 78fdb96
Show file tree

Hide file tree

Showing 27 changed files with 2,268 additions and 491 deletions.
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01067.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01067.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01068.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01068.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01069.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01069.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01073.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01073.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01075.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01075.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01076.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01076.docx
diff --git a/docker/docmosis/templates/CV-UNS-GAP-ENG-01078.docx b/docker/docmosis/templates/CV-UNS-GAP-ENG-01078.docx
diff --git a/...civil/handler/callback/camunda/caseevents/TriggerGenAppLocationUpdateCallbackHandler.java b/...civil/handler/callback/camunda/caseevents/TriggerGenAppLocationUpdateCallbackHandler.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static uk.gov.hmcts.reform.civil.callback.CallbackParams.Params.BEARER_TOKEN;
 import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.TRIGGER_LOCATION_UPDATE;
 import static uk.gov.hmcts.reform.civil.callback.CaseEvent.TRIGGER_UPDATE_GA_LOCATION;
@@ -44,9 +45,10 @@ public List<CaseEvent> handledEvents() {
 
     private CallbackResponse triggerGaEvent(CallbackParams callbackParams) {
         CaseData caseData = callbackParams.getCaseData();
+        String authToken = callbackParams.getParams().get(BEARER_TOKEN).toString();
         try {
             if (caseData.getGeneralApplications() != null && !caseData.getGeneralApplications().isEmpty()) {
-                caseData = helperService.updateApplicationLocationDetailsInClaim(caseData);
+                caseData = helperService.updateApplicationLocationDetailsInClaim(caseData, authToken);
                 helperService.triggerEvent(caseData, TRIGGER_LOCATION_UPDATE);
             }
         } catch (Exception e) {

diff --git a/...k/gov/hmcts/reform/civil/handler/callback/user/GenerateDirectionOrderCallbackHandler.java b/...k/gov/hmcts/reform/civil/handler/callback/user/GenerateDirectionOrderCallbackHandler.java
@@ -14,6 +14,7 @@
 import uk.gov.hmcts.reform.civil.enums.CaseState;
 import uk.gov.hmcts.reform.civil.enums.MultiPartyScenario;
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
+import uk.gov.hmcts.reform.civil.enums.finalorders.CostEnums;
 import uk.gov.hmcts.reform.civil.enums.finalorders.FinalOrderToggle;
 import uk.gov.hmcts.reform.civil.enums.finalorders.HearingLengthFinalOrderList;
 import uk.gov.hmcts.reform.civil.model.BusinessProcess;
@@ -66,6 +67,9 @@
 import static uk.gov.hmcts.reform.civil.enums.MultiPartyScenario.TWO_V_ONE;
 import static uk.gov.hmcts.reform.civil.enums.MultiPartyScenario.getMultiPartyScenario;
 import static uk.gov.hmcts.reform.civil.enums.caseprogression.FinalOrderSelection.ASSISTED_ORDER;
+import static uk.gov.hmcts.reform.civil.enums.finalorders.CostEnums.CLAIMANT;
+import static uk.gov.hmcts.reform.civil.enums.finalorders.CostEnums.STANDARD_BASIS;
+import static uk.gov.hmcts.reform.civil.enums.finalorders.CostEnums.SUBJECT_DETAILED_ASSESSMENT;
 import static uk.gov.hmcts.reform.civil.enums.finalorders.FinalOrderRepresentationList.CLAIMANT_AND_DEFENDANT;
 import static uk.gov.hmcts.reform.civil.model.common.DynamicList.fromList;
 import static uk.gov.hmcts.reform.civil.utils.ElementUtils.element;
@@ -289,6 +293,10 @@ private DynamicList populateCurrentHearingLocation(CaseData caseData, String aut
                                                   .assistedOrderCostsFirstDropdownDate(advancedDate)
                                                   .assistedOrderAssessmentThirdDropdownDate(advancedDate)
                                                   .makeAnOrderForCostsYesOrNo(YesOrNo.NO)
+                                                  .makeAnOrderForCostsList(CLAIMANT)
+                                                  .assistedOrderClaimantDefendantFirstDropdown(SUBJECT_DETAILED_ASSESSMENT)
+                                                  .assistedOrderAssessmentSecondDropdownList1(STANDARD_BASIS)
+                                                  .assistedOrderAssessmentSecondDropdownList2(CostEnums.NO)
                                                   .build())
             .publicFundingCostsProtection(YesOrNo.NO)
             .finalOrderAppealComplex(FinalOrderAppeal.builder()

diff --git a/...gov/hmcts/reform/civil/handler/callback/user/ManageContactInformationCallbackHandler.java b/...gov/hmcts/reform/civil/handler/callback/user/ManageContactInformationCallbackHandler.java
@@ -27,6 +27,7 @@
 import uk.gov.hmcts.reform.civil.model.dq.Witness;
 import uk.gov.hmcts.reform.civil.service.CoreCaseUserService;
 import uk.gov.hmcts.reform.civil.service.UserService;
+import uk.gov.hmcts.reform.civil.utils.CaseFlagsInitialiser;
 import uk.gov.hmcts.reform.civil.validation.PostcodeValidator;
 import uk.gov.hmcts.reform.idam.client.models.UserInfo;
 
@@ -97,6 +98,7 @@ public class ManageContactInformationCallbackHandler extends CallbackHandler {
     private final UserService userService;
     private final ObjectMapper objectMapper;
     private final CaseDetailsConverter caseDetailsConverter;
+    private final CaseFlagsInitialiser caseFlagsInitialiser;
     private final PostcodeValidator postcodeValidator;
 
     @Override
@@ -345,6 +347,9 @@ private CallbackResponse submitChanges(CallbackParams callbackParams) {
         updateExperts(caseData.getUpdateDetailsForm().getPartyChosenId(), caseData, builder);
         updateWitnesses(caseData.getUpdateDetailsForm().getPartyChosenId(), caseData, builder);
 
+        // last step before clearing update details form
+        caseFlagsInitialiser.initialiseCaseFlags(MANAGE_CONTACT_INFORMATION, builder);
+
         // clear updateDetailsForm
         builder.updateDetailsForm(UpdateDetailsForm.builder().manageContactDetailsEventUsed(YES).build());
 

diff --git a/...va/uk/gov/hmcts/reform/civil/handler/callback/user/RespondToClaimSpecCallbackHandler.java b/...va/uk/gov/hmcts/reform/civil/handler/callback/user/RespondToClaimSpecCallbackHandler.java
@@ -184,7 +184,7 @@ protected Map<String, Callback> callbacks() {
             .put(callbackKey(MID, "upload"), this::emptyCallbackResponse)
             .put(callbackKey(MID, "statement-of-truth"), this::resetStatementOfTruth)
             .put(callbackKey(MID, "validate-payment-date"), this::validateRespondentPaymentDate)
-            .put(callbackKey(MID, "specCorrespondenceAddress"), this::validateCorrespondenceApplicantAddress)
+            .put(callbackKey(MID, "specCorrespondenceAddress"), this::validateCorrespondenceAddress)
             .put(callbackKey(MID, "determineLoggedInSolicitor"), this::determineLoggedInSolicitor)
             .put(callbackKey(MID, "track"), this::handleDefendAllClaim)
             .put(callbackKey(MID, "specHandleResponseType"), this::handleRespondentResponseTypeForSpec)
@@ -1060,12 +1060,26 @@ private AllocatedTrack getAllocatedTrack(CaseData caseData) {
         );
     }
 
-    private CallbackResponse validateCorrespondenceApplicantAddress(CallbackParams callbackParams) {
-        if (SpecJourneyConstantLRSpec.DEFENDANT_RESPONSE_SPEC.equals(callbackParams.getRequest().getEventId())) {
-            return validateCorrespondenceApplicantAddress(callbackParams, postcodeValidator);
+    private CallbackResponse validateCorrespondenceAddress(CallbackParams callbackParams) {
+        CaseData caseData = callbackParams.getCaseData();
+        if (caseData.getIsRespondent1() == YES
+            && caseData.getRespondentSolicitor1ServiceAddressRequired() == NO) {
+            List<String> errors = postcodeValidator.validate(
+                caseData.getRespondentSolicitor1ServiceAddress().getPostCode());
+
+            return AboutToStartOrSubmitCallbackResponse.builder()
+                .errors(errors)
+                .build();
+        } else if (caseData.getIsRespondent2() == YES
+            && caseData.getRespondentSolicitor2ServiceAddressRequired() == NO) {
+            List<String> errors = postcodeValidator.validate(
+                caseData.getRespondentSolicitor2ServiceAddress().getPostCode());
+
+            return AboutToStartOrSubmitCallbackResponse.builder()
+                .errors(errors)
+                .build();
         }
-        return AboutToStartOrSubmitCallbackResponse.builder()
-            .build();
+        return AboutToStartOrSubmitCallbackResponse.builder().build();
     }
 
     private CallbackResponse determineLoggedInSolicitor(CallbackParams callbackParams) {
@@ -1118,6 +1132,10 @@ private CallbackResponse populateRespondent1Copy(CallbackParams callbackParams)
             .respondent1Copy(caseData.getRespondent1())
             .respondent1ClaimResponseTestForSpec(caseData.getRespondent1ClaimResponseTypeForSpec())
             .respondent2ClaimResponseTestForSpec(caseData.getRespondent2ClaimResponseTypeForSpec())
+            .respondentSolicitor1ServiceAddress(Address.builder().build())
+            .respondentSolicitor2ServiceAddress(Address.builder().build())
+            .respondentSolicitor1ServiceAddressRequired(null)
+            .respondentSolicitor2ServiceAddressRequired(null)
             .showConditionFlags(initialShowTags);
 
         updatedCaseData.respondent1DetailsForClaimDetailsTab(caseData.getRespondent1().toBuilder().flags(null).build());
@@ -1265,9 +1283,9 @@ private CallbackResponse validateUnavailableDates(CallbackParams callbackParams)
     }
 
     private CallbackResponse validateDateOfBirth(CallbackParams callbackParams) {
-        Party respondent = callbackParams.getCaseData().getRespondent1();
-        if (respondent == null && callbackParams.getCaseData().getRespondent2() != null) {
-            respondent = callbackParams.getCaseData().getRespondent2();
+        Party respondent = callbackParams.getCaseData().getRespondent1Copy();
+        if (respondent == null && callbackParams.getCaseData().getRespondent2Copy() != null) {
+            respondent = callbackParams.getCaseData().getRespondent2Copy();
         }
         List<String> errors = dateOfBirthValidator.validate(respondent);
 
@@ -1345,9 +1363,9 @@ private CallbackResponse setApplicantResponseDeadline(CallbackParams callbackPar
         AllocatedTrack allocatedTrack = caseData.getAllocatedTrack();
         Party updatedRespondent1;
 
-        if (NO.equals(caseData.getSpecAoSApplicantCorrespondenceAddressRequired())) {
+        if (NO.equals(caseData.getTempCorrespondenceAddress1Required())) {
             updatedRespondent1 = caseData.getRespondent1().toBuilder()
-                .primaryAddress(caseData.getSpecAoSApplicantCorrespondenceAddressdetails()).build();
+                .primaryAddress(caseData.getTempCorrespondenceAddress1()).build();
         } else {
             updatedRespondent1 = caseData.getRespondent1().toBuilder()
                 .primaryAddress(caseData.getRespondent1Copy().getPrimaryAddress())
@@ -1424,21 +1442,8 @@ && ifResponseTypeIsPartOrFullAdmission(caseData)) {
                 .businessProcess(BusinessProcess.ready(DEFENDANT_RESPONSE_SPEC));
 
             if (caseData.getRespondent2() != null && caseData.getRespondent2Copy() != null) {
-                Party updatedRespondent2;
-
-                if (NO.equals(caseData.getSpecAoSRespondent2HomeAddressRequired())) {
-                    updatedRespondent2 = caseData.getRespondent2().toBuilder()
-                        .primaryAddress(caseData.getSpecAoSRespondent2HomeAddressDetails()).build();
-                } else {
-                    updatedRespondent2 = caseData.getRespondent2().toBuilder()
-                        .primaryAddress(caseData.getRespondent2Copy().getPrimaryAddress()).build();
-                }
-
-                updatedData
-                    .respondent2(updatedRespondent2.toBuilder()
-                                     .flags(caseData.getRespondent2Copy().getFlags()).build())
-                    .respondent2Copy(null);
-                updatedData.respondent2DetailsForClaimDetailsTab(updatedRespondent2.toBuilder().flags(null).build());
+                Party updatedRespondent2 = applyRespondent2Address(caseData, updatedData);
+                updatedData.respondent2DetailsForClaimDetailsTab(updatedRespondent2);
             }
 
             // moving statement of truth value to correct field, this was not possible in mid event.
@@ -1495,8 +1500,10 @@ && ifResponseTypeIsPartOrFullAdmission(caseData)) {
                     .build());
         }
 
-        UnavailabilityDatesUtils.rollUpUnavailabilityDatesForRespondent(updatedData,
-                                                                        toggleService.isUpdateContactDetailsEnabled());
+        UnavailabilityDatesUtils.rollUpUnavailabilityDatesForRespondent(
+            updatedData,
+            toggleService.isUpdateContactDetailsEnabled()
+        );
 
         updatedData.respondent1DetailsForClaimDetailsTab(updatedData.build().getRespondent1().toBuilder().flags(null).build());
         if (ofNullable(caseData.getRespondent2()).isPresent()) {
@@ -1568,6 +1575,21 @@ && isAwaitingAnotherDefendantResponse(caseData)) {
             .build();
     }
 
+    private static Party applyRespondent2Address(CaseData caseData, CaseData.CaseDataBuilder<?, ?> updatedData) {
+        Party updatedRespondent2;
+
+        if (NO.equals(caseData.getTempCorrespondenceAddress2Required())) {
+            updatedRespondent2 = caseData.getRespondent2().toBuilder()
+                .primaryAddress(caseData.getTempCorrespondenceAddress2()).build();
+        } else {
+            updatedRespondent2 = caseData.getRespondent2().toBuilder()
+                .primaryAddress(caseData.getRespondent2Copy().getPrimaryAddress()).build();
+        }
+
+        updatedData.respondent2(updatedRespondent2).respondent2Copy(null);
+        return updatedRespondent2;
+    }
+
     private boolean ifResponseTypeIsPartOrFullAdmission(CaseData caseData) {
         return (RespondentResponseTypeSpec.PART_ADMISSION.equals(caseData.getRespondent1ClaimResponseTypeForSpec())
             || RespondentResponseTypeSpec.PART_ADMISSION.equals(
@@ -1582,19 +1604,19 @@ private void updateCorrespondenceAddress(CallbackParams callbackParams,
                                              CaseData.CaseDataBuilder<?, ?> updatedCaseData,
                                              CaseData caseData) {
         if (solicitorHasCaseRole(callbackParams, RESPONDENTSOLICITORONE)
-            && caseData.getSpecAoSRespondentCorrespondenceAddressRequired() == YesOrNo.NO) {
-            Address newAddress = caseData.getSpecAoSRespondentCorrespondenceAddressdetails();
+            && caseData.getRespondentSolicitor1ServiceAddressRequired() == YesOrNo.NO) {
+            Address newAddress = caseData.getRespondentSolicitor1ServiceAddress();
             updatedCaseData.specRespondentCorrespondenceAddressdetails(newAddress)
-                .specAoSRespondentCorrespondenceAddressdetails(Address.builder().build());
+                .respondentSolicitor1ServiceAddress(Address.builder().build());
             if (getMultiPartyScenario(caseData) == ONE_V_TWO_ONE_LEGAL_REP) {
                 // to keep with heading tab
                 updatedCaseData.specRespondent2CorrespondenceAddressdetails(newAddress);
             }
         } else if (solicitorHasCaseRole(callbackParams, RESPONDENTSOLICITORTWO)
-            && caseData.getSpecAoSRespondent2CorrespondenceAddressRequired() == YesOrNo.NO) {
+            && caseData.getRespondentSolicitor2ServiceAddressRequired() == YesOrNo.NO)  {
             updatedCaseData.specRespondent2CorrespondenceAddressdetails(
-                    caseData.getSpecAoSRespondent2CorrespondenceAddressdetails())
-                .specAoSRespondent2CorrespondenceAddressdetails(Address.builder().build());
+                    caseData.getRespondentSolicitor2ServiceAddress())
+                .respondentSolicitor2ServiceAddress(Address.builder().build());
         }
     }
 

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java b/src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java
@@ -723,6 +723,23 @@ public boolean isApplicantNotRepresented() {
 
     private FastTrackAllocation fastTrackAllocation;
 
+    /**
+     * used to temporary hold addresses.
+     */
+    private final Address tempCorrespondenceAddress1;
+    /**
+     * used with tempCorrespondenceAddress1.
+     */
+    private final YesOrNo tempCorrespondenceAddress1Required;
+    /**
+     * used to temporary hold addresses.
+     */
+    private final Address tempCorrespondenceAddress2;
+    /**
+     * used with tempCorrespondenceAddress2.
+     */
+    private final YesOrNo tempCorrespondenceAddress2Required;
+
     @JsonIgnore
     public boolean isResponseAcceptedByClaimant() {
         return applicant1AcceptAdmitAmountPaidSpec == YesOrNo.YES

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/CaseLocationCivil.java b/src/main/java/uk/gov/hmcts/reform/civil/model/genapplication/CaseLocationCivil.java
@@ -14,4 +14,6 @@ public class CaseLocationCivil {
     private String region;
     private String siteName;
     private String baseLocation;
+    private String address;
+    private String postcode;
 }
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/GenAppStateHelperService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/GenAppStateHelperService.java
@@ -14,6 +14,7 @@
 import uk.gov.hmcts.reform.civil.model.genapplication.GADetailsRespondentSol;
 import uk.gov.hmcts.reform.civil.model.genapplication.GeneralApplication;
 import uk.gov.hmcts.reform.civil.model.genapplication.GeneralApplicationsDetails;
+import uk.gov.hmcts.reform.civil.referencedata.model.LocationRefData;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +32,7 @@ public class GenAppStateHelperService {
 
     private final CoreCaseDataService coreCaseDataService;
     private final CaseDetailsConverter caseDetailsConverter;
+    private final InitiateGeneralApplicationService genAppService;
 
     private final ObjectMapper objectMapper;
 
@@ -69,16 +71,19 @@ public boolean triggerEvent(CaseData caseData, CaseEvent event) {
         return true;
     }
 
-    public CaseData updateApplicationLocationDetailsInClaim(CaseData caseData) {
+    public CaseData updateApplicationLocationDetailsInClaim(CaseData caseData, String authToken) {
 
         if (!Collections.isEmpty(caseData.getGeneralApplications())) {
             List<GeneralApplication> genApps = new ArrayList<>();
             CaseData finalCaseData = caseData;
+            LocationRefData locationDetails = genAppService.getWorkAllocationLocationDetails(finalCaseData.getCaseManagementLocation().getBaseLocation(), authToken);
             caseData.getGeneralApplications().forEach(generalApplicationElement -> {
                 GeneralApplication generalApplication = generalApplicationElement.getValue();
                 generalApplication.getCaseManagementLocation().setBaseLocation(finalCaseData.getCaseManagementLocation().getBaseLocation());
                 generalApplication.getCaseManagementLocation().setRegion(finalCaseData.getCaseManagementLocation().getRegion());
-                generalApplication.getCaseManagementLocation().setSiteName(finalCaseData.getLocationName());
+                generalApplication.getCaseManagementLocation().setSiteName(locationDetails.getSiteName());
+                generalApplication.getCaseManagementLocation().setAddress(locationDetails.getCourtAddress());
+                generalApplication.getCaseManagementLocation().setPostcode(locationDetails.getPostcode());
                 Map<String, Object> genAppMap = generalApplication.toMap(objectMapper);
                 genAppMap.put("isCcmccLocation", YesOrNo.NO);
                 generalApplication = objectMapper.convertValue(genAppMap, GeneralApplication.class);

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/InitiateGeneralApplicationService.java
@@ -179,6 +179,13 @@ private GeneralApplication buildApplication(CaseData.CaseDataBuilder dataBuilder
 
         Pair<CaseLocationCivil, Boolean> caseLocation = getWorkAllocationLocation(caseData, authToken);
         //Setting Work Allocation location and location name
+        if (Objects.isNull(caseLocation.getLeft().getSiteName())
+            && Objects.nonNull(caseLocation.getLeft().getBaseLocation())) {
+            LocationRefData  locationDetails = getWorkAllocationLocationDetails(caseLocation.getLeft().getBaseLocation(), authToken);
+            caseLocation.getLeft().setSiteName(locationDetails.getSiteName());
+            caseLocation.getLeft().setAddress(locationDetails.getCourtAddress());
+            caseLocation.getLeft().setPostcode(locationDetails.getPostcode());
+        }
         applicationBuilder.caseManagementLocation(caseLocation.getLeft());
         applicationBuilder.isCcmccLocation(caseLocation.getRight() ? YES : NO);
         applicationBuilder.locationName(hasSDOBeenMade(caseData.getCcdState())
@@ -343,6 +350,8 @@ public Pair<CaseLocationCivil, Boolean> getWorkAllocationLocation(CaseData caseD
                     .region(ccmccLocation.getRegionId())
                     .baseLocation(ccmccLocation.getEpimmsId())
                     .siteName(ccmccLocation.getSiteName())
+                    .address(ccmccLocation.getCourtAddress())
+                    .postcode(ccmccLocation.getPostcode())
                     .build();
             return Pair.of(courtLocation, true);
         }
@@ -369,6 +378,15 @@ private CaseLocationCivil getClaimant1PreferredLocation(CaseData caseData) {
             .build();
     }
 
+    public LocationRefData getWorkAllocationLocationDetails(String baseLocation, String authToken) {
+        List<LocationRefData> locationDetails = locationRefDataService.getCourtLocationsByEpimmsId(authToken, baseLocation);
+        if (locationDetails != null && !locationDetails.isEmpty()) {
+            return locationDetails.get(0);
+        } else {
+            return LocationRefData.builder().build();
+        }
+    }
+
     private boolean isDefendant1RespondedFirst(CaseData caseData) {
         return caseData.getRespondent2ResponseDate() == null
                 || (caseData.getRespondent1ResponseDate() != null