HDPI-2237: Review and confirm defendant names and property address

src/integrationTest/java/uk/gov/hmcts/reform/pcs/ccd/CaseDefinitionIT.java

@@ -74,7 +74,8 @@ private static Stream<Arguments> saveAndResumeEventScenarios() {
                 List.of(
                     "enforcementApplication",
                     "evictionDelayWarning",
-                    "checkYourAnswersPlaceHolder"
+                    "checkYourAnswersPlaceHolder",
+                    "changeNameAddress"
                 )
 
             )

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/PCSCase.java

@@ -1,14 +1,6 @@
 package uk.gov.hmcts.reform.pcs.ccd.domain;
 
-import static uk.gov.hmcts.ccd.sdk.type.FieldType.DynamicRadioList;
-import static uk.gov.hmcts.ccd.sdk.type.FieldType.MultiSelectList;
-import static uk.gov.hmcts.ccd.sdk.type.FieldType.TextArea;
-
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
 import lombok.Builder;
 import lombok.Data;
 import uk.gov.hmcts.ccd.sdk.External;
@@ -34,6 +26,15 @@
 import uk.gov.hmcts.reform.pcs.ccd.type.DynamicStringList;
 import uk.gov.hmcts.reform.pcs.postcodecourt.model.LegislativeCountry;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+import static uk.gov.hmcts.ccd.sdk.type.FieldType.DynamicRadioList;
+import static uk.gov.hmcts.ccd.sdk.type.FieldType.MultiSelectList;
+import static uk.gov.hmcts.ccd.sdk.type.FieldType.TextArea;
+
 
 /**
  * The main domain model representing a possessions case.
@@ -366,18 +367,27 @@ public class PCSCase {
     @CCD(searchable = false)
     private String postcodeNotAssignedView;
 
+    /**
+     * The primary defendant in the case.
+     */
     @CCD
     private DefendantDetails defendant1;
 
     @CCD(label = "Do you need to add another defendant?")
     private VerticalYesNo addAnotherDefendant;
 
+    /**
+     * List of additional defendants added by the user, after the primary defendant.
+     */
     @CCD(
         label = "Add additional defendant",
         hint = "Add an additional defendant to the case"
     )
     private List<ListValue<DefendantDetails>> additionalDefendants;
 
+    /**
+     * Combined list of all defendants in the case (i.e. primary defendant + additional defendants).
+     */
     private List<ListValue<DefendantDetails>> allDefendants;
 
     // Notice Details fields
@@ -780,4 +790,7 @@ public class PCSCase {
     @CCD
     private ASBQuestionsDetailsWales asbQuestionsWales;
 
+    @CCD(searchable = false)
+    private String formattedDefendantNames;
+
 }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/enforcement/EnforcementOrder.java

@@ -6,8 +6,13 @@
 import lombok.Data;
 import uk.gov.hmcts.ccd.sdk.api.CCD;
 import uk.gov.hmcts.ccd.sdk.type.FieldType;
+import uk.gov.hmcts.reform.pcs.ccd.domain.VerticalYesNo;
 import uk.gov.hmcts.reform.pcs.ccd.domain.YesNoNotSure;
+import uk.gov.hmcts.reform.pcs.ccd.type.DynamicMultiSelectStringList;
 import java.util.Set;
+
+import static uk.gov.hmcts.ccd.sdk.type.FieldType.DynamicMultiSelectList;
+
 /**
  * The main domain model representing an enforcement order.
  */
