HDPI-5188 - Warrant of Restitution update data model

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

@@ -24,6 +24,7 @@ public enum DocumentType implements HasLabel {
     INSPECTION_OR_REPORT("Inspection or report"),
     CERTIFICATE_OF_SUITABILITY_AS_LF("Certificate of suitability as litigation friend"),
     LEGAL_AID_CERTIFICATE("Legal aid certificate"),
+    POLICE_REPORT("Police report"),
     OTHER("Other document");
 
     private final String label;

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/enforcetheorder/warrantofrestitution/WarrantOfRestitutionDetails.java

@@ -75,5 +75,4 @@ public class WarrantOfRestitutionDetails {
     @JsonUnwrapped
     @CCD
     private AdditionalInformation additionalInformation;
-
 }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/DocumentEntity.java

@@ -18,6 +18,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import uk.gov.hmcts.reform.pcs.ccd.domain.DocumentType;
+import uk.gov.hmcts.reform.pcs.ccd.entity.enforcetheorder.EnforcementOrderEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,4 +59,9 @@ public class DocumentEntity {
     @Builder.Default
     @JsonManagedReference
     private List<ClaimDocumentEntity> claimDocuments = new ArrayList<>();
+
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "enf_case_id")
+    @JsonBackReference
+    private EnforcementOrderEntity enfCase;
 }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/claim/StatementOfTruthEntity.java

@@ -1,6 +1,7 @@
 package uk.gov.hmcts.reform.pcs.ccd.entity.claim;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -19,6 +20,7 @@
 import uk.gov.hmcts.ccd.sdk.type.YesOrNo;
 import uk.gov.hmcts.reform.pcs.ccd.domain.statementoftruth.StatementOfTruthCompletedBy;
 import uk.gov.hmcts.reform.pcs.ccd.entity.ClaimEntity;
+import uk.gov.hmcts.reform.pcs.ccd.entity.enforcetheorder.EnforcementOrderEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.respondpossessionclaim.DefendantResponseEntity;
 
 import java.util.UUID;
