add payloadid to task dispatch

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

Author: jackschofield23

src/WorkflowExecuter/Common/EventMapper.cs

@@ -10,11 +10,12 @@ namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common
 {
     public static class EventMapper
     {
-        public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string workflowId, string correlationId, StorageServiceConfiguration configuration)
+        public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string workflowInstanceId, string correlationId, string payloadId, StorageServiceConfiguration configuration)
         {
             Guard.Against.Null(task, nameof(task));
-            Guard.Against.Null(workflowId, nameof(workflowId));
-            Guard.Against.Null(correlationId, nameof(correlationId));
+            Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
+            Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));
+            Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
             Guard.Against.Null(configuration, nameof(configuration));
 
             var inputs = new List<Messaging.Common.Storage>();
@@ -36,7 +37,7 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string w
 
             return new TaskDispatchEvent
             {
-                WorkflowInstanceId = workflowId,
+                WorkflowInstanceId = workflowInstanceId,
                 TaskId = task.TaskId,
                 ExecutionId = task.ExecutionId.ToString(),
                 CorrelationId = correlationId,
@@ -45,6 +46,7 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string w
                 Inputs = inputs,
                 TaskPluginType = task.TaskType,
                 Metadata = task.Metadata,
+                PayloadId = payloadId,
                 IntermediateStorage = new Messaging.Common.Storage
                 {
                     Bucket = configuration.Settings["bucket"],

src/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -439,7 +439,7 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(WorkflowInstance
 
         private async Task<bool> DispatchTask(WorkflowInstance workflowInstance, TaskExecution taskExec, string correlationId)
         {
-            var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance.Id, correlationId, _storageConfiguration);
+            var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance.Id, correlationId, workflowInstance.PayloadId, _storageConfiguration);
             var jsonMesssage = new JsonMessage<TaskDispatchEvent>(taskDispatchEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, taskDispatchEvent.CorrelationId, Guid.NewGuid().ToString());
 
             await _messageBrokerPublisherService.Publish(TaskDispatchRoutingKey, jsonMesssage.ToMessage());

tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs

@@ -47,12 +47,14 @@ public void ToTaskDispatchEvent_ValidAeTitleWorkflowRequest_ReturnsTaskDispatch(
 
             var workflowId = Guid.NewGuid().ToString();
             var correlationId = Guid.NewGuid().ToString();
+            var payloadId = Guid.NewGuid().ToString();
 
             var expectedTask = new TaskDispatchEvent
             {
                 WorkflowInstanceId = workflowId,
                 TaskId = task.TaskId,
                 ExecutionId = task.ExecutionId.ToString(),
+                PayloadId = payloadId,
                 CorrelationId = correlationId,
                 Status = TaskExecutionStatus.Created,
                 TaskPluginType = task.TaskType,
@@ -82,7 +84,7 @@ public void ToTaskDispatchEvent_ValidAeTitleWorkflowRequest_ReturnsTaskDispatch(
                 }
             };
 
-            var taskDispatch = EventMapper.ToTaskDispatchEvent(task, workflowId, correlationId, configuration);
+            var taskDispatch = EventMapper.ToTaskDispatchEvent(task, workflowId, correlationId, payloadId, configuration);
 
             taskDispatch.Should().BeEquivalentTo(expectedTask, options =>
                 options.Excluding(t => t.CorrelationId));