[SNI-8773] update bundle logic for further documents

src/main/java/uk/gov/hmcts/sptribs/caseworker/event/CaseworkerCreateBundle.java

@@ -6,13 +6,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import uk.gov.hmcts.ccd.sdk.api.CCDConfig;
 import uk.gov.hmcts.ccd.sdk.api.CaseDetails;
 import uk.gov.hmcts.ccd.sdk.api.ConfigBuilder;
 import uk.gov.hmcts.ccd.sdk.api.Event;
 import uk.gov.hmcts.ccd.sdk.api.callback.AboutToStartOrSubmitResponse;
 import uk.gov.hmcts.ccd.sdk.type.ListValue;
-import uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil;
 import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
 import uk.gov.hmcts.sptribs.ciccase.model.State;
 import uk.gov.hmcts.sptribs.ciccase.model.UserRole;
@@ -38,7 +38,8 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyList;
-import static uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil.getAllCaseDocumentsExcludingInitialCicaUpload;
+import static uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil.extractDocumentsFromListValues;
+import static uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil.getAllCaseDocuments;
 import static uk.gov.hmcts.sptribs.caseworker.util.EventConstants.CREATE_BUNDLE;
 import static uk.gov.hmcts.sptribs.ciccase.model.State.AwaitingHearing;
 import static uk.gov.hmcts.sptribs.ciccase.model.State.CaseClosed;
