Dfr 3543 ct judiciary upload multiple attachments function

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

@@ -0,0 +1,84 @@
+package uk.gov.hmcts.reform.finrem.caseorchestration.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
+import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType;
+import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse;
+import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.EventType;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseDocument;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CaseType;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DraftDirectionOrderCollection;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseDetails;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.ContestedOrderApprovedLetterService;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.GenericDocumentService;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.HearingOrderService;
+import uk.gov.hmcts.reform.finrem.caseorchestration.service.documentcatergory.UploadedDraftOrderCategoriser;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class JudgeDraftOrderAboutToSubmitHandler extends FinremCallbackHandler {
+
+    private final HearingOrderService hearingOrderService;
+    private final GenericDocumentService genericDocumentService;
+    private final ContestedOrderApprovedLetterService contestedOrderApprovedLetterService;
+    private final UploadedDraftOrderCategoriser uploadedDraftOrderCategoriser;
+
+    public JudgeDraftOrderAboutToSubmitHandler(FinremCaseDetailsMapper finremCaseDetailsMapper, HearingOrderService hearingOrderService,
+                                               GenericDocumentService genericDocumentService,
+                                               ContestedOrderApprovedLetterService contestedOrderApprovedLetterService,
+                                               UploadedDraftOrderCategoriser uploadedDraftOrderCategoriser) {
+        super(finremCaseDetailsMapper);
+        this.hearingOrderService = hearingOrderService;
+        this.genericDocumentService = genericDocumentService;
+        this.contestedOrderApprovedLetterService = contestedOrderApprovedLetterService;
+        this.uploadedDraftOrderCategoriser = uploadedDraftOrderCategoriser;
+    }
+
+    @Override
+    public boolean canHandle(CallbackType callbackType, CaseType caseType, EventType eventType) {
+        return CallbackType.ABOUT_TO_SUBMIT.equals(callbackType)
+            && CaseType.CONTESTED.equals(caseType)
+            && EventType.JUDGE_DRAFT_ORDER.equals(eventType);
+    }
+
+    @Override
+    public GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle(FinremCallbackRequest callbackRequest,
+                                                                              String userAuthorisation) {
+
+        FinremCaseDetails finremCaseDetails = callbackRequest.getCaseDetails();
+        String caseId = String.valueOf(finremCaseDetails.getId());
+        log.info("Invoking contested event {} about to submit callback for Case ID: {}",
+            callbackRequest.getEventType(), caseId);
+        validateCaseData(callbackRequest);
+        convertAdditionalDocumentsToPdf(finremCaseDetails, userAuthorisation);
+        CaseDetails caseDetails = finremCaseDetailsMapper.mapToCaseDetails(finremCaseDetails);
+
+        hearingOrderService.convertToPdfAndStampAndStoreLatestDraftHearingOrder(caseDetails, userAuthorisation);
+        contestedOrderApprovedLetterService.generateAndStoreContestedOrderApprovedLetter(caseDetails, userAuthorisation);
+        FinremCaseDetails finremCaseDetailsUpdated = finremCaseDetailsMapper.mapToFinremCaseDetails(caseDetails);
+        uploadedDraftOrderCategoriser.categorise(finremCaseDetailsUpdated.getData());
+
+        return GenericAboutToStartOrSubmitCallbackResponse.<FinremCaseData>builder()
+            .data(finremCaseDetailsUpdated.getData()).build();
+    }
+
+    private void convertAdditionalDocumentsToPdf(FinremCaseDetails caseDetails, String authorisation) {
+        FinremCaseData caseData = caseDetails.getData();
+        List<DraftDirectionOrderCollection> directionOrderCollection = caseData.getDraftDirectionWrapper().getDraftDirectionOrderCollection();
+
+        directionOrderCollection.stream().map(order -> order.getValue().getAdditionalDocuments())
+            .filter(CollectionUtils::isNotEmpty).forEach(additionalDocs -> additionalDocs.forEach(additionalDoc -> {
+                CaseDocument documentPdf = genericDocumentService.convertDocumentIfNotPdfAlready(
+                    additionalDoc.getValue(), authorisation,
+                    String.valueOf(caseDetails.getId()));
+
+                additionalDoc.setValue(documentPdf);
+            }));
+    }
+}

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

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import uk.gov.hmcts.reform.finrem.caseorchestration.ccd.callback.CallbackType;
 import uk.gov.hmcts.reform.finrem.caseorchestration.controllers.GenericAboutToStartOrSubmitCallbackResponse;
 import uk.gov.hmcts.reform.finrem.caseorchestration.mapper.FinremCaseDetailsMapper;
