misc fixes

Signed-off-by: Jack Schofield <[email protected]>

Author: jackschofield23

src/Contracts/Models/TaskExecution.cs

@@ -28,9 +28,15 @@ public class TaskExecution
         [JsonProperty(PropertyName = "task_id")]
         public string TaskId { get; set; }
 
+        [JsonProperty(PropertyName = "previous_task_id")]
+        public string PreviousTaskId { get; set; }
+
         [JsonProperty(PropertyName = "status")]
         public TaskExecutionStatus Status { get; set; }
 
+        [JsonProperty(PropertyName = "reason")]
+        public FailureReason Reason { get; set; }
+
         [JsonProperty(PropertyName = "input_artifacts")]
         public Dictionary<string, string> InputArtifacts { get; set; }
 

src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs

@@ -42,13 +42,8 @@ public class Keys
         /// </summary>
         public static readonly IReadOnlyList<string> RequiredParameters =
             new List<string> {
-                PatientId,
-                PatientName,
-                PatientSex,
-                PatientDob,
                 QueueName,
-                WorkflowName,
-                ReviewedTaskDetails
+                WorkflowName
             };
     }
 }

src/TaskManager/TaskManager.cs

@@ -166,6 +166,8 @@ private async Task HandleTaskCallback(JsonMessage<TaskCallbackEvent> message)
                 var executionStatus = await runner.Runner.GetStatus(message.Body.Identity, _cancellationTokenSource.Token).ConfigureAwait(false);
                 updateMessage = GenerateUpdateEventMessage(message, message.Body.ExecutionId, message.Body.WorkflowInstanceId, message.Body.TaskId, executionStatus);
                 updateMessage.Body.Metadata.Add(Strings.JobIdentity, message.Body.Identity);
+                foreach (var item in message.Body.Metadata)
+                    updateMessage.Body.Metadata.Add(item.Key, item.Value);
             }
             catch (Exception ex)
             {

src/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -176,9 +176,11 @@ public async Task<bool> ProcessTaskUpdate(TaskUpdateEvent message)
                 return false;
             }
 
-            if (message.ExecutionStats is not null)
+            if (message.ExecutionStats is not null
+                || message.Reason != FailureReason.None)
             {
                 currentTask.ExecutionStats = message.ExecutionStats;
+                currentTask.Reason = message.Reason;
                 await _workflowInstanceRepository.UpdateTaskAsync(workflowInstance.Id, currentTask.TaskId, currentTask);
             }
 
@@ -414,7 +416,7 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(WorkflowInstance
                     continue;
                 }
 
-                newTaskExecutions.Add(await CreateTaskExecutionAsync(newTask, workflowInstance));
+                newTaskExecutions.Add(await CreateTaskExecutionAsync(newTask, workflowInstance, null, null, taskId));
             }
 
             return newTaskExecutions;
@@ -491,7 +493,8 @@ private async Task<WorkflowInstance> CreateWorkflowInstanceAsync(WorkflowRequest
         private async Task<TaskExecution> CreateTaskExecutionAsync(TaskObject task,
                                                   WorkflowInstance workflowInstance,
                                                   string? bucketName = null,
-                                                  string? payloadId = null)
+                                                  string? payloadId = null,
+                                                  string? previousTaskId = null)
         {
             Guard.Against.Null(workflowInstance, nameof(workflowInstance));
 
@@ -527,7 +530,8 @@ private async Task<TaskExecution> CreateTaskExecutionAsync(TaskObject task,
                 InputArtifacts = await _artifactMapper.ConvertArtifactVariablesToPath(task?.Artifacts?.Input ?? new Artifact[] { }, payloadId, workflowInstanceId, bucketName),
                 OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/",
                 Metadata = { },
-                InputParameters = newInputParameters
+                InputParameters = newInputParameters,
+                PreviousTaskId = previousTaskId
             };
         }