DFPL-1723 Leftover in case data after updating respondent address (#4667

) * fix respondent address leftover issue * remove address leftover --------- Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Ashley Wong <50691452+so99y@users.noreply.github.com> Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com>
hmcts · Oct 23, 2023 · a3b3bda · a3b3bda
1 parent 410cdc8
commit a3b3bda
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/service/src/main/java/uk/gov/hmcts/reform/fpl/model/Respondent.java b/service/src/main/java/uk/gov/hmcts/reform/fpl/model/Respondent.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.extern.jackson.Jacksonized;
 import uk.gov.hmcts.reform.fpl.enums.AddressNotKnowReason;
+import uk.gov.hmcts.reform.fpl.enums.YesNo;
 import uk.gov.hmcts.reform.fpl.model.common.Element;
 import uk.gov.hmcts.reform.fpl.model.common.Party;
 import uk.gov.hmcts.reform.fpl.model.interfaces.ConfidentialParty;
@@ -115,8 +116,8 @@ public static Respondent expandCollection() {
 
     @JsonIgnore
     public boolean isDeceasedOrNFA() {
-        return isNotEmpty(party)
-            && (AddressNotKnowReason.DECEASED.getType().equals(party.getAddressNotKnowReason())
-                || AddressNotKnowReason.NO_FIXED_ABODE.getType().equals(party.getAddressNotKnowReason()));
+        return isNotEmpty(party) && YesNo.NO.getValue().equals(party.getAddressKnow())
+               && (AddressNotKnowReason.DECEASED.getType().equals(party.getAddressNotKnowReason())
+                        || AddressNotKnowReason.NO_FIXED_ABODE.getType().equals(party.getAddressNotKnowReason()));
     }
 }
diff --git a/service/src/main/java/uk/gov/hmcts/reform/fpl/service/RespondentService.java b/service/src/main/java/uk/gov/hmcts/reform/fpl/service/RespondentService.java
@@ -6,6 +6,7 @@
 import uk.gov.hmcts.reform.ccd.model.ChangeOrganisationRequest;
 import uk.gov.hmcts.reform.ccd.model.Organisation;
 import uk.gov.hmcts.reform.fpl.enums.SolicitorRole;
+import uk.gov.hmcts.reform.fpl.model.Address;
 import uk.gov.hmcts.reform.fpl.model.CaseData;
 import uk.gov.hmcts.reform.fpl.model.Other;
 import uk.gov.hmcts.reform.fpl.model.Respondent;
@@ -37,6 +38,7 @@
 import static uk.gov.hmcts.reform.ccd.model.ChangeOrganisationApprovalStatus.APPROVED;
 import static uk.gov.hmcts.reform.fpl.enums.YesNo.NO;
 import static uk.gov.hmcts.reform.fpl.enums.YesNo.YES;
+import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.element;
 import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.findElement;
 import static uk.gov.hmcts.reform.fpl.utils.ElementUtils.unwrapElements;
 
@@ -77,7 +79,7 @@ public List<Element<Respondent>> persistRepresentativesRelationship(List<Element
 
     //If user entered details that were subsequently hidden after change of mind, remove them
     public List<Element<Respondent>> removeHiddenFields(List<Element<Respondent>> respondents) {
-        respondents.forEach(respondentElement -> {
+        return respondents.stream().map(respondentElement -> {
             Respondent respondent = respondentElement.getValue();
 
             if (NO.getValue().equals(respondent.getLegalRepresentation())) {
@@ -90,9 +92,21 @@ && isNotEmpty(respondent.getSolicitor().getOrganisation().getOrganisationID()))
                     respondent.getSolicitor().setRegionalOfficeAddress(null);
                 }
             }
-        });
 
-        return respondents;
+            // Clear address not know reason if address is known
+            RespondentParty party = respondent.getParty();
+            if (party != null && YES.getValue().equals(party.getAddressKnow())
+                && isNotEmpty(party.getAddressNotKnowReason())) {
+                return element(respondentElement.getId(),
+                    respondent.toBuilder().party(party.toBuilder().addressNotKnowReason(null).build()).build());
+            } else if (party != null && NO.getValue().equals(party.getAddressKnow())
+                && party.getAddress() != null && isNotEmpty(party.getAddress().getAddressLine1())) {
+                return element(respondentElement.getId(),
+                    respondent.toBuilder().party(party.toBuilder().address(Address.builder().build()).build()).build());
+            } else {
+                return respondentElement;
+            }
+        }).toList();
     }
 
     public List<Respondent> getRespondentsWithLegalRepresentation(List<Element<Respondent>> respondents) {