@@ -92,13 +93,12 @@ public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(CaseDetails<C
                                                                        CaseDetails<CaseData, State> beforeDetails) {
 
         final CaseData caseData = details.getData();
-        final List<ListValue<CaseworkerCICDocument>> documentListValues = DocumentListUtil.getAllCaseDocuments(caseData);
+        final List<CaseworkerCICDocument> allCaseDocuments = extractDocumentsFromListValues(getAllCaseDocuments(caseData));
 
         if (caseData.isBundleOrderEnabled()) {
-            caseData.setCaseDocuments(getInitialCicaUpload(caseData, details.getId()));
-            caseData.setFurtherCaseDocuments(getFurtherDocuments(caseData));
+            setCaseBundleRequestDocuments(caseData, allCaseDocuments);
         } else {
-            var cicDocumentList = convertToBundleDocumentType(documentListValues);
+            var cicDocumentList = convertToBundleDocumentType(allCaseDocuments);
             caseData.setCaseDocuments(cicDocumentList);
         }
 
@@ -124,43 +124,36 @@ public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(CaseDetails<C
             .build();
     }
 
-    private List<AbstractCaseworkerCICDocument<CaseworkerCICDocument>> getInitialCicaUpload(CaseData caseData, long caseId) {
-        var initialDocs = Optional.ofNullable(caseData.getInitialCicaDocuments()).orElse(emptyList());
+    private void setCaseBundleRequestDocuments(CaseData caseData, List<CaseworkerCICDocument> allDocuments) {
+        List<CaseworkerCICDocument> initialDocuments = extractDocumentsFromListValues(caseData.getInitialCicaDocuments());
 
-        if (initialDocs.isEmpty()) {
-            log.warn("Initial Cica doc upload was empty for case {}", caseId);
-            return emptyList();
+        if (!CollectionUtils.isEmpty(initialDocuments)) {
+            caseData.setCaseDocuments(convertToBundleDocumentType(initialDocuments));
+            caseData.setFurtherCaseDocuments(convertToBundleDocumentType(getFurtherDocuments(allDocuments, initialDocuments)));
+        } else {
+            caseData.setCaseDocuments(convertToBundleDocumentType(allDocuments));
         }
-
-        return convertToBundleDocumentType(initialDocs);
     }
 
-    private List<AbstractCaseworkerCICDocument<CaseworkerCICDocument>> getFurtherDocuments(CaseData caseData) {
-        var docs = getAllCaseDocumentsExcludingInitialCicaUpload(caseData);
-
-        var bundleDocuments = convertToBundleDocumentType(docs);
-
-        bundleDocuments.sort(
-            Comparator.comparing(
-                doc -> doc.getValue().getDate(),
+    private static List<CaseworkerCICDocument> getFurtherDocuments(List<CaseworkerCICDocument> allDocuments,
+                                                                   List<CaseworkerCICDocument> initialDocuments) {
+        if (CollectionUtils.isEmpty(allDocuments)) {
+            return new ArrayList<>();
+        }
+        if (CollectionUtils.isEmpty(initialDocuments)) {
+            return new ArrayList<>(allDocuments);
+        }
+        return allDocuments.stream().filter(doc -> !initialDocuments.contains(doc))
+            .sorted(Comparator.comparing(
+                CaseworkerCICDocument::getDate,
                 Comparator.nullsLast(Comparator.naturalOrder())
-            )
-        );
-        return bundleDocuments;
+            ))
+            .collect(Collectors.toCollection(ArrayList::new));
     }
 
-    private List<AbstractCaseworkerCICDocument<CaseworkerCICDocument>> convertToBundleDocumentType(
-        List<ListValue<CaseworkerCICDocument>> docs) {
-        List<AbstractCaseworkerCICDocument<CaseworkerCICDocument>> abstractCaseworkerCICDocumentList = new ArrayList<>();
-
-        for (ListValue<CaseworkerCICDocument> caseworkerCICDocumentListValue : docs) {
-            CaseworkerCICDocument document = caseworkerCICDocumentListValue.getValue();
-            if (document.isValidBundleDocument()) {
-                abstractCaseworkerCICDocumentList.add(new AbstractCaseworkerCICDocument<>(document));
-            }
-        }
+    private List<AbstractCaseworkerCICDocument<CaseworkerCICDocument>> convertToBundleDocumentType(List<CaseworkerCICDocument> docs) {
 
-        return abstractCaseworkerCICDocumentList;
+        return docs.stream().filter(CaseworkerCICDocument::isValidBundleDocument).map(AbstractCaseworkerCICDocument::new).toList();
     }
 
     private List<ListValue<Bundle>> getExistingBundles(CaseDetails<CaseData, State> beforeDetails) {

src/main/java/uk/gov/hmcts/sptribs/caseworker/event/RespondentDocumentManagement.java

@@ -22,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil.addToExistingDocumentList;
+import static uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil.getAllCaseDocuments;
 import static uk.gov.hmcts.sptribs.caseworker.util.EventConstants.RESPONDENT_DOCUMENT_MANAGEMENT;
 import static uk.gov.hmcts.sptribs.ciccase.model.State.AwaitingHearing;
 import static uk.gov.hmcts.sptribs.ciccase.model.State.AwaitingOutcome;
@@ -103,13 +105,10 @@ public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(final CaseDet
 
         if (caseData.isBundleOrderEnabled()) {
             if (auditEventService.hasCaseEvent(String.valueOf(details.getId()), RESPONDENT_DOCUMENT_MANAGEMENT)) {
-                if (caseData.getFurtherUploadedDocuments() == null) {
-                    caseData.setFurtherUploadedDocuments(documents);
-                } else {
-                    caseData.getFurtherUploadedDocuments().addAll(documents);
-                }
+                caseData.setFurtherUploadedDocuments(addToExistingDocumentList(caseData.getFurtherUploadedDocuments(), documents));
             } else {
-                caseData.setInitialCicaDocuments(documents);
+                documents = getAllCaseDocuments(caseData);
+                caseData.setInitialCicaDocuments(addToExistingDocumentList(caseData.getInitialCicaDocuments(), documents));
             }
         }
 

src/main/java/uk/gov/hmcts/sptribs/caseworker/util/DocumentListUtil.java

@@ -59,7 +59,7 @@ private static List<CaseworkerCICDocument> prepareListExcludingInitialCicaUpload
 
     private static void prepareOtherCaseDocuments(CaseData data, List<CaseworkerCICDocument> docList) {
         docList.addAll(getOrderDocuments(data.getCicCase()));
-        docList.addAll(getCaseDocs(data.getCicCase()));
+        docList.addAll(getApplicantCaseDocs(data.getCicCase()));
         docList.addAll(getReinstateDocuments(data.getCicCase()));
         docList.addAll(getDecisionDocs(data));
         docList.addAll(getFinalDecisionDocs(data));
@@ -78,7 +78,7 @@ public static List<ListValue<CaseworkerCICDocument>> getAllCaseDocuments(final C
     public static DynamicList prepareCICDocumentListWithAllDocuments(final CaseData data) {
         List<DynamicListElement> dynamicListElements = new ArrayList<>();
 
-        dynamicListElements.addAll(getDynamicListElements(getCaseDocs(data.getCicCase()), CASE_TYPE));
+        dynamicListElements.addAll(getDynamicListElements(getApplicantCaseDocs(data.getCicCase()), CASE_TYPE));
         dynamicListElements.addAll(getDynamicListElements(getReinstateDocuments(data.getCicCase()), REINSTATE_TYPE));
         dynamicListElements.addAll(getDynamicListElements(getDocumentManagementDocs(data), DOC_MGMT_TYPE));
         dynamicListElements.addAll(getDynamicListElements(getCloseCaseDocuments(data), CLOSE_CASE_TYPE));
@@ -90,6 +90,12 @@ public static DynamicList prepareCICDocumentListWithAllDocuments(final CaseData
             .build();
     }
 
+    public static List<CaseworkerCICDocument> extractDocumentsFromListValues(List<ListValue<CaseworkerCICDocument>> listValues) {
+        return CollectionUtils.isEmpty(listValues)
+            ? new ArrayList<>()
+            : listValues.stream().map(ListValue::getValue).toList();
+    }
+
     private static List<DynamicListElement> getDynamicListElements(List<CaseworkerCICDocument> docList, String fileType) {
         return docList
             .stream()
@@ -161,6 +167,15 @@ public static DynamicMultiSelectList prepareContactPartiesDocumentList(final Cas
             .build();
     }
 
+    public static List<ListValue<CaseworkerCICDocument>> addToExistingDocumentList(
+            List<ListValue<CaseworkerCICDocument>> existing,
+            List<ListValue<CaseworkerCICDocument>> toAdd) {
+        if (CollectionUtils.isEmpty(existing)) {
+            return toAdd;
+        }
+        existing.addAll(toAdd);
+        return existing;
+    }
 
     private static void createDocumentList(String apiUrl, List<DynamicListElement> dynamicListElements, CaseworkerCICDocument doc) {
         String documentId = StringUtils.substringAfterLast(doc.getDocumentLink().getUrl(),
@@ -183,7 +198,7 @@ private static List<CaseworkerCICDocument> getReinstateDocuments(CicCase cicCase
         return reinstateDocList;
     }
 
-    private static List<CaseworkerCICDocument> getCaseDocs(CicCase cicCase) {
+    private static List<CaseworkerCICDocument> getApplicantCaseDocs(CicCase cicCase) {
         List<CaseworkerCICDocument> caseDocs = new ArrayList<>();
         if (!CollectionUtils.isEmpty(cicCase.getApplicantDocumentsUploaded())) {
             for (ListValue<CaseworkerCICDocument> document : cicCase.getApplicantDocumentsUploaded()) {

src/main/java/uk/gov/hmcts/sptribs/ciccase/model/CaseData.java

@@ -270,6 +270,7 @@ public class CaseData {
         label = "Initial CICA Documents",
         typeOverride = Collection,
         typeParameterOverride = "CaseworkerCICDocument",
+        hint = "Initial case documents up to and including CICA initial submission",
         access = {CollectionCreateUpdateOnlyAccess.class}
     )
     private List<ListValue<CaseworkerCICDocument>> initialCicaDocuments;

src/main/java/uk/gov/hmcts/sptribs/common/repositories/CaseEventRepository.java

@@ -50,6 +50,27 @@ public class CaseEventRepository {
             + ")"
         + "SELECT * FROM events_with_context WHERE event_id = :caseEventId AND created_date >= :startDate AND created_date < :endDate";
 
+    private static final String SELECT_FIRST_EVENT_DATA_FOR_CASE =
+        "SELECT ce.data FROM ccd.case_event ce "
+            + "WHERE ce.case_data_id = (SELECT id FROM ccd.case_data WHERE reference = :reference)"
+            + "AND ce.event_id = :caseEventId "
+            + "ORDER BY ce.created_date ASC "
+            + "LIMIT 1";
+
+    public List<CaseData> getFirstEventDataForCase(Long reference, String caseEventId) {
+        try {
+            return namedParameterJdbcTemplate.query(
+                SELECT_FIRST_EVENT_DATA_FOR_CASE,
+                Map.of(REFERENCE, reference, CASE_EVENT_ID, caseEventId),
+                (rs, rowNum) -> parseEventData(rs.getString("data"), reference)
+            );
+        } catch (DataAccessException e) {
+            log.error("Failed to retrieve first event data for reference={}", reference, e);
+            throw new CaseEventRepositoryException(
+                "Failed to retrieve first event data for reference=" + reference, e);
+        }
+    }
+
     public List<Long> getListOfCasesByEventTypeAndDate(String caseEventId, LocalDate createdDate) {
 
         List<Long> results;

src/main/java/uk/gov/hmcts/sptribs/common/service/OrdersListRestoreService.java → src/main/java/uk/gov/hmcts/sptribs/common/service/CaseDataRestoreService.java

@@ -6,6 +6,7 @@
 import uk.gov.hmcts.ccd.sdk.type.Document;
 import uk.gov.hmcts.ccd.sdk.type.ListValue;
 import uk.gov.hmcts.sptribs.caseworker.model.Order;
+import uk.gov.hmcts.sptribs.caseworker.util.DocumentListUtil;
 import uk.gov.hmcts.sptribs.caseworker.util.DocumentRemoveListUtil;
 import uk.gov.hmcts.sptribs.caseworker.util.SendOrderUtil;
 import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
@@ -21,11 +22,12 @@
 import java.util.stream.Collectors;
 
 import static uk.gov.hmcts.sptribs.caseworker.util.EventConstants.CASEWORKER_DOCUMENT_MANAGEMENT_REMOVE;
+import static uk.gov.hmcts.sptribs.caseworker.util.EventConstants.RESPONDENT_DOCUMENT_MANAGEMENT;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class OrdersListRestoreService {
+public class CaseDataRestoreService {
 
     private final CaseEventRepository caseEventRepository;
 
@@ -63,6 +65,19 @@ public void restoreOrdersList(Long reference, CaseData currentData, LocalDate st
         restoredOrdersList.stream().map(ListValue::getValue).forEach(order -> SendOrderUtil.updateCicCaseOrderList(currentData, order));
     }
 
+    public void updateInitialCaseDocuments(Long reference, CaseData currentCaseData) {
+        List<CaseData> caseDataFromEventList = caseEventRepository.getFirstEventDataForCase(reference, RESPONDENT_DOCUMENT_MANAGEMENT);
+        if (caseDataFromEventList.isEmpty()) {
+            log.warn("No event data found for reference={}, skipping", reference);
+            return;
+        }
+        CaseData caseDataBefore = caseDataFromEventList.getFirst();
+        var caseDocumentsAtRespondentUpload = DocumentListUtil.getAllCaseDocuments(caseDataBefore);
+        log.info("Updating initial case documents at respondent upload. Total number of case documents at respondent upload: {}",
+            caseDocumentsAtRespondentUpload.size());
+        currentCaseData.setInitialCicaDocuments(caseDocumentsAtRespondentUpload);
+    }
+
     private List<ListValue<Order>> findRemovedEntries(RemoveEventWithPrecedingData event) {
         List<ListValue<Order>> before = event.getPrecedingEventData().getCicCase().getOrderList();
         List<ListValue<Order>> after = event.getCurrentEventData().getCicCase().getOrderList();

src/main/java/uk/gov/hmcts/sptribs/systemupdate/event/SystemMigrateInitialCaseDocuments.java

@@ -0,0 +1,46 @@
+package uk.gov.hmcts.sptribs.systemupdate.event;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import uk.gov.hmcts.ccd.sdk.api.CCDConfig;
+import uk.gov.hmcts.ccd.sdk.api.CaseDetails;
+import uk.gov.hmcts.ccd.sdk.api.ConfigBuilder;
+import uk.gov.hmcts.ccd.sdk.api.callback.AboutToStartOrSubmitResponse;
+import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
+import uk.gov.hmcts.sptribs.ciccase.model.State;
+import uk.gov.hmcts.sptribs.ciccase.model.UserRole;
+import uk.gov.hmcts.sptribs.common.service.CaseDataRestoreService;
+
+import static uk.gov.hmcts.sptribs.ciccase.model.UserRole.SYSTEM_UPDATE;
+import static uk.gov.hmcts.sptribs.ciccase.model.access.Permissions.CREATE_READ_UPDATE_DELETE;
+
+@RequiredArgsConstructor
+@Component
+public class SystemMigrateInitialCaseDocuments implements CCDConfig<CaseData, State, UserRole> {
+    public static final String SYSTEM_MIGRATE_INITIAL_CASE_DOCUMENTS = "migrate-initial-case-documents";
+
+    private final CaseDataRestoreService caseDataRestoreService;
+
+    @Override
+    public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
+        configBuilder
+            .event(SYSTEM_MIGRATE_INITIAL_CASE_DOCUMENTS)
+            .forAllStates()
+            .name("System: Migrate initial docs")
+            .description("Migrate ")
+            .aboutToSubmitCallback(this::aboutToSubmit)
+            .grant(CREATE_READ_UPDATE_DELETE, SYSTEM_UPDATE);
+    }
+
+    public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(CaseDetails<CaseData, State> caseDetails,
+                                                                       CaseDetails<CaseData, State> beforeDetails) {
+        CaseData caseData = caseDetails.getData();
+        Long reference = caseDetails.getId();
+
+        caseDataRestoreService.updateInitialCaseDocuments(reference, caseData);
+
+        return AboutToStartOrSubmitResponse.<CaseData, State>builder()
+                .data(caseData)
+                .build();
+    }
+}

src/main/java/uk/gov/hmcts/sptribs/systemupdate/event/SystemRestoreOrders.java

@@ -10,7 +10,7 @@
 import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
 import uk.gov.hmcts.sptribs.ciccase.model.State;
 import uk.gov.hmcts.sptribs.ciccase.model.UserRole;
-import uk.gov.hmcts.sptribs.common.service.OrdersListRestoreService;
+import uk.gov.hmcts.sptribs.common.service.CaseDataRestoreService;
 
 import java.time.LocalDate;
 
@@ -28,7 +28,7 @@ public class SystemRestoreOrders implements CCDConfig<CaseData, State, UserRole>
 
     private static final LocalDate END_TO_DATE = LocalDate.of(2026, 3, 6);
 
-    private final OrdersListRestoreService ordersListRestoreService;
+    private final CaseDataRestoreService caseDataRestoreService;
 
     @Override
     public void configure(ConfigBuilder<CaseData, State, UserRole> configBuilder) {
@@ -46,7 +46,7 @@ public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(CaseDetails<C
         CaseData caseData = caseDetails.getData();
         Long reference = caseDetails.getId();
 
-        ordersListRestoreService.restoreOrdersList(reference, caseData, START_FROM_DATE, END_TO_DATE);
+        caseDataRestoreService.restoreOrdersList(reference, caseData, START_FROM_DATE, END_TO_DATE);
 
         return AboutToStartOrSubmitResponse.<CaseData, State>builder()
             .data(caseData)