@@ -22,6 +23,9 @@ public class JudgeDraftOrderMidHandler extends FinremCallbackHandler {
 
     private final BulkPrintDocumentService service;
 
+    private static final String NO_ORDERS_IN_COLLECTION
+        = "No orders have been uploaded. Please upload an order.";
+
     public JudgeDraftOrderMidHandler(FinremCaseDetailsMapper finremCaseDetailsMapper,
                                      BulkPrintDocumentService service) {
         super(finremCaseDetailsMapper);
@@ -43,10 +47,16 @@ public GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle(Finrem
         log.info("Invoking contested event {} mid callback for Case ID: {}",
             EventType.JUDGE_DRAFT_ORDER, caseId);
         FinremCaseData caseData = caseDetails.getData();
-
         DraftDirectionWrapper draftDirectionWrapper = caseData.getDraftDirectionWrapper();
         List<DraftDirectionOrderCollection> draftDirectionOrderCollection = draftDirectionWrapper.getDraftDirectionOrderCollection();
 
+        List<String> errors = new ArrayList<>();
+        if (ObjectUtils.isEmpty(draftDirectionOrderCollection)) {
+            errors.add(NO_ORDERS_IN_COLLECTION);
+            return GenericAboutToStartOrSubmitCallbackResponse.<FinremCaseData>builder()
+                .data(caseData).errors(errors).build();
+        }
+
         FinremCaseDetails caseDetailsBefore = callbackRequest.getCaseDetailsBefore();
         FinremCaseData beforeCaseData = caseDetailsBefore.getData();
         DraftDirectionWrapper draftDirectionWrapperBefore = beforeCaseData.getDraftDirectionWrapper();
@@ -59,7 +69,6 @@ public GenericAboutToStartOrSubmitCallbackResponse<FinremCaseData> handle(Finrem
             }
         }
 
-        List<String> errors = new ArrayList<>();
         draftDirectionOrderCollection.forEach(doc ->
             service.validateEncryptionOnUploadedDocument(doc.getValue().getUploadDraftDocument(),
                 caseId, errors, userAuthorisation)

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

@@ -10,6 +10,7 @@
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
@@ -26,4 +27,6 @@ public class DirectionOrder implements HasCaseDocument {
     YesOrNo isOrderStamped;
     @JsonProperty("originalDocument")
     CaseDocument originalDocument;
+    @JsonProperty("additionalDocuments")
+    private List<DocumentCollection> additionalDocuments;
 }

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

@@ -8,6 +8,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
 @Builder
@@ -21,4 +23,7 @@ public class DraftDirectionOrder implements HasCaseDocument {
 
     @JsonProperty("uploadDraftDocument")
     CaseDocument uploadDraftDocument;
+
+    @JsonProperty("additionalDocuments")
+    private List<DocumentCollection> additionalDocuments;
 }

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

@@ -12,6 +12,7 @@
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.CollectionElement;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrder;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DirectionOrderCollection;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DocumentCollection;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DraftDirectionOrder;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.DraftDirectionOrderCollection;
 import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.FinremCaseData;
@@ -52,14 +53,16 @@ public void convertToPdfAndStampAndStoreLatestDraftHearingOrder(CaseDetails case
 
         if (judgeApprovedHearingOrder.isPresent()) {
             String caseId = caseDetails.getId().toString();
+            DraftDirectionOrder order = judgeApprovedHearingOrder.get();
             CaseDocument latestDraftDirectionOrderDocument = genericDocumentService.convertDocumentIfNotPdfAlready(
-                judgeApprovedHearingOrder.get().getUploadDraftDocument(),
+                order.getUploadDraftDocument(),
                 authorisationToken, caseId);
             CaseDocument stampedHearingOrder = genericDocumentService.stampDocument(latestDraftDirectionOrderDocument,
                 authorisationToken, documentHelper.getStampType(caseDetails.getData()), caseId);
             updateCaseDataForLatestDraftHearingOrder(caseData, stampedHearingOrder);
-            updateCaseDataForLatestHearingOrderCollection(caseData, stampedHearingOrder, authorisationToken);
-            appendDocumentToHearingOrderCollection(caseDetails, stampedHearingOrder);
+            List<DocumentCollection> additionalDocs = order.getAdditionalDocuments();
+            updateCaseDataForLatestHearingOrderCollection(caseData, stampedHearingOrder, authorisationToken, additionalDocs);
+            appendDocumentToHearingOrderCollection(caseDetails, stampedHearingOrder, additionalDocs);
         } else {
             throw new InvalidCaseDataException(BAD_REQUEST.value(), "Missing data from callbackRequest.");
         }
@@ -135,6 +138,7 @@ public Optional<DraftDirectionOrder> draftDirectionOrderCollectionTail(CaseDetai
                     genericDocumentService.convertDocumentIfNotPdfAlready(
                         draftOrder.getUploadDraftDocument(),
                         authorisationToken, caseId))
+                .additionalDocuments(draftOrder.getAdditionalDocuments())
                 .build());
 
         }
@@ -152,14 +156,14 @@ private Optional<DraftDirectionOrder> getJudgeApprovedHearingOrder(CaseDetails c
             : draftDirectionOrderCollectionTail;
     }
 
-    private void appendDocumentToHearingOrderCollection(CaseDetails caseDetails, CaseDocument document) {
+    private void appendDocumentToHearingOrderCollection(CaseDetails caseDetails, CaseDocument document, List<DocumentCollection> additionalDocs) {
         Map<String, Object> caseData = caseDetails.getData();
 
         List<CollectionElement<DirectionOrder>> directionOrders = Optional.ofNullable(caseData.get(HEARING_ORDER_COLLECTION))
             .map(this::convertToListOfDirectionOrder)
             .orElse(new ArrayList<>());
 
-        DirectionOrder newDirectionOrder = DirectionOrder.builder().uploadDraftDocument(document).build();
+        DirectionOrder newDirectionOrder = DirectionOrder.builder().uploadDraftDocument(document).additionalDocuments(additionalDocs).build();
         directionOrders.add(CollectionElement.<DirectionOrder>builder().value(newDirectionOrder).build());
 
         caseData.put(HEARING_ORDER_COLLECTION, directionOrders);
@@ -171,13 +175,15 @@ private void updateCaseDataForLatestDraftHearingOrder(Map<String, Object> caseDa
 
     public void updateCaseDataForLatestHearingOrderCollection(Map<String, Object> caseData,
                                                               CaseDocument stampedHearingOrder,
-                                                              String authorisationToken) {
+                                                              String authorisationToken,
+                                                              List<DocumentCollection> additionalDocs) {
         List<DirectionOrderCollection> finalOrderCollection = documentHelper.getFinalOrderCollection(caseData);
         List<DirectionOrderCollection> finalDatedCollection = orderDateService.addCreatedDateInFinalOrder(finalOrderCollection, authorisationToken);
         if (!documentHelper.checkIfOrderAlreadyInFinalOrderCollection(finalDatedCollection, stampedHearingOrder)) {
             DirectionOrderCollection latestOrder = DirectionOrderCollection.builder()
                 .value(DirectionOrder.builder()
                     .uploadDraftDocument(stampedHearingOrder)
+                    .additionalDocuments(additionalDocs)
                     .orderDateTime(LocalDateTime.now())
                     .isOrderStamped(YesOrNo.YES)
                     .build())

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

@@ -31,6 +31,11 @@ private void categoriseOrders(List<DraftDirectionOrderCollection> orderCollectio
     private void setCategoryIfAbsent(DraftDirectionOrder order, DocumentCategory category) {
         if (order != null && order.getUploadDraftDocument() != null && order.getUploadDraftDocument().getCategoryId() == null) {
             order.getUploadDraftDocument().setCategoryId(category.getDocumentCategoryId());
+
+            Optional.ofNullable(order.getAdditionalDocuments())
+                .ifPresent(additionalDocuments -> additionalDocuments.forEach(document ->
+                    document.getValue().setCategoryId(category.getDocumentCategoryId())
+                ));
         }
     }
 }