From 26c3db2c196e7be0b51d429a11c254cb9b9da572 Mon Sep 17 00:00:00 2001
From: Ramesh Pydi <ramesh.pydi1@hmcts.net>
Date: Fri, 27 Mar 2026 13:06:42 +0000
Subject: [PATCH] FPVTL-2413: cafcass upload documents for cir

---
 .../constants/ManageDocumentsCategoryConstants.java  |  2 ++
 .../prl/enums/bundle/BundlingDocGroupEnum.java       |  9 +++++++++
 .../prl/mapper/bundle/BundleCreateRequestMapper.java | 12 ++++++++++++
 .../prl/models/complextypes/QuarantineLegalDoc.java  |  2 ++
 4 files changed, 25 insertions(+)

diff --git a/src/main/java/uk/gov/hmcts/reform/prl/constants/ManageDocumentsCategoryConstants.java b/src/main/java/uk/gov/hmcts/reform/prl/constants/ManageDocumentsCategoryConstants.java
index 987605e3c6a..5fdaf9f932f 100644
--- a/src/main/java/uk/gov/hmcts/reform/prl/constants/ManageDocumentsCategoryConstants.java
+++ b/src/main/java/uk/gov/hmcts/reform/prl/constants/ManageDocumentsCategoryConstants.java
@@ -47,6 +47,8 @@ public class ManageDocumentsCategoryConstants {
     public static final String DRUG_AND_ALCOHOL_TEST = "drugAndAlcoholTest(toxicology)";
     public static final String POLICE_REPORT = "policeReport";
     public static final String SEC37_REPORT = "sec37Report";
+    public static final String CIR_EXTENSION_REQUEST_CAFCASS = "cirExtensionRequestCafCass";
+    public static final String CIR_TRANSFER_REQUEST_CAFCASS = "cirTransferRequestCafCass";
     public static final String LA_OTHER_DOCS = "localAuthorityOtherDoc";
     public static final String ORDERS_SUBMITTED_WITH_APPLICATION = "ordersSubmittedWithApplication";
     public static final String APPROVED_ORDERS = "approvedOrders";
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/enums/bundle/BundlingDocGroupEnum.java b/src/main/java/uk/gov/hmcts/reform/prl/enums/bundle/BundlingDocGroupEnum.java
index 9e73749cab4..0eba3a88c6d 100644
--- a/src/main/java/uk/gov/hmcts/reform/prl/enums/bundle/BundlingDocGroupEnum.java
+++ b/src/main/java/uk/gov/hmcts/reform/prl/enums/bundle/BundlingDocGroupEnum.java
@@ -149,6 +149,15 @@ public enum BundlingDocGroupEnum {
     @JsonProperty("laSection37Report")
     laSection37Report("laSection37Report", "laSection37Report"),
 
+    @JsonProperty("cafcassSection16AReport")
+    cafcassSection16AReport("cafcassSection16AReport", "cafcassSection16AReport"),
+
+    @JsonProperty("cafcassSectionCirExtensionRequestReport")
+    cafcassSectionCirExtensionRequestReport("cafcassSectionCirExtensionRequestReport", "cafcassSectionCirExtensionRequestReport"),
+
+    @JsonProperty("cafcassSectionCirTransferRequestReport")
+    cafcassSectionCirTransferRequestReport("cafcassSectionCirTransferRequestReport", "cafcassSectionCirTransferRequestReport"),
+
     @JsonProperty("laOtherDocuments")
     laOtherDocuments("laOtherDocuments", "laOtherDocuments"),
 
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/mapper/bundle/BundleCreateRequestMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/mapper/bundle/BundleCreateRequestMapper.java
index 2460e569c52..f885033b0ad 100644
--- a/src/main/java/uk/gov/hmcts/reform/prl/mapper/bundle/BundleCreateRequestMapper.java
+++ b/src/main/java/uk/gov/hmcts/reform/prl/mapper/bundle/BundleCreateRequestMapper.java
@@ -47,6 +47,8 @@
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.CASE_SUMMARY;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.CHILD_IMPACT_REPORT1;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.CHILD_IMPACT_REPORT2;
+import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.CIR_EXTENSION_REQUEST_CAFCASS;
+import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.CIR_TRANSFER_REQUEST_CAFCASS;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.DNA_REPORTS_EXPERT_REPORT;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.DRUG_AND_ALCOHOL_TEST;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.FM5_STATEMENTS;
@@ -637,6 +639,7 @@ private static void mapCafcassLaReports(QuarantineLegalDoc doc, HashMap<String,
             .documentLink(doc.getOtherDocsDocument())
             .documentFileName(doc.getOtherDocsDocument().getDocumentFileName())
             .documentGroup(BundlingDocGroupEnum.cafcassOtherDocuments).build() : null);
+
         bundleMap.put(SEC37_REPORT, Objects.nonNull(doc.getSec37ReportDocument()) ? BundlingRequestDocument.builder()
             .documentLink(doc.getSec37ReportDocument())
             .documentFileName(doc.getSec37ReportDocument().getDocumentFileName())
@@ -648,6 +651,15 @@ private static void mapCafcassLaReports(QuarantineLegalDoc doc, HashMap<String,
                 .documentFileName(doc.getLocalAuthorityOtherDocDocument().getDocumentFileName())
                 .documentGroup(BundlingDocGroupEnum.laOtherDocuments).build() : null
         );
+
+        bundleMap.put(CIR_EXTENSION_REQUEST_CAFCASS, Objects.nonNull(doc.getCirExtensionRequestCafcassDocument()) ? BundlingRequestDocument.builder()
+            .documentLink(doc.getCirExtensionRequestCafcassDocument())
+            .documentFileName(doc.getCirExtensionRequestCafcassDocument().getDocumentFileName())
+            .documentGroup(BundlingDocGroupEnum.cafcassSectionCirExtensionRequestReport).build() : null);
+        bundleMap.put(CIR_TRANSFER_REQUEST_CAFCASS, Objects.nonNull(doc.getCirTransferRequestCafcassDocument()) ? BundlingRequestDocument.builder()
+            .documentLink(doc.getCirTransferRequestCafcassDocument())
+            .documentFileName(doc.getCirTransferRequestCafcassDocument().getDocumentFileName())
+            .documentGroup(BundlingDocGroupEnum.cafcassSectionCirTransferRequestReport).build() : null);
     }
 
     private static void mapPreliminaryDocuments(QuarantineLegalDoc doc, HashMap<String, BundlingRequestDocument> bundleMap) {
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/QuarantineLegalDoc.java b/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/QuarantineLegalDoc.java
index 5411b1896b0..0d127a31425 100644
--- a/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/QuarantineLegalDoc.java
+++ b/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/QuarantineLegalDoc.java
@@ -91,6 +91,8 @@ public class QuarantineLegalDoc {
     private final Document pathfinderDocument;
     private final Document draftOrdersDocument;
     private final Document courtNavQuarantineDocument;
+    private final Document cirExtensionRequestCafcassDocument;
+    private final Document cirTransferRequestCafcassDocument;
 
     // Adding Bulk scan attributes
     public final String fileName;