Merge branch 'develop' into AC-2253

Author: lillie-dae

src/TaskManager/Plug-ins/Email/EmailPlugin.cs

@@ -126,8 +126,10 @@ public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancel
                 var metadata = new Dictionary<string, string>();
                 if (Event.Inputs.Any())
                 {
-                    // only process the first input for now
-                    metadata = await GetRawMetaFromFile($"{Event.Inputs.First().RelativeRootPath}/{Event.Inputs.First().Name}", Event.Inputs.First().Bucket);
+                    foreach (var input in Event.Inputs)
+                    {
+                        metadata = await AddRawMetaFromFile(metadata, $"{input.RelativeRootPath}", input.Bucket);
+                    }
                 }
 
                 var emailRequest = GenerateEmailRequestEventMessage(metadata);
@@ -143,39 +145,53 @@ public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancel
             }
         }
 
-        private async Task<Dictionary<string, string>?> GetRawMetaFromFile(string path, string bucketName)
+        private async Task<Dictionary<string, string>> AddRawMetaFromFile(Dictionary<string, string> metadata, string path, string bucketName)
         {
             if (_includeMetadata is null || _includeMetadata.Count() == 0)
             {
                 _logger.NoMetaDataRequested();
-                return null;
+                return metadata;
             }
-            // load file from Minio !
-            Guard.Against.NullOrWhiteSpace(bucketName);
-            Guard.Against.NullOrWhiteSpace(path);
 
-            var fileStream = await _storageService.GetObjectAsync(bucketName, path);
-            var dcmFile = DicomFile.Open(fileStream);
-
-            var output = new Dictionary<string, string>();
-            foreach (var item in _includeMetadata)
+            var allFiles = await _storageService.ListObjectsAsync(bucketName, path, true);
+            foreach (var file in allFiles)
             {
-                DicomTag tag;
+                if (file.FilePath.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase)) continue;
+                Guard.Against.NullOrWhiteSpace(bucketName);
+                Guard.Against.NullOrWhiteSpace(path);
+
+                // load file from Minio !
+                var fileStream = await _storageService.GetObjectAsync(bucketName, $"{file.FilePath}");
                 try
                 {
-                    tag = DicomDictionary.Default[item];
-                }
-                catch (Exception)
-                {
-                    tag = DicomTag.Parse(item);
+                    var dcmFile = DicomFile.Open(fileStream);
+
+                    foreach (var item in _includeMetadata)
+                    {
+                        if (metadata.ContainsKey(item)) continue;
+
+                        DicomTag tag;
+                        try
+                        {
+                            tag = DicomDictionary.Default[item];
+                        }
+                        catch (Exception)
+                        {
+                            tag = DicomTag.Parse(item);
+                        }
+                        if (tag is not null)
+                        {
+                            metadata.Add(item, dcmFile.Dataset.GetString(tag));
+                        }
+                    }
                 }
-                if (tag is not null)
+                catch (Exception ex)
                 {
-                    output.Add(item, dcmFile.Dataset.GetString(tag));
+                    _logger?.ErrorGettingMetaData($"{file.FilePath}/{file.Filename}", ex.Message);
                 }
             }
 
-            return output;
+            return metadata;
         }
 
         private JsonMessage<EmailRequestEvent> GenerateEmailRequestEventMessage(Dictionary<string, string>? metadata)

src/TaskManager/Plug-ins/Email/Log.cs

@@ -39,5 +39,8 @@ public static partial class Log
 
         [LoggerMessage(EventId = 6, Level = LogLevel.Debug, Message = "No Metadata requested in event")]
         public static partial void NoMetaDataRequested(this ILogger logger);
+
+        [LoggerMessage(EventId = 7, Level = LogLevel.Debug, Message = "Error Getting Metadata requested for file: {fileName} message:{message} ")]
+        public static partial void ErrorGettingMetaData(this ILogger logger, string fileName, string message);
     }
 }

src/WorkflowManager/Common/Services/WorkflowService.cs

@@ -54,11 +54,6 @@ public async Task<string> CreateAsync(Workflow workflow)
         {
             Guard.Against.Null(workflow);
 
-            foreach (var task in workflow.Tasks)
-            {
-                task.Args["workflow_name"] = workflow.Name;
-            }
-
             var id = await _workflowRepository.CreateAsync(workflow);
             _logger.WorkflowCreated(id, workflow.Name);
             return id;
@@ -76,14 +71,6 @@ public async Task<string> CreateAsync(Workflow workflow)
                 return null;
             }
 
-            if (isUpdateToWorkflowName)
-            {
-                foreach (var task in workflow.Tasks)
-                {
-                    task.Args["workflow_name"] = workflow.Name;
-                }
-            }
-
             var result = await _workflowRepository.UpdateAsync(workflow, existingWorkflow);
             _logger.WorkflowUpdated(id, workflow.Name);
             return result;

src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -743,6 +743,7 @@ private async Task<bool> DispatchTask(WorkflowInstance workflowInstance, Workflo
                     AttachPatientMetaData(taskExec, payload.PatientDetails);
                 }
 
+                taskExec.TaskPluginArguments["workflow_name"] = workflow!.Workflow!.Name;
                 _logger.LogGeneralTaskDispatchInformation(workflowInstance.PayloadId, taskExec.TaskId, workflowInstance.Id, workflow?.Id, JsonConvert.SerializeObject(pathOutputArtifacts));
                 var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance, pathOutputArtifacts, correlationId, _storageConfiguration);
                 var jsonMesssage = new JsonMessage<TaskDispatchEvent>(taskDispatchEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, taskDispatchEvent.CorrelationId, Guid.NewGuid().ToString());