From f305fec46d6ee82cfde6051d06998afa612c7d26 Mon Sep 17 00:00:00 2001
From: Neil South <neil.south@answerdigital.com>
Date: Thu, 8 Feb 2024 17:00:07 +0000
Subject: [PATCH] more changes for sonar cloud

Signed-off-by: Neil South <neil.south@answerdigital.com>
---
 src/WorkflowManager/Logging/Log.600000.Dicom.cs    |  2 +-
 .../Storage/Services/DicomService.cs               |  2 +-
 .../Services/WorkflowExecuterService.cs            | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/WorkflowManager/Logging/Log.600000.Dicom.cs b/src/WorkflowManager/Logging/Log.600000.Dicom.cs
index a84146f53..67b6e3703 100644
--- a/src/WorkflowManager/Logging/Log.600000.Dicom.cs
+++ b/src/WorkflowManager/Logging/Log.600000.Dicom.cs
@@ -44,7 +44,7 @@ public static partial class Log
         [LoggerMessage(EventId = 600007, Level = LogLevel.Error, Message = "Failed to get DICOM metadata from bucket {bucketId}. Payload: {payloadId}")]
         public static partial void FailedToGetDicomMetadataFromBucket(this ILogger logger, string payloadId, string bucketId, Exception ex);
 
-        [LoggerMessage(EventId = 600000, Level = LogLevel.Error, Message = "Failed to get DICOM tag {dicomTag} from dictionary")]
+        [LoggerMessage(EventId = 600008, Level = LogLevel.Error, Message = "Failed to get DICOM tag {dicomTag} from dictionary")]
         public static partial void FailedToGetDicomTagFromDictoionary(this ILogger logger, string dicomTag, Exception ex);
     }
 }
diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs
index bf46503e0..b94e79a17 100644
--- a/src/WorkflowManager/Storage/Services/DicomService.cs
+++ b/src/WorkflowManager/Storage/Services/DicomService.cs
@@ -167,7 +167,7 @@ public async Task<IEnumerable<string>> GetDicomPathsForTaskAsync(string outputDi
 
             var dicomFiles = files?.Where(f => f.FilePath.EndsWith(".dcm"));
 
-            return dicomFiles?.Select(d => d.FilePath)?.ToList() ?? [];
+            return dicomFiles?.Select(d => d.FilePath) ?? [];
         }
 
         public async Task<string> GetAnyValueAsync(string keyId, string payloadId, string bucketId)
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
index d4e67be83..c392cc67f 100644
--- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
+++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -299,7 +299,7 @@ private async Task ProcessArtifactReceivedOutputs(ArtifactsReceivedEvent message
         private async Task<bool> AllRequiredArtifactsReceivedAsync(ArtifactsReceivedEvent message, WorkflowInstance workflowInstance,
             string taskId, string workflowInstanceId, WorkflowRevision workflowTemplate, IEnumerable<ArtifactType> receivedArtifacts)
         {
-            var taskExecution = workflowInstance.Tasks.FirstOrDefault(t => t.TaskId == taskId);
+            var taskExecution = Array.Find<TaskExecution>([.. workflowInstance.Tasks], t => t.TaskId == taskId);
 
             if (taskExecution is null)
             {
@@ -326,7 +326,8 @@ await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstanceId, task
         private string[] GetTasksWithAllInputs(WorkflowRevision workflowTemplate, string currentTaskId, IEnumerable<ArtifactType> artifactsRecieved)
         {
             var excutableTasks = new List<String>();
-            var task = workflowTemplate.Workflow!.Tasks.FirstOrDefault(t => t.Id == currentTaskId);
+
+            var task = Array.Find<TaskObject>(workflowTemplate.Workflow!.Tasks, t => t.Id == currentTaskId);
             if (task is null)
             {
                 _logger.ErrorFindingTask(currentTaskId);
@@ -354,8 +355,9 @@ private string[] GetTasksWithAllInputs(WorkflowRevision workflowTemplate, string
         private Dictionary<ArtifactType, bool> GetTasksInput(WorkflowRevision workflowTemplate, string taskId, string previousTaskId)
         {
             var results = new Dictionary<ArtifactType, bool>();
-            var task = workflowTemplate.Workflow!.Tasks.FirstOrDefault(t => t.Id == taskId);
-            var previousTask = workflowTemplate.Workflow!.Tasks.FirstOrDefault(t => t.Id == previousTaskId);
+
+            var task = Array.Find<TaskObject>(workflowTemplate.Workflow!.Tasks, t => t.Id == taskId);
+            var previousTask = Array.Find<TaskObject>(workflowTemplate.Workflow!.Tasks, t => t.Id == previousTaskId);
             if (previousTask is null || task is null)
             {
                 _logger.ErrorFindingTask(taskId);
@@ -969,6 +971,8 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(
             string taskId,
             IEnumerable<ArtifactType> receivedArtifacts)
         {
+            _ = workflow ?? throw new ArgumentNullException(nameof(workflow));
+
             var currentTaskDestinations = workflow.Workflow?.Tasks?.SingleOrDefault(t => t.Id == taskId)?.TaskDestinations;
 
             var newTaskExecutions = new List<TaskExecution>();
@@ -981,7 +985,7 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(
             foreach (var taskDest in currentTaskDestinations)
             {
                 // have we got all inputs we need ?
-                var neededInputs = GetTasksInput(workflow, taskDest.Name, taskId).Where(t => t.Value);
+                var neededInputs = GetTasksInput(workflow!, taskDest.Name, taskId).Where(t => t.Value);
                 var remainingManditory = neededInputs.Where(i => receivedArtifacts.Any(a => a == i.Key) is false);
                 if (remainingManditory.Count() is not 0)
                 {