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

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

@@ -324,6 +324,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";
@@ -353,6 +361,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

@@ -20,10 +20,12 @@
 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;
@@ -326,6 +328,13 @@ public class FinremCaseData implements HasCaseDocument {
     private IntervenerFour intervenerFour;
     @JsonUnwrapped
     @Getter(AccessLevel.NONE)
+    private FormAScannedDocWrapper formAScannedDocWrapper;
+    @JsonUnwrapped
+    @Getter(AccessLevel.NONE)
+    private ConsentOrderScannedDocWrapper consentOrderScannedDocWrapper;
+    private List<ScannedD81Collection> scannedD81Collection;
+    @JsonUnwrapped
+    @Getter(AccessLevel.NONE)
     private RegionWrapper regionWrapper;
     @JsonUnwrapped
     @Getter(AccessLevel.NONE)
@@ -945,6 +954,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) {

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

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

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/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/bulkscan/transformation/FormAToCaseTransformer.java

@@ -11,6 +11,8 @@
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.ComplexTypeCollection;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.ScannedD81Document;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.ScannedDocumentType;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.TypedCaseDocument;
 import uk.gov.hmcts.reform.finrem.caseorchestration.service.CaseDataService;
 import uk.gov.hmcts.reform.finrem.caseorchestration.service.bulkscan.OcrFieldName;
@@ -54,6 +56,21 @@
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENTED_RESPONDENT_FIRST_MIDDLE_NAME;
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENTED_RESPONDENT_REPRESENTED;
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_CONTROL_NUMBER;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_DELIVERY_DATE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_EXCEPTIONAL_RECORD_REFERENCE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_FILE_NAME;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_SCANNED_DATE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_SUBTYPE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.CONSENT_ORDER_TYPE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_CONTROL_NUMBER;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_DELIVERY_DATE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_EXCEPTIONAL_RECORD_REFERENCE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_FILE_NAME;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_SCANNED_DATE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_SUBTYPE;
+import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.FORMA_TYPE;
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.LATEST_CONSENT_ORDER;
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.OTHER_DOCS_COLLECTION;
 import static uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CCDConfigConstant.PENSION_DOCS_COLLECTION;
@@ -130,15 +147,39 @@ protected Map<String, Object> transformAdditionalDataFromExceptionRecord(Excepti
         inputScannedDocs.stream()
             .filter(doc -> doc.getSubtype().equals(FORM_A_DOCUMENT))
             .findFirst()
-            .map(this::transformInputScannedDocIntoCaseDocument)
-            .ifPresent(doc -> additionalCaseData.put("formA", doc));
+            .ifPresent(doc -> {
+                additionalCaseData.put(FORMA, transformInputScannedDocIntoCaseDocument(doc));
+                additionalCaseData.put(FORMA_TYPE, doc.getType());
+                additionalCaseData.put(FORMA_SUBTYPE, doc.getSubtype());
+                additionalCaseData.put(FORMA_CONTROL_NUMBER, doc.getControlNumber());
+                additionalCaseData.put(FORMA_FILE_NAME, doc.getFileName());
+                additionalCaseData.put(FORMA_SCANNED_DATE, doc.getScannedDate());
+                additionalCaseData.put(FORMA_DELIVERY_DATE, doc.getDeliveryDate());
+                additionalCaseData.put(FORMA_EXCEPTIONAL_RECORD_REFERENCE, exceptionRecord.getId());
+            });
 
         ComplexTypeCollection<CaseDocument> d81DocumentCollection = inputScannedDocs.stream()
             .filter(doc -> doc.getSubtype().equals(D81_DOCUMENT))
             .map(this::transformInputScannedDocIntoCaseDocument)
             .collect(Collectors.collectingAndThen(toList(), ComplexTypeCollection::new));
         additionalCaseData.put("scannedD81s", d81DocumentCollection);
 
+        ComplexTypeCollection<ScannedD81Document> scannedD81Collection = inputScannedDocs.stream()
+            .filter(doc -> doc.getSubtype().equals(D81_DOCUMENT))
+            .map(doc -> ScannedD81Document.builder()
+                .documentLink(transformInputScannedDocIntoCaseDocument(doc))
+                .type(ScannedDocumentType.forValue(doc.getType()))
+                .subtype(doc.getSubtype())
+                .controlNumber(doc.getControlNumber())
+                .fileName(doc.getFileName())
+                .scannedDate(doc.getScannedDate())
+                .deliveryDate(doc.getDeliveryDate())
+                .exceptionRecordReference(exceptionRecord.getId())
+                .build()
+            )
+            .collect(Collectors.collectingAndThen(toList(), ComplexTypeCollection::new));
+        additionalCaseData.put("scannedD81Collection", scannedD81Collection);
+
         additionalCaseData.put(PENSION_DOCS_COLLECTION, transformIntoTypedCaseDocuments(inputScannedDocs, Map.of(
             P1_DOCUMENT, "Form P1",
             PPF1_DOCUMENT, "Form PPF1",
@@ -156,10 +197,16 @@ protected Map<String, Object> transformAdditionalDataFromExceptionRecord(Excepti
         inputScannedDocs.stream()
             .filter(doc -> doc.getSubtype().equals(DRAFT_CONSENT_ORDER_DOCUMENT))
             .findFirst()
-            .map(this::transformInputScannedDocIntoCaseDocument)
             .ifPresent(doc -> {
-                additionalCaseData.put(CONSENT_ORDER, doc);
-                additionalCaseData.put(LATEST_CONSENT_ORDER, doc);
+                additionalCaseData.put(CONSENT_ORDER, transformInputScannedDocIntoCaseDocument(doc));
+                additionalCaseData.put(CONSENT_ORDER_TYPE, doc.getType());
+                additionalCaseData.put(CONSENT_ORDER_SUBTYPE, doc.getSubtype());
+                additionalCaseData.put(CONSENT_ORDER_CONTROL_NUMBER, doc.getControlNumber());
+                additionalCaseData.put(CONSENT_ORDER_FILE_NAME, doc.getFileName());
+                additionalCaseData.put(CONSENT_ORDER_SCANNED_DATE, doc.getScannedDate());
+                additionalCaseData.put(CONSENT_ORDER_DELIVERY_DATE, doc.getDeliveryDate());
+                additionalCaseData.put(CONSENT_ORDER_EXCEPTIONAL_RECORD_REFERENCE, exceptionRecord.getId());
+                additionalCaseData.put(LATEST_CONSENT_ORDER, transformInputScannedDocIntoCaseDocument(doc));
             });
 
         inputScannedDocs.stream()

src/test/java/uk/gov/hmcts/reform/finrem/caseorchestration/model/ccd/spreadsheet/FinremCaseDataTest.java

@@ -12,6 +12,7 @@
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -140,7 +141,7 @@ private File getFile(String name, String fileNameWithPath) {
     }
 
     private List<Field> getAllFields(Class<?> clazz) {
-        List<Field> fields = Arrays.asList(clazz.getDeclaredFields());
+        List<Field> fields = new ArrayList<>(Arrays.asList(clazz.getDeclaredFields()));
         Class<?> superclass = clazz.getSuperclass();
         if (superclass != null) {
             fields.addAll(getAllFields(superclass));