Merge pull request #907 from Project-MONAI/nds-fix-externalAppOutputs

fixing overwriting of workflowInstance

Author: neildsouth

src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -270,6 +270,10 @@ private async Task ProcessArtifactReceivedOutputs(ArtifactsReceivedEvent message
                 }
             }
 
+            var currentTask = workflowInstance.Tasks?.Find(t => t.TaskId == taskId);
+
+            currentTask!.OutputArtifacts = validArtifacts; // added here are the parent function saves the object !
+
             _logger.LogDebug($"adding files to workflowInstance {workflowInstance.Id} :Task {taskId} : {JsonConvert.SerializeObject(validArtifacts)}");
             await _workflowInstanceRepository.UpdateTaskOutputArtifactsAsync(workflowInstance.Id, taskId, validArtifacts);
         }
@@ -682,7 +686,7 @@ private async Task<bool> HandleOutputArtifacts(WorkflowInstance workflowInstance
                 return false;
             }
 
-            var currentTask = workflowInstance.Tasks?.FirstOrDefault(t => t.TaskId == task.TaskId);
+            var currentTask = workflowInstance.Tasks?.Find(t => t.TaskId == task.TaskId);
 
             if (currentTask is not null)
             {

tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs

@@ -3161,6 +3161,7 @@ public async Task ArtifactReceveid_Valid_ReturnesTrue()
 
             Assert.True(result);
         }
+
         [Fact]
         public async Task ProcessArtifactReceived_Calls_WorkflowInstanceRepository_UpdateTaskOutputArtifactsAsync()
         {
@@ -3174,7 +3175,7 @@ public async Task ProcessArtifactReceived_Calls_WorkflowInstanceRepository_Updat
             var workflowInstance = new WorkflowInstance
             {
                 WorkflowId = "789", Tasks = new List<TaskExecution>()
-                { new TaskExecution() { TaskId = "not456" } }
+                { new TaskExecution() { TaskId = "456" } }
             };
             _workflowInstanceRepository.Setup(w => w.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId))!
                 .ReturnsAsync(workflowInstance);