@@ -44,6 +46,10 @@ public class StatementOfTruthEntity {
     @JsonBackReference
     private DefendantResponseEntity defendantResponse;
 
+    @OneToOne(mappedBy = "statementOfTruth")
+    @JsonManagedReference
+    private EnforcementOrderEntity enforcementOrder;
+
     @Enumerated(EnumType.STRING)
     private StatementOfTruthCompletedBy completedBy;
 

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/enforcetheorder/EnforcementOrderEntity.java

@@ -1,30 +1,43 @@
 package uk.gov.hmcts.reform.pcs.ccd.entity.enforcetheorder;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 import uk.gov.hmcts.reform.pcs.ccd.domain.enforcetheorder.EnforcementOrder;
 import uk.gov.hmcts.reform.pcs.ccd.entity.ClaimEntity;
+import uk.gov.hmcts.reform.pcs.ccd.entity.DocumentEntity;
+import uk.gov.hmcts.reform.pcs.ccd.entity.claim.StatementOfTruthEntity;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
+import static jakarta.persistence.CascadeType.ALL;
 import static jakarta.persistence.FetchType.LAZY;
 
 @Entity
 @Table(name = "enf_case")
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class EnforcementOrderEntity {
 
     @Id
@@ -40,7 +53,26 @@ public class EnforcementOrderEntity {
     @Column(name = "enforcement_order")
     private EnforcementOrder enforcementOrder;
 
-    @OneToOne(mappedBy = "enforcementOrder", fetch = LAZY)
+    @OneToOne(mappedBy = "enforcementOrder")
     private WarrantEntity warrantDetails;
 
+    @OneToOne(mappedBy = "enforcementOrder")
+    private WarrantOfRestitutionEntity warrantOfRestitutionDetails;
+
+    @OneToOne(fetch = LAZY)
+    @JoinColumn(name = "sot_id", nullable = false)
+    @JsonBackReference
+    private StatementOfTruthEntity statementOfTruth;
+
+    @OneToMany(mappedBy = "enfCase", fetch = LAZY, cascade = ALL, orphanRemoval = true)
+    @Builder.Default
+    @JsonManagedReference
+    private List<DocumentEntity> documents = new ArrayList<>();
+
+    public void addDocuments(List<DocumentEntity> documents) {
+        for (DocumentEntity document : documents) {
+            document.setEnfCase(this);
+            this.documents.add(document);
+        }
+    }
 }

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/enforcetheorder/WarrantOfRestitutionEntity.java

@@ -11,18 +11,27 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 import uk.gov.hmcts.reform.pcs.ccd.domain.LanguageUsed;
+import uk.gov.hmcts.reform.pcs.ccd.domain.VerticalYesNo;
 
 import java.time.Instant;
 import java.util.UUID;
 
 @Entity
+@Builder
 @Table(name = "enf_warrant_of_restitution")
 @Getter
 @Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class WarrantOfRestitutionEntity {
 
     @Id
@@ -34,6 +43,23 @@ public class WarrantOfRestitutionEntity {
     @JsonBackReference
     private EnforcementOrderEntity enforcementOrder;
 
+    // Defendants Returned
+    private String howDefendantsReturned;
+
+    // Additional Information
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
+    private VerticalYesNo additionalInformationSelect;
+
+    private String additionalInformationDetails;
+
+    // PropertyAccessDetails
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
+    private VerticalYesNo isDifficultToAccessProperty;
+
+    private String clarificationOnAccessDifficultyText;
+
     @Enumerated(EnumType.STRING)
     private LanguageUsed languageUsed;
 

src/main/java/uk/gov/hmcts/reform/pcs/ccd/page/enforcetheorder/warrantofrestitution/PropertyAccessDetailsWarrantRestPlaceholder.java → src/main/java/uk/gov/hmcts/reform/pcs/ccd/page/enforcetheorder/warrantofrestitution/PeopleYouWantToEvictWarrantRestPlaceholder.java

@@ -6,15 +6,15 @@
 import static uk.gov.hmcts.reform.pcs.ccd.page.CommonPageContent.SAVE_AND_RETURN;
 import static uk.gov.hmcts.reform.pcs.ccd.page.enforcetheorder.ShowConditionsEnforcementType.WARRANT_OF_RESTITUTION_FLOW;
 
-public class PropertyAccessDetailsWarrantRestPlaceholder implements CcdPageConfiguration {
+public class PeopleYouWantToEvictWarrantRestPlaceholder implements CcdPageConfiguration {
 
     @Override
     public void addTo(PageBuilder pageBuilder) {
         pageBuilder
-            .page("propertyAccessDetailsRest")
-            .pageLabel("Access to the property (Placeholder)")
+            .page("peopleYouWantToEvictWarrantRest")
+            .pageLabel("The people you want to evict (placeholder)")
             .showCondition(WARRANT_OF_RESTITUTION_FLOW)
-            .label("propertyAccessDetailsRest-line-separator", "---")
-            .label("propertyAccessDetailsRest-saveAndReturn", SAVE_AND_RETURN);
+            .label("peopleYouWantToEvictWarrantRest-line-separator", "---")
+            .label("peopleYouWantToEvictWarrantRest-save-and-return", SAVE_AND_RETURN);
     }
-}
+}

src/main/java/uk/gov/hmcts/reform/pcs/ccd/page/enforcetheorder/warrantofrestitution/WarrantOfRestitutionPageConfigurer.java

@@ -16,7 +16,7 @@ public class WarrantOfRestitutionPageConfigurer implements PageConfigurer {
     @Override
     public void configurePages(PageBuilder pageBuilder) {
         pageBuilder
-            .add(new PeopleWhoWillBeEvictedWarrantRestPlaceholder())
+            .add(new PeopleYouWantToEvictWarrantRestPlaceholder())
             .add(new ShareEvidenceWithJudgePage())
             .add(explainHowDefendantsReturnedPage)
             .add(new DefendantAtPropertyPage())

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

@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import uk.gov.hmcts.ccd.sdk.type.Document;
 import uk.gov.hmcts.ccd.sdk.type.ListValue;
 import uk.gov.hmcts.reform.pcs.ccd.domain.AdditionalDocument;
@@ -12,6 +13,9 @@
 import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
 import uk.gov.hmcts.reform.pcs.ccd.domain.RentArrearsSection;
 import uk.gov.hmcts.reform.pcs.ccd.domain.TenancyLicenceDetails;
+import uk.gov.hmcts.reform.pcs.ccd.domain.enforcetheorder.EnforcementOrder;
+import uk.gov.hmcts.reform.pcs.ccd.domain.enforcetheorder.warrantofrestitution.EvidenceDocumentType;
+import uk.gov.hmcts.reform.pcs.ccd.domain.enforcetheorder.warrantofrestitution.EvidenceOfDefendants;
 import uk.gov.hmcts.reform.pcs.ccd.domain.wales.OccupationLicenceDetailsWales;
 import uk.gov.hmcts.reform.pcs.ccd.entity.DocumentEntity;
 import uk.gov.hmcts.reform.pcs.ccd.repository.DocumentRepository;
@@ -31,37 +35,56 @@ public class DocumentService {
 
     public List<DocumentEntity> createAllDocuments(PCSCase pcsCase) {
 
+        List<Pair<Document, DocumentType>> allDocuments = getPcsCaseDocuments(pcsCase);
+
+        return documentRepository.saveAll(createDocumentEntities(allDocuments));
+    }
+
+    public List<DocumentEntity> createAllDocuments(EnforcementOrder enforcementOrder) {
+
+        List<Pair<Document, DocumentType>> allDocuments = getWarrantOfRestitutionDocuments(enforcementOrder);
+
+        return documentRepository.saveAll(createDocumentEntities(allDocuments));
+    }
+
+    private List<Pair<Document, DocumentType>> getPcsCaseDocuments(PCSCase pcsCase) {
         List<Pair<Document, DocumentType>> allDocuments = new ArrayList<>();
 
         allDocuments.addAll(mapAdditionalDocumentsWithType(pcsCase.getAdditionalDocuments()));
 
         allDocuments.addAll(mapDocumentsWithType(
             Optional.ofNullable(pcsCase.getRentArrears())
-                .map(RentArrearsSection::getStatementDocuments)
-                .orElse(null), DocumentType.RENT_STATEMENT));
+                    .map(RentArrearsSection::getStatementDocuments)
+                    .orElse(null), DocumentType.RENT_STATEMENT));
 
         allDocuments.addAll(mapDocumentsWithType(
             Optional.ofNullable(pcsCase.getTenancyLicenceDetails())
-                .map(TenancyLicenceDetails::getTenancyLicenceDocuments)
-                .orElse(null), DocumentType.TENANCY_LICENCE));
+                    .map(TenancyLicenceDetails::getTenancyLicenceDocuments)
+                    .orElse(null), DocumentType.TENANCY_LICENCE));
 
         allDocuments.addAll(mapDocumentsWithType(
             Optional.ofNullable(pcsCase.getOccupationLicenceDetailsWales())
-                .map(OccupationLicenceDetailsWales::getLicenceDocuments)
-                .orElse(null), DocumentType.OCCUPATION_LICENCE));
+                    .map(OccupationLicenceDetailsWales::getLicenceDocuments)
+                    .orElse(null), DocumentType.OCCUPATION_LICENCE));
 
         allDocuments.addAll(mapDocumentsWithType(
             Optional.ofNullable(pcsCase.getNoticeServedDetails())
-                .map(NoticeServedDetails::getNoticeDocuments)
-                .orElse(null), DocumentType.NOTICE_SERVED));
+                    .map(NoticeServedDetails::getNoticeDocuments)
+                    .orElse(null), DocumentType.NOTICE_SERVED));
 
