Merge pull request #795 from Project-MONAI/release/0.1.16

Release 0.1.16

Author: woodheadio

src/WorkflowManager/Common/Services/PayloadService.cs

@@ -178,6 +178,13 @@ public async Task<bool> DeletePayloadFromStorageAsync(string payloadId)
                 throw new MonaiBadRequestException($"Deletion of files for payload ID: {payloadId} already in progress or already deleted");
             }
 
+            var workflowInstances = await _workflowInstanceRepository.GetByPayloadIdsAsync(new List<string> { payloadId });
+
+            if (workflowInstances.Any(wf => wf.Status == Status.Created))
+            {
+                throw new MonaiBadRequestException($"Workflows related to payload ID: {payloadId} are currently in progress, deletion cannot be complete.");
+            }
+
             // update the payload to in progress before we request deletion from storage
             payload.PayloadDeleted = PayloadDeleted.InProgress;
             await _payloadRepository.UpdateAsync(payload);

tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs

@@ -330,6 +330,7 @@ public async Task DeletePayloadFromStorageAsync_ReturnsTrue()
 
             _payloadRepository.Setup(p => p.GetByIdAsync(It.IsAny<string>())).ReturnsAsync(() => new Payload());
             _payloadRepository.Setup(p => p.UpdateAsync(It.IsAny<Payload>())).ReturnsAsync(() => true);
+            _workflowInstanceRepository.Setup(r => r.GetByPayloadIdsAsync(It.IsAny<List<string>>())).ReturnsAsync(() => new List<WorkflowInstance>());
 
             _storageService.Setup(s => s.RemoveObjectsAsync(It.IsAny<string>(), It.IsAny<IEnumerable<string>>(), default));
 
@@ -351,7 +352,7 @@ public async Task DeletePayloadFromStorageAsync_ThrowsMonaiNotFoundException()
         }
 
         [Fact]
-        public async Task DeletePayloadFromStorageAsync_ThrowsMonaiBadRequestException()
+        public async Task DeletePayloadFromStorageAsync_ThrowsMonaiBadRequestExceptionWhenDeletionAlreadyInProgress()
         {
             var payloadId = Guid.NewGuid().ToString();
 
@@ -362,5 +363,23 @@ public async Task DeletePayloadFromStorageAsync_ThrowsMonaiBadRequestException()
 
             await Assert.ThrowsAsync<MonaiBadRequestException>(async () => await PayloadService.DeletePayloadFromStorageAsync(payloadId));
         }
+
+        [Fact]
+        public async Task DeletePayloadFromStorageAsync_ThrowsMonaiBadRequestExceptionWhenWorkflowInstancesInProgress()
+        {
+            var payloadId = Guid.NewGuid().ToString();
+
+            _payloadRepository.Setup(p => p.GetByIdAsync(It.IsAny<string>())).ReturnsAsync(() => new Payload());
+            _payloadRepository.Setup(p => p.UpdateAsync(It.IsAny<Payload>())).ReturnsAsync(() => true);
+            _workflowInstanceRepository.Setup(r => r.GetByPayloadIdsAsync(It.IsAny<List<string>>())).ReturnsAsync(() => new List<WorkflowInstance>
+            {
+                new WorkflowInstance
+                {
+                    Status = Status.Created,
+                }
+            });
+
+            await Assert.ThrowsAsync<MonaiBadRequestException>(async () => await PayloadService.DeletePayloadFromStorageAsync(payloadId));
+        }
     }
 }