@@ -27,8 +32,19 @@ public class EnforcementOrder {
     private AdditionalInformation additionalInformation;
 
     @JsonUnwrapped
+    @CCD
     private NameAndAddressForEviction nameAndAddressForEviction;
 
+    @JsonUnwrapped
+    @CCD
+    private PeopleToEvict peopleToEvict;
+
+    @CCD(
+        label = "Who do you want to evict?",
+        typeOverride = DynamicMultiSelectList
+    )
+    private DynamicMultiSelectStringList selectedDefendants;
+
     @CCD(
         label = "Does anyone living at the property pose a risk to the bailiff?"
     )
@@ -42,6 +58,21 @@ public class EnforcementOrder {
     )
     private Set<RiskCategory> enforcementRiskCategories;
 
+    @CCD(
+        searchable = false
+    )
+    private VerticalYesNo showChangeNameAddressPage;
+
+    @CCD(
+        searchable = false
+    )
+    private VerticalYesNo showPeopleWhoWillBeEvictedPage;
+
+    @CCD(
+        searchable = false
+    )
+    private VerticalYesNo showPeopleYouWantToEvictPage;
+
     @JsonUnwrapped
     @CCD(
         label = "Risk details"

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/enforcement/NameAndAddressForEviction.java

@@ -11,7 +11,10 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class NameAndAddressForEviction {
 
-    @CCD(label = "You can choose the defendants you want to evict on the next page")
+    @CCD(
+        label = "Is this the correct name and address for the eviction?",
+        hint = "You can choose the defendants you want to evict on the next page"
+    )
     private VerticalYesNo correctNameAndAddress;
 
 }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/enforcement/PeopleToEvict.java

@@ -0,0 +1,23 @@
+package uk.gov.hmcts.reform.pcs.ccd.domain.enforcement;
+
+import lombok.Builder;
+import lombok.Data;
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+import uk.gov.hmcts.reform.pcs.ccd.domain.VerticalYesNo;
+
+/**
+ * Domain model for the "people who will be evicted" page.
+ * Contains the selection for whether to evict everyone or specific people.
+ */
+@Builder
+@Data
+public class PeopleToEvict {
+
+    @CCD(
+        label = "Do you want to evict everyone at the property?",
+        hint = "This includes all of the defendants and anyone else living at the property"
+    )
+    private VerticalYesNo evictEveryone;
+
+}
+

src/main/java/uk/gov/hmcts/reform/pcs/ccd/event/enforcement/EnforcementOrderEvent.java

@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import uk.gov.hmcts.ccd.sdk.api.CCDConfig;
 import uk.gov.hmcts.ccd.sdk.api.DecentralisedConfigBuilder;
 import uk.gov.hmcts.ccd.sdk.api.Event;
@@ -13,9 +14,11 @@
 import uk.gov.hmcts.reform.pcs.ccd.common.PageBuilder;
 import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
 import uk.gov.hmcts.reform.pcs.ccd.domain.State;
+import uk.gov.hmcts.reform.pcs.ccd.domain.enforcement.EnforcementOrder;
 import uk.gov.hmcts.reform.pcs.ccd.page.builder.SavingPageBuilderFactory;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.AdditionalInformationPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.AggressiveAnimalsRiskPage;
+import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.ChangeNameAddressPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.CheckYourAnswersPlaceHolder;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.CriminalAntisocialRiskPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.EnforcementApplicationPage;
@@ -25,15 +28,23 @@
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.LivingInThePropertyPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.MoneyOwedPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.NameAndAddressForEvictionPage;
+import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.PeopleWhoWillBeEvictedPage;
+import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.PeopleYouWantToEvictPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.PoliceOrSocialServicesRiskPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.PropertyAccessDetailsPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.ProtestorGroupRiskPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.VerbalOrWrittenThreatsRiskPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.ViolentAggressiveRiskPage;
 import uk.gov.hmcts.reform.pcs.ccd.page.enforcement.VulnerableAdultsChildrenPage;
+import uk.gov.hmcts.reform.pcs.ccd.service.DefendantService;
 import uk.gov.hmcts.reform.pcs.ccd.service.enforcement.EnforcementOrderService;
+import uk.gov.hmcts.reform.pcs.ccd.type.DynamicMultiSelectStringList;
+import uk.gov.hmcts.reform.pcs.ccd.type.DynamicStringListElement;
 import uk.gov.hmcts.reform.pcs.ccd.util.AddressFormatter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static uk.gov.hmcts.reform.pcs.ccd.domain.State.AWAITING_SUBMISSION_TO_HMCTS;
 import static uk.gov.hmcts.reform.pcs.ccd.event.EventId.enforceTheOrder;
 
@@ -45,6 +56,7 @@ public class EnforcementOrderEvent implements CCDConfig<PCSCase, State, UserRole
 
     private final EnforcementOrderService enforcementOrderService;
     private final AddressFormatter addressFormatter;
+    private final DefendantService defendantService;
     private final ViolentAggressiveRiskPage violentAggressiveRiskPage;
     private final VerbalOrWrittenThreatsRiskPage verbalOrWrittenThreatsRiskPage;
     private final ProtestorGroupRiskPage protestorGroupRiskPage;
@@ -73,6 +85,9 @@ private void configurePages(Event.EventBuilder<PCSCase, UserRole, State> eventBu
         pageBuilder
                 .add(new EnforcementApplicationPage())
                 .add(new NameAndAddressForEvictionPage())
+                .add(new ChangeNameAddressPage())
+                .add(new PeopleWhoWillBeEvictedPage())
+                .add(new PeopleYouWantToEvictPage())
                 .add(new LivingInThePropertyPage())
                 .add(new EvictionDelayWarningPage())
                 .add(new EvictionRisksPosedPage())
@@ -95,12 +110,32 @@ private PCSCase start(EventPayload<PCSCase, State> eventPayload) {
         pcsCase.setFormattedPropertyAddress(addressFormatter
             .formatAddressWithHtmlLineBreaks(pcsCase.getPropertyAddress()));
 
-        if (pcsCase.getAllDefendants() != null && !pcsCase.getAllDefendants().isEmpty()) {
-            pcsCase.setDefendant1(pcsCase.getAllDefendants().getFirst().getValue());
-        }
+        initializeDefendantData(pcsCase);
+        populateDefendantSelectionList(pcsCase);
+
         return pcsCase;
     }
 
+    private void initializeDefendantData(PCSCase caseData) {
+        var allDefendants = caseData.getAllDefendants();
+        if (!CollectionUtils.isEmpty(allDefendants)) {
+            caseData.setDefendant1(allDefendants.getFirst().getValue());
+        }
+    }
+
+    void populateDefendantSelectionList(PCSCase caseData) {
+        EnforcementOrder enforcementOrder = caseData.getEnforcementOrder();
+        var allDefendants = caseData.getAllDefendants();
+        List<DynamicStringListElement> listItems = defendantService.buildDefendantListItems(allDefendants);
+
+        enforcementOrder.setSelectedDefendants(
+            DynamicMultiSelectStringList.builder()
+                .value(new ArrayList<>())
+                .listItems(listItems)
+                .build()
+        );
+    }
+
     private SubmitResponse<State> submit(EventPayload<PCSCase, State> eventPayload) {
         long caseReference = eventPayload.caseReference();
 

src/main/java/uk/gov/hmcts/reform/pcs/ccd/model/Defendant.java

@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import uk.gov.hmcts.ccd.sdk.api.CCD;
 import uk.gov.hmcts.ccd.sdk.type.AddressUK;
 
 
@@ -17,8 +18,10 @@ public class Defendant {
 
     private Boolean nameKnown;
 
+    @CCD
     private String firstName;
 
+    @CCD
     private String lastName;
 
     private Boolean addressKnown;

src/main/java/uk/gov/hmcts/reform/pcs/ccd/page/enforcement/ChangeNameAddressPage.java

@@ -0,0 +1,80 @@
+package uk.gov.hmcts.reform.pcs.ccd.page.enforcement;
+
+import uk.gov.hmcts.ccd.sdk.api.CaseDetails;
+import uk.gov.hmcts.ccd.sdk.api.callback.AboutToStartOrSubmitResponse;
+import uk.gov.hmcts.reform.pcs.ccd.common.CcdPageConfiguration;
+import uk.gov.hmcts.reform.pcs.ccd.common.PageBuilder;
+import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
+import uk.gov.hmcts.reform.pcs.ccd.domain.State;
+import uk.gov.hmcts.reform.pcs.ccd.domain.enforcement.EnforcementOrder;
+
+import java.util.List;
+
+import static uk.gov.hmcts.reform.pcs.ccd.ShowConditions.NEVER_SHOW;
+
+/**
+ * Error page shown when user indicates the name or address for eviction is incorrect.
+ * This page blocks progression and requires the user to make a general application.
+ */
+public class ChangeNameAddressPage implements CcdPageConfiguration {
+
+    private static final String ERROR_MESSAGE =
+        "You cannot continue with this application until you ask the judge for permission "
+        + "to change the name and address.";
+
+    @Override
+    public void addTo(PageBuilder pageBuilder) {
+        pageBuilder
+            .page("changeNameAddress", this::midEvent)
+            .pageLabel("You need permission from a judge to change the name and address for the eviction")
+            .showCondition("showChangeNameAddressPage=\"YES\"")
+            .complex(PCSCase::getEnforcementOrder)
+                .readonly(EnforcementOrder::getShowChangeNameAddressPage, NEVER_SHOW)
+            .done()
+            .label("changeNameAddress-line-separator", "---")
+            .label(
+                "changeNameAddress-information",
+                """
+                <p class="govuk-body">You need to ask permission from the judge before you can change the name or
+                    address for the eviction.</p>
+                <p class="govuk-body govuk-!-margin-bottom-0">The judge will decide if you:</p>
+                <ul class="govuk-list govuk-list--bullet">
+                    <li class="govuk-!-font-size-19">can change the address and continue with this application
+                        (if the change is something small, like a typing error)</li>
+                    <li class="govuk-!-font-size-19">must start again, with a new application
+                        (if the change is more significant, like a completely different address)</li>
+                </ul>
+                <p class="govuk-body">You cannot continue with your application until you have asked the judge for
+                    permission to make this change.</p>
+                <p class="govuk-body govuk-!-font-weight-bold">If you want to proceed with changing the name or
+                    address for the eviction</p>
+                <p class="govuk-body">
+                    <a id="changeNameAddress-link" class="govuk-link">
+                        Ask the judge if you can change the name or address for the eviction
+                        (GOV.UK, opens in a new tab)</a>.
+                </p>
+                <p class="govuk-body govuk-!-font-weight-bold">If you want to keep the existing name or address</p>
+                <p class="govuk-body">If you are confident that the name or address is correct, you can go back to the
+                    previous page and change your answer to the last question.</p>
+                <div class="govuk-warning-text">
+                  <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+                  <strong class="govuk-warning-text__text">
+                    <span class="govuk-warning-text__assistive">Warning</span>
+                    If the name and address is incorrect, the bailiff will not be able to carry out the eviction.
+                  </strong>
+                </div>
+                """
+            );
+    }
+
+    private AboutToStartOrSubmitResponse<PCSCase, State> midEvent(
+        CaseDetails<PCSCase, State> details,
+        CaseDetails<PCSCase, State> before) {
+
+        // Always return an error to block progression
+        return AboutToStartOrSubmitResponse.<PCSCase, State>builder()
+            .errors(List.of(ERROR_MESSAGE))
+            .build();
+    }
+}
+