final adjustments

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Oct 20, 2023 · 5388837 · 5388837
1 parent ee61cf9
commit 5388837
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs
@@ -241,15 +241,17 @@ private async Task HandleCancellationTask(JsonMessage<TaskCancellationEvent> mes
             }
 
             var pluginAssembly = string.Empty;
-            ITaskPlugin? taskRunner = null;
+            ITaskPlugin? taskRunner;
             try
             {
                 var taskExecution = await _taskDispatchEventService.GetByTaskExecutionIdAsync(message.Body.ExecutionId).ConfigureAwait(false);
-                pluginAssembly = _options.Value.TaskManager.PluginAssemblyMappings[taskExecution?.Event.TaskPluginType] ?? string.Empty;
-                var taskExecEvent = taskExecution?.Event;
-                if (taskExecEvent == null)
+
+                var taskExecEvent = taskExecution?.Event ?? throw new InvalidOperationException("Task Event data not found.");
+
+                pluginAssembly = string.Empty;
+                if (_options.Value.TaskManager.PluginAssemblyMappings.ContainsKey(taskExecution?.Event.TaskPluginType))
                 {
-                    throw new InvalidOperationException("Task Event data not found.");
+                    pluginAssembly = _options.Value.TaskManager.PluginAssemblyMappings[taskExecution?.Event.TaskPluginType];
                 }
 
                 taskRunner = typeof(ITaskPlugin).CreateInstance<ITaskPlugin>(serviceProvider: _scope.ServiceProvider, typeString: pluginAssembly, _serviceScopeFactory, taskExecEvent);

diff --git a/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs b/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs
@@ -166,6 +166,7 @@ public async Task AddOrUpdateItemAsync(string workflowInstanceId, string taskId,
 
             var item = new ArtifactReceivedItems()
             {
+                Id = workflowInstanceId + taskId,
                 WorkflowInstanceId = workflowInstanceId,
                 TaskId = taskId,
                 Artifacts = artifacts.ToList()
@@ -175,18 +176,28 @@ public async Task AddOrUpdateItemAsync(string workflowInstanceId, string taskId,
                 .FindAsync(a => a.WorkflowInstanceId == workflowInstanceId && a.TaskId == taskId).ConfigureAwait(false);
             var existing = await result.FirstOrDefaultAsync().ConfigureAwait(false);
 
-            if (existing == null)
+            try
             {
-                await _artifactReceivedItemsCollection.InsertOneAsync(item).ConfigureAwait(false);
+                if (existing == null)
+                {
+                    await _artifactReceivedItemsCollection.InsertOneAsync(item).ConfigureAwait(false);
+                }
+                else
+                {
+                    item.Artifacts = item.Artifacts.Concat(existing.Artifacts).ToList();
+                    var update = Builders<ArtifactReceivedItems>.Update.Set(a => a.Artifacts, item.Artifacts);
+                    await _artifactReceivedItemsCollection
+                        .UpdateOneAsync(a => a.WorkflowInstanceId == workflowInstanceId && a.TaskId == taskId, update)
+                        .ConfigureAwait(false);
+                }
             }
-            else
+            catch (Exception ex)
             {
-                item.Artifacts = item.Artifacts.Concat(existing.Artifacts).ToList();
-                var update = Builders<ArtifactReceivedItems>.Update.Set(a => a.Artifacts, item.Artifacts);
-                await _artifactReceivedItemsCollection
-                    .UpdateOneAsync(a => a.WorkflowInstanceId == workflowInstanceId && a.TaskId == taskId, update)
-                    .ConfigureAwait(false);
+
+                throw;
             }
+
+
         }
     }
 }