HDPI-7401 - Add additional defendants DOB and Addresses in two pages (#2114)

Co-authored-by: Gautham059 <gautham.bhikkumalla@hmcts.net>
Co-authored-by: Andrew Ajube <andrew.ajube@hmcts.net>
Co-authored-by: arun-hmcts <73122505+arun-hmcts@users.noreply.github.com>
Co-authored-by: libanAbdirahman1 <Liban.Abdirahman@HMCTS.NET>
Co-authored-by: SameenaHMCTS <sameena.javeed@hmcts.net>
Co-authored-by: Simon Middleton <simon.middleton@solirius.com>
Co-authored-by: scottstewart-sl <202802468+scottstewart-sl@users.noreply.github.com>
Co-authored-by: Alex Buzea <60071473+AlexBuzea@users.noreply.github.com>
Co-authored-by: guygrewal77 <163517291+guygrewal77@users.noreply.github.com>
Co-authored-by: Fahra Akhlaq <f.akhlaq@outlook.com>
Co-authored-by: Praveen Adusumilli <47391951+adusumillipraveen@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Rupali Lowalekar <Rupali.Lowalekar@HMCTS.NET>
Co-authored-by: Lovelin <lovelin.marcus@hmcts.net>

Author: 15 people

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/ClaimResponseService.java

@@ -80,7 +80,7 @@ private void saveDraftDataForPartyInternal(PossessionClaimResponse dataFromDraft
      */
     private void updatePartyContactDetails(PartyEntity party, DefendantContactDetails defendantContactDetails,
                                            DefendantResponses defendantResponses) {
-        boolean nameNotConfirmed = defendantResponses.getDefendantNameConfirmation() == null;
+        boolean nameNotConfirmed = defendantResponses.getDefendantNameConfirmation() != VerticalYesNo.YES;
 
         if (nameNotConfirmed && StringUtils.isNotBlank(defendantContactDetails.getParty().getFirstName())) {
             party.setFirstName(defendantContactDetails.getParty().getFirstName());
@@ -92,6 +92,12 @@ private void updatePartyContactDetails(PartyEntity party, DefendantContactDetail
             log.debug("Updated last name for party ID: {}", party.getId());
         }
 
+        if (nameNotConfirmed
+            && (StringUtils.isNotBlank(defendantContactDetails.getParty().getFirstName())
+                || StringUtils.isNotBlank(defendantContactDetails.getParty().getLastName()))) {
+            party.setNameKnown(VerticalYesNo.YES);
+        }
+
         if (defendantContactDetails.getParty().getDateOfBirth() != null) {
             party.setDateOfBirth(defendantContactDetails.getParty().getDateOfBirth());
             log.debug("Updated date of birth for party ID: {}", party.getId());
@@ -109,10 +115,12 @@ private void updatePartyContactDetails(PartyEntity party, DefendantContactDetail
         }
 
         AddressUK newAddress = defendantContactDetails.getParty().getAddress();
-        // Only override the party address when claimant did not provide it
-        // and property address was shown as a fallback for user to confirm or enter a new address
         boolean isFallbackScenario = defendantResponses.getPropertyAddressConfirmation() != null;
-        if (isFallbackScenario && newAddress != null && StringUtils.isNotBlank(newAddress.getAddressLine1())) {
+        boolean disputedCorrespondenceAddress =
+            defendantResponses.getCorrespondenceAddressConfirmation() == VerticalYesNo.NO;
+        boolean hasNewAddress = newAddress != null && StringUtils.isNotBlank(newAddress.getAddressLine1());
+
+        if ((isFallbackScenario || disputedCorrespondenceAddress) && hasNewAddress) {
             AddressEntity existingAddress = party.getAddress();
 
             if (existingAddress != null) {
@@ -126,13 +134,10 @@ private void updatePartyContactDetails(PartyEntity party, DefendantContactDetail
             } else {
                 party.setAddress(modelMapper.map(newAddress, AddressEntity.class));
             }
+            party.setAddressKnown(VerticalYesNo.YES);
         }
 
-        // Defendant disagreed with the claim-recorded address and supplied a different one,
-        // so addressSameAsProperty no longer holds. On YES we leave the claim-time value alone:
-        //   claim YES + def YES → property still applies                            ✓
-        //   claim NO  + def YES → claimant-typed (on party.address) still applies   ✓
-        if (defendantResponses.getCorrespondenceAddressConfirmation() == VerticalYesNo.NO) {
+        if (disputedCorrespondenceAddress) {
             party.setAddressSameAsProperty(VerticalYesNo.NO);
         }
     }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/view/PartiesView.java

@@ -90,12 +90,16 @@ private Party toParty(PartyEntity entity) {
     }
 
     private Party toPartialParty(PartyEntity entity) {
-        Party.PartyBuilder builder = Party.builder()
+        return Party.builder()
             .firstName(entity.getFirstName())
             .lastName(entity.getLastName())
-            .orgName(entity.getOrgName());
-
-        return builder.build();
+            .orgName(entity.getOrgName())
+            .nameKnown(entity.getNameKnown())
+            .address(convertAddress(entity.getAddress()))
+            .addressKnown(entity.getAddressKnown())
+            .addressSameAsProperty(entity.getAddressSameAsProperty())
+            .dateOfBirth(entity.getDateOfBirth())
+            .build();
     }
 
     private LegalRepresentative buildLegalRepresentative(PartyEntity partyEntity) {

src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/ClaimResponseServiceTest.java

@@ -344,6 +344,7 @@ void shouldUpdateAddressWhenClaimantDidNotProvideIt() {
 
         // Then
         assertThat(testParty.getAddress()).isEqualTo(addressEntity);
+        assertThat(testParty.getAddressKnown()).isEqualTo(VerticalYesNo.YES);
     }
 
     @Test

src/test/java/uk/gov/hmcts/reform/pcs/ccd/view/PartiesViewTest.java

@@ -17,6 +17,7 @@
 import uk.gov.hmcts.reform.pcs.ccd.accesscontrol.UserRole;
 import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
 import uk.gov.hmcts.reform.pcs.ccd.domain.Party;
+import uk.gov.hmcts.reform.pcs.ccd.domain.VerticalYesNo;
 import uk.gov.hmcts.reform.pcs.ccd.entity.ClaimEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.PcsCaseEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.party.ClaimPartyEntity;
@@ -25,6 +26,7 @@
 import uk.gov.hmcts.reform.pcs.ccd.entity.party.PartyRole;
 import uk.gov.hmcts.reform.pcs.security.SecurityContextService;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 
@@ -95,6 +97,14 @@ void shouldMapPartialPartyOfOtherCitizenUsers() {
 
         PartyEntity otherParty = buildParty(UUID.randomUUID(), "John", "Smith", "Org B",
                                             "john@example.com", "07700000002");
+        otherParty.setDateOfBirth(LocalDate.of(1985, 7, 20));
+        AddressEntity addressEntity = AddressEntity.builder().addressLine1("1 Other Street").build();
+        otherParty.setAddress(addressEntity);
+        otherParty.setAddressKnown(VerticalYesNo.YES);
+        when(modelMapper.map(addressEntity, AddressUK.class)).thenReturn(
+            AddressUK.builder().addressLine1("1 Other Street").build()
+        );
+
         ClaimPartyEntity claimParty = buildClaimPartyEntity(otherParty, PartyRole.DEFENDANT);
         when(claimEntity.getClaimParties()).thenReturn(List.of(claimParty));
 
@@ -108,8 +118,10 @@ void shouldMapPartialPartyOfOtherCitizenUsers() {
         assertThat(party.getOrgName()).isEqualTo("Org B");
         assertThat(party.getEmailAddress()).isNull();
         assertThat(party.getPhoneNumber()).isNull();
-        assertThat(party.getDateOfBirth()).isNull();
-        assertThat(party.getAddress()).isNull();
+        assertThat(party.getLegalRepresentative()).isNull();
+        assertThat(party.getDateOfBirth()).isEqualTo(LocalDate.of(1985, 7, 20));
+        assertThat(party.getAddress()).isNotNull();
+        assertThat(party.getAddress().getAddressLine1()).isEqualTo("1 Other Street");
     }
 
     @Test