DFR-1886 INC5522721: CS - File name on scanned docs on new paper case

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/handler/ListForHearingContestedAboutToSubmitHandler.java

@@ -126,22 +126,22 @@ public GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle(Finrem
     private void populateApplicantBulkPrintFieldsWithCoverSheet(FinremCaseData finremCaseData, String caseId, CaseDocument coverSheet) {
         if (caseDataService.isApplicantAddressConfidential(finremCaseData)) {
             log.info("Applicant has been marked as confidential, adding coversheet to confidential field for Case ID: {}", caseId);
-            finremCaseData.setBulkPrintCoverSheetApp(null);
-            finremCaseData.setBulkPrintCoverSheetAppConfidential(coverSheet);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetApp(null);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetAppConfidential(coverSheet);
         } else {
             log.info("Applicant adding coversheet to coversheet field for Case ID: {}", caseId);
-            finremCaseData.setBulkPrintCoverSheetApp(coverSheet);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetApp(coverSheet);
         }
     }
 
     private void populateRespondentBulkPrintFieldsWithCoverSheet(FinremCaseData finremCaseData, CaseDocument coverSheet, String caseId) {
         if (caseDataService.isRespondentAddressConfidential(finremCaseData)) {
             log.info("Respondent has been marked as confidential, adding coversheet to confidential field for Case ID: {}", caseId);
-            finremCaseData.setBulkPrintCoverSheetRes(null);
-            finremCaseData.setBulkPrintCoverSheetResConfidential(coverSheet);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(null);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetResConfidential(coverSheet);
         } else {
             log.info("Respondent adding coversheet to coversheet field for Case ID: {}", caseId);
-            finremCaseData.setBulkPrintCoverSheetRes(coverSheet);
+            finremCaseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(coverSheet);
         }
     }
 

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/CCDConfigConstant.java

@@ -322,6 +322,14 @@ public class CCDConfigConstant {
     public static final String MINI_FORM_A = "miniFormA";
     public static final String MINI_FORM_A_CONSENTED_IN_CONTESTED = "consentMiniFormA";
     public static final String PENSION_DOCS_COLLECTION = "pensionCollection";
+    public static final String FORMA = "formA";
+    public static final String FORMA_TYPE = "formAType";
+    public static final String FORMA_SUBTYPE = "formASubtype";
+    public static final String FORMA_CONTROL_NUMBER = "formAControlNumber";
+    public static final String FORMA_FILE_NAME = "formAFileName";
+    public static final String FORMA_SCANNED_DATE = "formAScannedDate";
+    public static final String FORMA_DELIVERY_DATE = "formADeliveryDate";
+    public static final String FORMA_EXCEPTIONAL_RECORD_REFERENCE = "formAExceptionRecordReference";
     public static final String FORM_A_COLLECTION = "copyOfPaperFormA";
     public static final String FORM_C = "formC";
     public static final String FORM_G = "formG";
@@ -351,6 +359,13 @@ public class CCDConfigConstant {
     public static final String HEARING_NOTICES_COLLECTION = "hearingNoticesDocumentCollection";
     public static final String RESPOND_TO_ORDER_DOCUMENTS = "respondToOrderDocuments";
     public static final String CONSENT_ORDER = "consentOrder";
+    public static final String CONSENT_ORDER_TYPE = "consentOrderType";
+    public static final String CONSENT_ORDER_SUBTYPE = "consentOrderSubtype";
+    public static final String CONSENT_ORDER_CONTROL_NUMBER = "consentOrderControlNumber";
+    public static final String CONSENT_ORDER_FILE_NAME = "consentOrderFileName";
+    public static final String CONSENT_ORDER_SCANNED_DATE = "consentOrderScannedDate";
+    public static final String CONSENT_ORDER_DELIVERY_DATE = "consentOrderDeliveryDate";
+    public static final String CONSENT_ORDER_EXCEPTIONAL_RECORD_REFERENCE = "consentOrderExceptionRecordReference";
     public static final String CONSENT_ORDER_FRC_NAME = "consentOrderFRCName";
     public static final String CONSENT_ORDER_FRC_ADDRESS = "consentOrderFRCAddress";
     public static final String CONSENT_ORDER_FRC_EMAIL = "consentOrderFRCEmail";

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/FinremCaseData.java

@@ -17,12 +17,15 @@
 import org.apache.commons.lang3.StringUtils;
 import uk.gov.hmcts.reform.bsp.common.model.document.Addressee;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.AllocatedRegionWrapper;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.BulkPrintCoversheetWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.CaseFlagsWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.CfvMigrationWrapper;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ConsentOrderScannedDocWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ConsentOrderWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.ContactDetailsWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.CourtListWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.DraftDirectionWrapper;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.FormAScannedDocWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.GeneralApplicationRegionWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.GeneralApplicationWrapper;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper.GeneralEmailWrapper;
@@ -152,12 +155,6 @@ public class FinremCaseData {
     private List<ScannedDocumentCollection> scannedDocuments;
     private YesOrNo evidenceHandled;
     private CaseDocument approvedConsentOrderLetter;
-    private CaseDocument bulkPrintCoverSheetApp;
-    private CaseDocument bulkPrintCoverSheetRes;
-    private CaseDocument bulkPrintCoverSheetIntv1;
-    private CaseDocument bulkPrintCoverSheetIntv2;
-    private CaseDocument bulkPrintCoverSheetIntv3;
-    private CaseDocument bulkPrintCoverSheetIntv4;
     private String bulkPrintLetterIdRes;
     private String bulkPrintLetterIdApp;
     private List<ConsentOrderCollection> approvedOrderCollection;
@@ -180,8 +177,6 @@ public class FinremCaseData {
     @JsonProperty("RepresentationUpdateHistory")
     private List<RepresentationUpdateHistoryCollection> representationUpdateHistory;
     private YesOrNo paperApplication;
-    private CaseDocument bulkPrintCoverSheetAppConfidential;
-    private CaseDocument bulkPrintCoverSheetResConfidential;
     @JsonProperty("RespSolNotificationsEmailConsent")
     private YesOrNo respSolNotificationsEmailConsent;
     @JsonSerialize(using = LocalDateSerializer.class)
@@ -331,6 +326,11 @@ public class FinremCaseData {
     @Getter(AccessLevel.NONE)
     @JsonProperty("intervener4")
     private IntervenerFour intervenerFour;
+    @Getter(AccessLevel.NONE)
+    private FormAScannedDocWrapper formAScannedDocWrapper;
+    @Getter(AccessLevel.NONE)
+    private ConsentOrderScannedDocWrapper consentOrderScannedDocWrapper;
+    private List<ScannedD81WithInfo> scannedD81WithInfos;
     @JsonUnwrapped
     @Getter(AccessLevel.NONE)
     private RegionWrapper regionWrapper;
@@ -373,6 +373,9 @@ public class FinremCaseData {
     @JsonUnwrapped
     @Getter(AccessLevel.NONE)
     private OrderWrapper orderWrapper;
+    @JsonUnwrapped
+    @Getter(AccessLevel.NONE)
+    private BulkPrintCoversheetWrapper bulkPrintCoversheetWrapper;
     private YesOrNo additionalHearingDocumentsOption;
     private CaseDocument additionalListOfHearingDocuments;
 
@@ -932,6 +935,24 @@ public List<IntervenerHearingNoticeCollection> getIntervenerCollection(
         };
     }
 
+    @JsonIgnore
+    public FormAScannedDocWrapper getFormAScannedDocWrapper() {
+        if (formAScannedDocWrapper == null) {
+            this.formAScannedDocWrapper = new FormAScannedDocWrapper();
+        }
+
+        return formAScannedDocWrapper;
+    }
+
+    @JsonIgnore
+    public ConsentOrderScannedDocWrapper getConsentOrderScannedDocWrapper() {
+        if (consentOrderScannedDocWrapper == null) {
+            this.consentOrderScannedDocWrapper = new ConsentOrderScannedDocWrapper();
+        }
+
+        return consentOrderScannedDocWrapper;
+    }
+
     @JsonIgnore
     public CfvMigrationWrapper getCfvMigrationWrapper() {
         if (cfvMigrationWrapper == null) {
@@ -940,5 +961,13 @@ public CfvMigrationWrapper getCfvMigrationWrapper() {
 
         return cfvMigrationWrapper;
     }
-}
 
+    @JsonIgnore
+    public BulkPrintCoversheetWrapper getBulkPrintCoversheetWrapper() {
+        if (bulkPrintCoversheetWrapper == null) {
+            this.bulkPrintCoversheetWrapper = new BulkPrintCoversheetWrapper();
+        }
+
+        return bulkPrintCoversheetWrapper;
+    }
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/ScannedD81Document.java

@@ -0,0 +1,31 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ScannedD81Document {
+    private CaseDocument documentLink;
+    private ScannedDocumentType type;
+    private String subType;
+    private String controlNumber;
+    private String fileName;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime scannedDate;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime deliveryDate;
+    private String exceptionRecordReference;
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/ScannedD81WithInfo.java

@@ -0,0 +1,16 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScannedD81WithInfo {
+    private ScannedD81Document value;
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/BulkPrintCoversheetWrapper.java

@@ -0,0 +1,26 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BulkPrintCoversheetWrapper {
+    private CaseDocument bulkPrintCoverSheetApp;
+    private CaseDocument bulkPrintCoverSheetRes;
+    private CaseDocument bulkPrintCoverSheetIntv1;
+    private CaseDocument bulkPrintCoverSheetIntv2;
+    private CaseDocument bulkPrintCoverSheetIntv3;
+    private CaseDocument bulkPrintCoverSheetIntv4;
+    private CaseDocument bulkPrintCoverSheetAppConfidential;
+    private CaseDocument bulkPrintCoverSheetResConfidential;
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/ConsentOrderScannedDocWrapper.java

@@ -0,0 +1,31 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.ScannedDocumentType;
+
+import java.time.LocalDateTime;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ConsentOrderScannedDocWrapper {
+    private ScannedDocumentType consentOrderType;
+    private String consentOrderSubtype;
+    private String consentOrderControlNumber;
+    private String consentOrderFileName;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime consentOrderScannedDate;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime consentOrderDeliveryDate;
+    private String consentOrderExceptionRecordReference;
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/wrapper/FormAScannedDocWrapper.java

@@ -0,0 +1,31 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.ScannedDocumentType;
+
+import java.time.LocalDateTime;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FormAScannedDocWrapper {
+    private ScannedDocumentType formAType;
+    private String formASubtype;
+    private String formAControlNumber;
+    private String formAFileName;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime formAScannedDate;
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime formADeliveryDate;
+    private String formAExceptionRecordReference;
+}

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/BulkPrintService.java

@@ -202,10 +202,10 @@ private BulkPrintDocument generateApplicantCoverSheet(FinremCaseDetails caseDeta
 
         if (YesOrNo.isYes(caseDetails.getData().getContactDetailsWrapper().getApplicantAddressHiddenFromRespondent())) {
             log.info("Applicant has been marked as confidential, adding coversheet to confidential field for caseId {}", caseDetails.getId());
-            caseDetails.getData().setBulkPrintCoverSheetApp(null);
-            caseDetails.getData().setBulkPrintCoverSheetAppConfidential(applicantCoverSheet);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetApp(null);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetAppConfidential(applicantCoverSheet);
         } else {
-            caseDetails.getData().setBulkPrintCoverSheetApp(applicantCoverSheet);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetApp(applicantCoverSheet);
         }
 
         return documentHelper.mapToBulkPrintDocument(applicantCoverSheet);
@@ -264,10 +264,10 @@ private BulkPrintDocument generateRespondentCoverSheet(FinremCaseDetails caseDet
 
         if (YesOrNo.isYes(caseDetails.getData().getContactDetailsWrapper().getRespondentAddressHiddenFromApplicant())) {
             log.info("Respondent has been marked as confidential, adding coversheet to confidential field for caseId {}", caseDetails.getId());
-            caseDetails.getData().setBulkPrintCoverSheetRes(null);
-            caseDetails.getData().setBulkPrintCoverSheetResConfidential(respondentCoverSheet);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(null);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetResConfidential(respondentCoverSheet);
         } else {
-            caseDetails.getData().setBulkPrintCoverSheetRes(respondentCoverSheet);
+            caseDetails.getData().getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(respondentCoverSheet);
         }
 
         return documentHelper.mapToBulkPrintDocument(respondentCoverSheet);

src/main/java/uk/gov/hmcts/reform/finrem/caseorchestration/service/ConsentOrderPrintService.java

@@ -79,10 +79,10 @@ private void generateCoversheetForRespondentAndSendOrders(FinremCaseDetails finr
 
         if (caseDataService.isRespondentAddressConfidential(caseDetails.getData())) {
             log.info("Case ID: {}, has been marked as confidential. Adding coversheet to confidential field", finremCaseDetails.getId());
-            caseData.setBulkPrintCoverSheetRes(null);
-            caseData.setBulkPrintCoverSheetResConfidential(respondentCoverSheet);
+            caseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(null);
+            caseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetResConfidential(respondentCoverSheet);
         } else {
-            caseData.setBulkPrintCoverSheetRes(respondentCoverSheet);
+            caseData.getBulkPrintCoversheetWrapper().setBulkPrintCoverSheetRes(respondentCoverSheet);
             caseData.setBulkPrintLetterIdRes(respondentLetterId.toString());
         }