Merge branch 'develop' into AC-1567

Author: JoeBatt1989

src/WorkflowManager/Common/Services/PayloadService.cs

@@ -86,7 +86,7 @@ public PayloadService(
                     CallingAeTitle = eventPayload.CallingAeTitle,
                     Timestamp = eventPayload.Timestamp,
                     PatientDetails = patientDetails,
-                    PayloadDeleted = PayloadDeleted.No,
+                    PayloadDeleted = PayloadDeleted.No
                 };
 
                 if (await _payloadRepository.CreateAsync(payload))
@@ -173,12 +173,12 @@ public async Task<bool> DeletePayloadFromStorageAsync(string payloadId)
                 throw new MonaiNotFoundException($"Payload with ID: {payloadId} not found");
             }
 
-            if (payload.PayloadDeleted == PayloadDeleted.InProgress)
+            if (payload.PayloadDeleted == PayloadDeleted.InProgress || payload.PayloadDeleted == PayloadDeleted.Yes)
             {
-                throw new MonaiBadRequestException($"Deletion of files for payload ID: {payloadId} already in progress");
+                throw new MonaiBadRequestException($"Deletion of files for payload ID: {payloadId} already in progress or already deleted");
             }
 
-            // update the payload to in progress before we request deletion form MinIO
+            // update the payload to in progress before we request deletion from storage
             payload.PayloadDeleted = PayloadDeleted.InProgress;
             await _payloadRepository.UpdateAsync(payload);
 
@@ -188,12 +188,19 @@ public async Task<bool> DeletePayloadFromStorageAsync(string payloadId)
             {
                 try
                 {
-                    await _storageService.RemoveObjectsAsync(payload.Bucket, payload.Files.Select(f => f.Path));
+                    // get all objects for the payload in storage to be deleted
+                    var allPayloadObjects = await _storageService.ListObjectsAsync(payload.Bucket, payloadId, true);
+
+                    if (allPayloadObjects.Any())
+                    {
+                        await _storageService.RemoveObjectsAsync(payload.Bucket, allPayloadObjects.Select(o => o.FilePath));
+                    }
+
                     payload.PayloadDeleted = PayloadDeleted.Yes;
                 }
-                catch
+                catch (Exception ex)
                 {
-                    _logger.PayloadUpdateFailed(payloadId);
+                    _logger.PayloadDeleteFailed(payloadId, ex);
                     payload.PayloadDeleted = PayloadDeleted.Failed;
                 }
                 finally

src/WorkflowManager/Logging/Log.300000.Payload.cs

@@ -37,5 +37,8 @@ public static partial class Log
 
         [LoggerMessage(EventId = 300005, Level = LogLevel.Error, Message = "Failed to update payload {payloadId} due to database error.")]
         public static partial void PayloadUpdateFailed(this ILogger logger, string payloadId);
+
+        [LoggerMessage(EventId = 300006, Level = LogLevel.Error, Message = "Failed to delete payload {payloadId} from storage.")]
+        public static partial void PayloadDeleteFailed(this ILogger logger, string payloadId, Exception ex);
     }
 }

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadApi.feature

@@ -124,3 +124,32 @@ Scenario Outline: Get payload by Id returns 400
     When I send a GET request
     Then I will get a 400 response
     And I will receive the error message Failed to validate id, not a valid guid
+
+@DeletePayloadById
+Scenario Outline: Delete payload by Id returns 400 with invalid payload ID
+    Given I have an endpoint /payload/invalid-payload-id
+    When I send a DELETE request
+    Then I will get a 400 response
+    And I will receive the error message Failed to validate id, not a valid guid
+
+@DeletePayloadById
+Scenario Outline: Delete payload by ID returns 404 when no payload exists
+    Given I have an endpoint /payload/c5c3635b-81dd-44a9-8c3b-71adec7d47c6
+    When I send a DELETE request
+    Then I will get a 404 response
+    And I will receive the error message Payload with ID: c5c3635b-81dd-44a9-8c3b-71adec7d47c6 not found
+
+@DeletePayloadById
+Scenario Outline: Delete payload by ID returns 400 when PayloadDeleted is already InProgress
+    Given I have an endpoint /payload/c5c3635b-81dd-44a9-8c3b-71adec7d47c6
+    And I have a payload saved in mongo Payload_PayloadDeleted_InProgress
+    When I send a DELETE request
+    Then I will get a 400 response
+    And I will receive the error message Deletion of files for payload ID: c5c3635b-81dd-44a9-8c3b-71adec7d47c6 already in progress or already deleted
+
+@DeletePayloadById
+Scenario Outline: Delete payload by ID returns 202
+    Given I have an endpoint /payload/d5c3633b-41de-44a9-8c3a-71adec3d47c1
+    And I have a payload saved in mongo Payload_PayloadDeleted_No
+    When I send a DELETE request
+    Then I will get a 202 response

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs

@@ -305,6 +305,54 @@ public static class PayloadsTestData
                     }
                 }
             },
+            new PayloadTestData()
+            {
+                Name = "Payload_PayloadDeleted_InProgress",
+                Payload = new Payload()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    Timestamp = DateTime.UtcNow,
+                    Bucket = "bucket_1",
+                    CalledAeTitle = "MIG",
+                    CallingAeTitle = "Basic_AE",
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    PayloadId = "c5c3635b-81dd-44a9-8c3b-71adec7d47c6",
+                    Workflows = new List<string> { Guid.NewGuid().ToString() },
+                    FileCount = 50,
+                    PayloadDeleted = PayloadDeleted.InProgress,
+                    PatientDetails = new PatientDetails()
+                    {
+                        PatientDob = new DateTime(1996, 02, 05, 0, 0, 0, kind: DateTimeKind.Utc),
+                        PatientId = Guid.NewGuid().ToString(),
+                        PatientName = "Mike Mcgee",
+                        PatientSex = "male"
+                    }
+                }
+            },
+            new PayloadTestData()
+            {
+                Name = "Payload_PayloadDeleted_No",
+                Payload = new Payload()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    Timestamp = DateTime.UtcNow,
+                    Bucket = "bucket_1",
+                    CalledAeTitle = "MIG",
+                    CallingAeTitle = "Basic_AE",
+                    CorrelationId = Guid.NewGuid().ToString(),
+                    PayloadId = "d5c3633b-41de-44a9-8c3a-71adec3d47c1",
+                    Workflows = new List<string> { Guid.NewGuid().ToString() },
+                    FileCount = 50,
+                    PayloadDeleted = PayloadDeleted.No,
+                    PatientDetails = new PatientDetails()
+                    {
+                        PatientDob = new DateTime(1996, 02, 05, 0, 0, 0, kind: DateTimeKind.Utc),
+                        PatientId = Guid.NewGuid().ToString(),
+                        PatientName = "Mike Mcgee",
+                        PatientSex = "male"
+                    }
+                }
+            }
         };
     }
 }