-        return documentRepository.saveAll(createDocumentEntities(allDocuments));
+        return allDocuments;
+    }
+
+    private List<Pair<Document, DocumentType>> getWarrantOfRestitutionDocuments(EnforcementOrder enforcementOrder) {
+
+        return new ArrayList<>(mapEvidenceOfDefendantsDocumentsWithType(
+                enforcementOrder.getWarrantOfRestitutionDetails().getAdditionalDocuments()));
     }
 
     private List<Pair<Document, DocumentType>> mapDocumentsWithType(
         List<ListValue<Document>> docs, DocumentType type) {
 
-        if (docs == null || docs.isEmpty()) {
+        if (CollectionUtils.isEmpty(docs)) {
             return Collections.emptyList();
         }
 
@@ -75,7 +98,7 @@ private List<Pair<Document, DocumentType>> mapDocumentsWithType(
     private List<Pair<Document, DocumentType>> mapAdditionalDocumentsWithType(
         List<ListValue<AdditionalDocument>> documents) {
 
-        if (documents == null || documents.isEmpty()) {
+        if (CollectionUtils.isEmpty(documents)) {
             return Collections.emptyList();
         }
 
@@ -87,10 +110,25 @@ private List<Pair<Document, DocumentType>> mapAdditionalDocumentsWithType(
             .toList();
     }
 
+    private List<Pair<Document, DocumentType>> mapEvidenceOfDefendantsDocumentsWithType(
+            List<ListValue<EvidenceOfDefendants>> documents) {
+
+        if (CollectionUtils.isEmpty(documents)) {
+            return Collections.emptyList();
+        }
+
+        return ListValueUtils.unwrapListItems(documents).stream()
+            .map(doc -> Pair.of(
+                    doc.getDocument(),
+                    mapEvidenceDocumentTypeToDocumentType(doc.getDocumentType())
+            ))
+            .toList();
+    }
+
     private List<DocumentEntity> createDocumentEntities(
         List<Pair<Document, DocumentType>> documents) {
 
-        if (documents == null || documents.isEmpty()) {
+        if (CollectionUtils.isEmpty(documents)) {
             return List.of();
         }
 
@@ -122,4 +160,13 @@ private DocumentType mapAdditionalDocumentTypeToDocumentType(AdditionalDocumentT
             case OTHER -> DocumentType.OTHER;
         };
     }
+
+    private DocumentType mapEvidenceDocumentTypeToDocumentType(EvidenceDocumentType evidenceDocumentType) {
+        return switch (evidenceDocumentType) {
+            case PHOTOGRAPHIC_EVIDENCE -> DocumentType.PHOTOGRAPHIC_EVIDENCE;
+            case POLICE_REPORT -> DocumentType.POLICE_REPORT;
+            case WITNESS_STATEMENT -> DocumentType.WITNESS_STATEMENT;
+            case OTHER -> DocumentType.OTHER;
+        };
+    }
 }

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

@@ -59,4 +59,3 @@ private static boolean legalRepAgreed(StatementOfTruthDetails statementOfTruth)
             .orElse(false);
     }
 }
-

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderService.java

@@ -64,11 +64,11 @@ private void createEnforcementOrder(long caseReference, EnforcementOrder enforce
 
         ClaimEntity claimEntity = retrieveClaimEntity(pcsCaseEntity);
 
-        EnforcementOrderEntity orderEntity = enforcementOrderRepository
+        EnforcementOrderEntity savedEntity = enforcementOrderRepository
             .save(mapToEntity(enforcementOrder, claimEntity));
         strategyFactory.getStrategy(SelectEnforcementType.getSelectEnforcementTypeFromName(
                         enforcementOrder.getChooseEnforcementType().getValueCode()))
-                .process(orderEntity, enforcementOrder);
+                .process(savedEntity, enforcementOrder);
     }
 
     private EnforcementOrderEntity mapToEntity(EnforcementOrder enforcementOrder, ClaimEntity claimEntity) {
@@ -77,5 +77,4 @@ private EnforcementOrderEntity mapToEntity(EnforcementOrder enforcementOrder, Cl
         enforcementOrderEntity.setEnforcementOrder(enforcementOrder);
         return enforcementOrderEntity;
     }
-
 }