NIAD-3467 Fixed undeleted logs bug

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
           cp -r ./${{ inputs.path }}/build/reports ./artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
         if: always()
         with:
           name: '${{ inputs.name }} Checkstyle Report'
@@ -68,7 +68,7 @@ jobs:
           cp -r ./${{ inputs.path }}/build/reports ./artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
         if: always()
         with:
           name: '${{ inputs.name }} Spotbugs Report'
@@ -103,7 +103,7 @@ jobs:
           cp -r ./${{ inputs.path }}/build/reports ./artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
         if: always()
         with:
           name: '${{ inputs.name }} Unit Test Report'
@@ -210,7 +210,7 @@ jobs:
           cp -r ./scripts/logs ./artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
         if: always()
         with:
           name: '${{ inputs.name }} Integration Test Report & Docker Logs'

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 * Improved error handling in SkeletonProcessingService to throw a meaningful IllegalArgumentException
   when a payload node cannot be matched to a skeleton document ID, replacing an uninformative NullPointerException.
+* Fixed `canMergeCompleteBundle` incorrectly returning `true` when attachment logs are empty, causing a blank patient record after large message GP2GP transfers.
 
 ## [3.1.3] - 2025-09-19
 

docker/docker-compose-checks.yml

@@ -1,10 +1,9 @@
-version: '3.8'
 services:
   gpc_facade:
     container_name: gpc_facade_tests
     build:
       target: build
-    entrypoint: "gradle check"
+    entrypoint: ["gradle", "check"]
     environment:
       - GPC_FACADE_SERVER_PORT
       - PS_DB_URL
@@ -15,7 +14,7 @@ services:
     container_name: gp2gp_translator_tests
     build:
       target: build
-    entrypoint: "gradle check"
+    entrypoint: ["gradle", "check"]
     environment:
       - GP2GP_TRANSLATOR_SERVER_PORT
       - PS_DB_URL

docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   gpc_facade:
     build:

docker/release-scripts/ps-mhs-e2e/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 
 ############ Network ##############
 

gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java

@@ -61,6 +61,11 @@ public boolean canMergeCompleteBundle(String conversationId) throws ValidationEx
         }
 
         var undeletedLogs = getUndeletedLogsForConversation(conversationId);
+
+        if (undeletedLogs.isEmpty()) {
+            return false;
+        }
+
         return undeletedLogs.stream().allMatch(log -> log.getUploaded().equals(true));
     }
 

gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingServiceTests.java

@@ -468,6 +468,16 @@ public void When_AttachmentsPresent_Expect_AttachmentReferenceUpdated()
         verify(nackAckPreparationService, never()).sendNackMessage(any(NACKReason.class), any(RCMRIN030000UKMessage.class), any());
     }
 
+    @Test
+    public void When_AllAttachmentLogsDeleted_CanMergeCompleteBundle_Expect_ReturnFalse() throws JAXBException {
+        var emptyAttachmentLogs = new ArrayList<PatientAttachmentLog>();
+
+        when(patientAttachmentLogService.findAttachmentLogs(CONVERSATION_ID)).thenReturn(emptyAttachmentLogs);
+        var result = inboundMessageMergingService.canMergeCompleteBundle(CONVERSATION_ID);
+
+        assertFalse(result);
+    }
+
 
     private ArrayList<PatientAttachmentLog> createPatientAttachmentList(Boolean isParentUploaded, Boolean isSkeleton) {
         var patientAttachmentLogs = new ArrayList<PatientAttachmentLog>();