Fpvtl 2412 cafcass england extensions

.gitignore

@@ -25,6 +25,14 @@ src/main/resources/application.yaml
 /.aat-env
 /bin/ccd-config-PRL-local.xlsx
 /.mirrord/mirrord.json
+/node_modules/.yarn-integrity
+/node_modules/.yarn-state.yml
+/.yarnrc.yml
+/gradle-8.7-bin.zip
+/.yarn/install-state.gz
+/package.json
+/yarn.lock
+/.yarn/releases/yarn-4.12.0.cjs
 /.aat-env*
 /target/poitl-output/*
 

build.gradle

@@ -193,7 +193,13 @@ apply plugin: 'net.serenity-bdd.aggregator'
 group = 'uk.gov.hmcts.reform.prl'
 version = '0.0.1'
 
-mainClassName = 'uk.gov.hmcts.reform.prl.Application'
+if (GradleVersion.current() >= GradleVersion.version('9.0')) {
+  springBoot {
+    mainClass.set('uk.gov.hmcts.reform.prl.Application')
+  }
+} else {
+  mainClassName = 'uk.gov.hmcts.reform.prl.Application'
+}
 
 bootJar {
   getArchiveFileName().set(provider {
@@ -468,7 +474,6 @@ dependencies {
   integrationTestImplementation(sourceSets.test.output)
 }
 
-
 processContractTestResources {
   duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }

src/functionalTest/java/uk/gov/hmcts/reform/prl/controllers/cafcass/CafcassUploadDocumentFunctionalTest.java

@@ -90,4 +90,38 @@ public void givenValidDocumentData_then200Response() throws IOException {
             .body("message", equalTo("Document has been uploaded successfully: Dummy_pdf_file.pdf"));
 
     }
+
+    @Test
+    @Order(3)
+    public void givenCirTransferDocument_then200Response() throws IOException {
+        final File fileToUpload = readFile(CAFCASS_DUMMY_UPLOAD_FILE);
+
+        request
+            .header("Authorization", idamTokenGenerator.generateIdamTokenForCafcass())
+            .header("ServiceAuthorization", serviceAuthenticationGenerator.generateTokenForCcd())
+            .multiPart("file", fileToUpload)
+            .param("typeOfDocument", "cirTransferRequest")
+            .pathParam("caseId", caseDetails.getId())
+            .contentType(MediaType.MULTIPART_FORM_DATA_VALUE)
+            .post("/{caseId}/document")
+            .then().assertThat().statusCode(200)
+            .body("message", equalTo("Document has been uploaded successfully: Dummy_pdf_file.pdf"));
+    }
+
+    @Test
+    @Order(4)
+    public void givenCirExtensionDocument_then200Response() throws IOException {
+        final File fileToUpload = readFile(CAFCASS_DUMMY_UPLOAD_FILE);
+
+        request
+            .header("Authorization", idamTokenGenerator.generateIdamTokenForCafcass())
+            .header("ServiceAuthorization", serviceAuthenticationGenerator.generateTokenForCcd())
+            .multiPart("file", fileToUpload)
+            .param("typeOfDocument", "cirExtensionRequest")
+            .pathParam("caseId", caseDetails.getId())
+            .contentType(MediaType.MULTIPART_FORM_DATA_VALUE)
+            .post("/{caseId}/document")
+            .then().assertThat().statusCode(200)
+            .body("message", equalTo("Document has been uploaded successfully: Dummy_pdf_file.pdf"));
+    }
 }

src/main/java/uk/gov/hmcts/reform/prl/enums/managedocuments/CafcassReportAndGuardianEnum.java

@@ -18,6 +18,10 @@ public enum CafcassReportAndGuardianEnum {
 
     riskAssessment("16aRiskAssessment", "16a risk assessment"),
 
+    cirTransferRequest("cirTransferRequest", "CIR Transfer Request"),
+
+    cirExtensionRequest("cirExtensionRequest", "CIR Extension Request"),
+
     guardianReport("guardianReport", "Guardian report"),
 
     specialGuardianshipReport("specialGuardianshipReport", "Special guardianship report"),

src/main/java/uk/gov/hmcts/reform/prl/mapper/bundle/BundleCreateRequestMapper.java

@@ -25,6 +25,7 @@
 import uk.gov.hmcts.reform.prl.models.dto.bundle.BundlingRequestDocument;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.MiamDetails;
+import uk.gov.hmcts.reform.prl.models.dto.ccd.ReviewDocuments;
 import uk.gov.hmcts.reform.prl.models.dto.hearings.CaseHearing;
 import uk.gov.hmcts.reform.prl.models.dto.hearings.HearingDaySchedule;
 import uk.gov.hmcts.reform.prl.models.dto.hearings.Hearings;
@@ -78,7 +79,6 @@
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.SECTION_47_LA;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.SECTION_7_ADDENDUM_REPORT_LA;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.SECTION_7_REPORT_LA;
-import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.SIXTEEN_A_RISK_ASSESSMENT;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.SPECIAL_GUARDIANSHIP_REPORT;
 import static uk.gov.hmcts.reform.prl.constants.ManageDocumentsCategoryConstants.TRANSCRIPTS_OF_JUDGEMENTS;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.BLANK_STRING;
@@ -410,37 +410,18 @@ void addOrderDocument(List<BundlingRequestDocument> orders, Document document) {
     //Updated to retrieve otherDocuments according to the new manageDocuments event
     private List<Element<BundlingRequestDocument>> mapOtherDocumentsFromCaseData(
         CaseData caseData) {
-        List<Element<QuarantineLegalDoc>>  allDocuments = new ArrayList<>();
-        if (null != caseData.getReviewDocuments().getCourtStaffUploadDocListDocTab()
-            && !caseData.getReviewDocuments().getCourtStaffUploadDocListDocTab().isEmpty()) {
-            List<Element<QuarantineLegalDoc>> courtStaffUploadDocList = caseData.getReviewDocuments().getCourtStaffUploadDocListDocTab();
-            allDocuments.addAll(courtStaffUploadDocList);
-        }
-        if (null != caseData.getReviewDocuments().getCafcassUploadDocListDocTab()
-            && !caseData.getReviewDocuments().getCafcassUploadDocListDocTab().isEmpty()) {
-            List<Element<QuarantineLegalDoc>> cafcassUploadDocList = caseData.getReviewDocuments().getCafcassUploadDocListDocTab();
-            allDocuments.addAll(cafcassUploadDocList);
-        }
-        if (null != caseData.getReviewDocuments().getLocalAuthorityUploadDocListDocTab()
-            && !caseData.getReviewDocuments().getLocalAuthorityUploadDocListDocTab().isEmpty()) {
-            List<Element<QuarantineLegalDoc>> localAuthorityUploadDocList = caseData.getReviewDocuments().getLocalAuthorityUploadDocListDocTab();
-            allDocuments.addAll(localAuthorityUploadDocList);
-        }
-        if (null != caseData.getReviewDocuments().getLegalProfUploadDocListDocTab()
-            && !caseData.getReviewDocuments().getLegalProfUploadDocListDocTab().isEmpty()) {
-            List<Element<QuarantineLegalDoc>> legalProfUploadDocList = caseData.getReviewDocuments().getLegalProfUploadDocListDocTab();
-            allDocuments.addAll(legalProfUploadDocList);
-        }
-
-        if (null != caseData.getReviewDocuments().getCitizenUploadedDocListDocTab()
-            && !caseData.getReviewDocuments().getCitizenUploadedDocListDocTab().isEmpty()) {
-            List<Element<QuarantineLegalDoc>> citizenUploadedDocuments = caseData.getReviewDocuments().getCitizenUploadedDocListDocTab();
-            allDocuments.addAll(citizenUploadedDocuments);
+        List<Element<QuarantineLegalDoc>> allDocuments = new ArrayList<>();
+        ReviewDocuments reviewDocuments = caseData.getReviewDocuments();
+        if (null != reviewDocuments) {
+            addIfNotEmpty(allDocuments, reviewDocuments.getCourtStaffUploadDocListDocTab());
+            addIfNotEmpty(allDocuments, reviewDocuments.getCafcassUploadDocListDocTab());
+            addIfNotEmpty(allDocuments, reviewDocuments.getLocalAuthorityUploadDocListDocTab());
+            addIfNotEmpty(allDocuments, reviewDocuments.getLegalProfUploadDocListDocTab());
+            addIfNotEmpty(allDocuments, reviewDocuments.getCitizenUploadedDocListDocTab());
         }
 
         List<BundlingRequestDocument> otherBundlingDocuments = new ArrayList<>();
-        List<QuarantineLegalDoc> allDocs = ElementUtils.unwrapElements(allDocuments);
-        for (QuarantineLegalDoc doc : allDocs) {
+        for (QuarantineLegalDoc doc : ElementUtils.unwrapElements(allDocuments)) {
             BundlingRequestDocument otherDoc = mapBundlingRequestDocumentForOtherDocs(doc);
             if (null != otherDoc) {
                 log.info("otherDoc in bundle with filename: {} for case: {}", otherDoc.documentFileName, caseData.getId());
@@ -450,6 +431,12 @@ private List<Element<BundlingRequestDocument>> mapOtherDocumentsFromCaseData(
         return ElementUtils.wrapElements(otherBundlingDocuments);
     }
 
+    private <T> void addIfNotEmpty(List<T> target, List<T> source) {
+        if (null != source && !source.isEmpty()) {
+            target.addAll(source);
+        }
+    }
+
 
     private BundlingRequestDocument mapBundlingRequestDocumentForOtherDocs(QuarantineLegalDoc doc) {
         HashMap<String, BundlingRequestDocument> bundleMap = new HashMap<>();
@@ -619,13 +606,6 @@ private static void mapCafcassLaReports(QuarantineLegalDoc doc, HashMap<String,
                 .documentFileName(doc.getSection7ReportDocument().getDocumentFileName())
                 .documentGroup(BundlingDocGroupEnum.section7Report).build() : null
         );
-        bundleMap.put(
-            SIXTEEN_A_RISK_ASSESSMENT,
-            Objects.nonNull(doc.getSixteenARiskAssessmentDocument()) ? BundlingRequestDocument.builder()
-                .documentLink(doc.getSixteenARiskAssessmentDocument())
-                .documentFileName(doc.getSixteenARiskAssessmentDocument().getDocumentFileName())
-                .documentGroup(BundlingDocGroupEnum.sixteenARiskAssessment).build() : null
-        );
         bundleMap.put(
             GUARDIAN_REPORT,
             Objects.nonNull(doc.getGuardianReportDocument()) ? BundlingRequestDocument.builder()

src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/QuarantineLegalDoc.java

@@ -47,6 +47,8 @@ public class QuarantineLegalDoc {
     private final Document section7ReportDocument;
     private final Document section37ReportDocument;
     private final Document sixteenARiskAssessmentDocument; // 16aRiskAssessment
+    private final Document cirTransferRequestDocument;
+    private final Document cirExtensionRequestDocument;
     private final Document guardianReportDocument;
     private final Document specialGuardianshipReportDocument;
     private final Document otherDocsDocument;

src/main/java/uk/gov/hmcts/reform/prl/models/dto/ccd/ManageOrders.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.AllArgsConstructor;
@@ -47,6 +48,7 @@
 @Builder(toBuilder = true)
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ManageOrders implements MappableObject {
 
     private final String childListForSpecialGuardianship;

src/main/java/uk/gov/hmcts/reform/prl/models/dto/citizen/CitizenDocumentsManagement.java

@@ -45,6 +45,8 @@ public class CitizenDocumentsManagement {
         Set.of(
             "section37Report",
             "16aRiskAssessment",
+            "cirTransferRequest",
+            "cirExtensionRequest",
             "publicFundingCertificates",
             "noticesOfActingDischarge",
             "requestForFASFormsToBeChanged",

src/main/java/uk/gov/hmcts/reform/prl/services/bundle/BundlingService.java

@@ -49,8 +49,11 @@ private BundleCreateResponse createBundle(String authorization, String serviceAu
         BundleCreateResponse bundleCreateResponse = null;
         try {
             bundleCreateResponse = bundleApiClient.createBundleServiceRequest(authorization, serviceAuthorization, bundleCreateRequest);
+        } catch (feign.FeignException e) {
+            log.error("Error in creating bundle service request — status: {}, headers: {}, body: {}",
+                      e.status(), e.responseHeaders(), e.contentUTF8(), e);
         } catch (Exception e) {
-            log.error("Error in creating bundle service request",e);
+            log.error("Error in creating bundle service request", e);
         }
         return bundleCreateResponse;
     }

src/main/java/uk/gov/hmcts/reform/prl/services/cafcass/CafcassUploadDocService.java

@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
 import uk.gov.hmcts.reform.authorisation.generators.AuthTokenGenerator;
@@ -18,8 +19,10 @@
 import uk.gov.hmcts.reform.prl.enums.CaseEvent;
 import uk.gov.hmcts.reform.prl.enums.managedocuments.CafcassReportAndGuardianEnum;
 import uk.gov.hmcts.reform.prl.enums.managedocuments.DocumentPartyEnum;
+import uk.gov.hmcts.reform.prl.models.Element;
 import uk.gov.hmcts.reform.prl.models.complextypes.QuarantineLegalDoc;
 import uk.gov.hmcts.reform.prl.models.documents.Document.DocumentBuilder;
+import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
 import uk.gov.hmcts.reform.prl.services.managedocuments.ManageDocumentsService;
 import uk.gov.hmcts.reform.prl.services.tab.alltabs.AllTabServiceImpl;
 
@@ -37,19 +40,38 @@
 import static uk.gov.hmcts.reform.prl.services.cafcass.CafcassServiceUtil.checkFileFormat;
 import static uk.gov.hmcts.reform.prl.services.cafcass.CafcassServiceUtil.checkTypeOfDocument;
 import static uk.gov.hmcts.reform.prl.services.managedocuments.ManageDocumentsService.MANAGE_DOCUMENTS_TRIGGERED_BY;
+import static uk.gov.hmcts.reform.prl.utils.ElementUtils.element;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CafcassUploadDocService {
 
     public static final List<String> ALLOWED_FILE_TYPES = List.of("pdf", "docx");
+
+    public static final String DOC_TYPE_CIR_TRANSFER = "cirTransferRequest";
+    public static final String DOC_TYPE_CIR_EXTENSION = "cirExtensionRequest";
+    public static final String DOC_TYPE_S16A_RISK_ASSESSMENT = "S_16A_Risk_Assessment";
+
+    public static final List<String> URGENT_CAFCASS_DOC_TYPES = List.of(
+        DOC_TYPE_CIR_TRANSFER, DOC_TYPE_CIR_EXTENSION, DOC_TYPE_S16A_RISK_ASSESSMENT
+    );
+
+    // These Cafcass England doc types must always be prefixed with Confidential_
+    // regardless of the admin's restricted decision see https://tools.hmcts.net/jira/browse/FPVTL-2412
+    public static final List<String> ALWAYS_CONFIDENTIAL_CAFCASS_DOC_TYPES = List.of(
+        DOC_TYPE_CIR_TRANSFER, DOC_TYPE_CIR_EXTENSION, DOC_TYPE_S16A_RISK_ASSESSMENT
+    );
+    public static final String MANAGE_DOC_UPLOADED_CATEGORY = "manageDocUploadedCategory";
+
     public static final List<String> ALLOWED_TYPE_OF_DOCS = List.of(
-        "16_4_Report", "CR_1", "CR_2", "CIR_Part1", "CIR_Part2", "CIR_Review", "CMO_report",
+        "16_4_Report", "CR_1", "CR_2", "CIR_Part1", "CIR_Part2", "CIR_Review",
+        DOC_TYPE_CIR_TRANSFER, DOC_TYPE_CIR_EXTENSION,
+        "CMO_report",
         "Contact_Centre_Recordings", "Correspondence", "Direct_work", "Enforcement_report",
         "FAO_Report", "FAO_Workplan", "Letter_from_Child", "Other_Non_Section_7_Report",
         "Position_Statement", "Positive_Parenting_Programme_Report", "Re_W_Report",
-        "S_11H_Monitoring", "S_16A_Risk_Assessment", "Safeguarding_Letter",
+        "S_11H_Monitoring", DOC_TYPE_S16A_RISK_ASSESSMENT, "Safeguarding_Letter",
         "Safeguarding_Letter_Returner", "Safeguarding_Letter_Shorter_Template",
         "Safeguarding_Letter_Update", "Second_Gatekeeping_Safeguarding_Letter",
         "Section7_Addendum_Report", "Section7_Report_Child_Impact_Analysis", "Suitability_report"
@@ -65,6 +87,8 @@ public class CafcassUploadDocService {
 
     public void uploadDocument(String authorisation, MultipartFile document,
                                String typeOfDocument, String caseId) {
+        log.info("Cafcass document upload request received for caseId: {}, typeOfDocument: {}", caseId,
+                 typeOfDocument);
         if (isValidDocument(document, typeOfDocument)) {
             CaseDetails caseDetails = checkIfCasePresent(caseId, authorisation);
             if (caseDetails == null) {
@@ -105,7 +129,25 @@ private void updateCcdAfterUploadingDocument(MultipartFile document, String type
             quarantineLegalDoc
         );
 
-        caseDataUpdated.putIfAbsent(MANAGE_DOCUMENTS_TRIGGERED_BY, null);
+        if (URGENT_CAFCASS_DOC_TYPES.contains(typeOfDocument)) {
+            boolean isDuplicate = hasCafcassQuarantineDocOfSameCategory(
+                startAllTabsUpdateDataContent.caseData(),
+                quarantineLegalDoc.getCategoryId()
+            );
+            log.info("Cafcass urgent doc upload caseId={} type={} categoryId={} isDuplicate={}",
+                     caseId, typeOfDocument, quarantineLegalDoc.getCategoryId(), isDuplicate);
+            if (!isDuplicate) {
+                caseDataUpdated.put(MANAGE_DOCUMENTS_TRIGGERED_BY, "CAFCASS");
+                caseDataUpdated.put(MANAGE_DOC_UPLOADED_CATEGORY,
+                                    List.of(element(quarantineLegalDoc.getCategoryId()))
+                );
+            } else {
+                caseDataUpdated.put(MANAGE_DOCUMENTS_TRIGGERED_BY, null);
+                caseDataUpdated.put(MANAGE_DOC_UPLOADED_CATEGORY, null);
+            }
+        } else {
+            caseDataUpdated.putIfAbsent(MANAGE_DOCUMENTS_TRIGGERED_BY, null);
+        }
 
         manageDocumentsService.moveDocumentsToQuarantineTab(
             quarantineLegalDoc,
@@ -125,6 +167,15 @@ private void updateCcdAfterUploadingDocument(MultipartFile document, String type
         log.info("Document has been saved in CCD {}", document.getOriginalFilename());
     }
 
+    private boolean hasCafcassQuarantineDocOfSameCategory(CaseData caseData, String categoryId) {
+        List<Element<QuarantineLegalDoc>> quarantineDocs = caseData.getDocumentManagementDetails() != null
+            ? caseData.getDocumentManagementDetails().getCafcassQuarantineDocsList()
+            : null;
+        return !CollectionUtils.isEmpty(quarantineDocs) && quarantineDocs.stream()
+            .map(Element::getValue)
+            .anyMatch(doc -> categoryId.equals(doc.getCategoryId()));
+    }
+
     private QuarantineLegalDoc createQuarantineDocFromCafcassUploadedDoc(String typeOfDocument,
                                                                          Document document) {
         DocumentBuilder uploadedDoc = uk.gov.hmcts.reform.prl.models.documents.Document.builder()
@@ -190,6 +241,8 @@ private static Map<String, CafcassReportAndGuardianEnum> createDocumentTypeMap()
         map.put("CIR_Part1", CafcassReportAndGuardianEnum.section7Report);
         map.put("CIR_Part2", CafcassReportAndGuardianEnum.section7Report);
         map.put("CIR_Review", CafcassReportAndGuardianEnum.section7Report);
+        map.put(DOC_TYPE_CIR_TRANSFER, CafcassReportAndGuardianEnum.cirTransferRequest);
+        map.put(DOC_TYPE_CIR_EXTENSION, CafcassReportAndGuardianEnum.cirExtensionRequest);
         map.put("CMO_report", CafcassReportAndGuardianEnum.otherDocs);
         map.put("Contact_Centre_Recordings", CafcassReportAndGuardianEnum.otherDocs);
         map.put("Correspondence", CafcassReportAndGuardianEnum.otherDocs);
@@ -203,7 +256,7 @@ private static Map<String, CafcassReportAndGuardianEnum> createDocumentTypeMap()
         map.put("Positive_Parenting_Programme_Report", CafcassReportAndGuardianEnum.otherDocs);
         map.put("Re_W_Report", CafcassReportAndGuardianEnum.otherDocs);
         map.put("S_11H_Monitoring", CafcassReportAndGuardianEnum.otherDocs);
-        map.put("S_16A_Risk_Assessment", CafcassReportAndGuardianEnum.riskAssessment);
+        map.put(DOC_TYPE_S16A_RISK_ASSESSMENT, CafcassReportAndGuardianEnum.riskAssessment);
         map.put("Safeguarding_Letter", CafcassReportAndGuardianEnum.safeguardingLetter);
         map.put("Safeguarding_Letter_Returner", CafcassReportAndGuardianEnum.safeguardingLetter);
         map.put("Safeguarding_Letter_Shorter_Template", CafcassReportAndGuardianEnum.safeguardingLetter);