diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 9dada9849..ed77f6c26 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -531,8 +531,8 @@ public async Task ProcessExportComplete(ExportCompleteEvent message, strin switch (task.TaskType) { - case ValidationConstants.ExportTaskType: - case ValidationConstants.HL7ExportTask: + case TaskTypeConstants.DicomExportTask: + case TaskTypeConstants.HL7ExportTask: return await HandleTaskDestinations(workflowInstance, workflow, task, correlationId); default: break; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs index 3fbe55c9f..3053b7985 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs @@ -15,6 +15,7 @@ */ using Monai.Deploy.Messaging.Events; +using Monai.Deploy.WorkflowManager.Common.Contracts.Constants; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Monai.Deploy.WorkflowManager.Common.IntegrationTests.POCO; #pragma warning disable CS8602 // Dereference of a possibly null reference. @@ -209,7 +210,7 @@ public static WorkflowInstance CreateWorkflowInstance(string workflowName) ExecutionId = Guid.NewGuid().ToString(), TaskId = "7d7c8b83-6628-413c-9912-a89314e5e2d5", OutputDirectory = "payloadId/workflows/workflowInstanceId/executionId/", - TaskType = "Export", + TaskType = TaskTypeConstants.DicomExportTask, Status = TaskExecutionStatus.Dispatched } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs index 7b0749d07..875718423 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs @@ -15,6 +15,7 @@ */ using Monai.Deploy.Messaging.Common; +using Monai.Deploy.WorkflowManager.Common.Contracts.Constants; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Artifact = Monai.Deploy.WorkflowManager.Common.Contracts.Models.Artifact; // ReSharper disable ArrangeObjectCreationWhenTypeEvident @@ -2174,7 +2175,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_1", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 2", ExportDestinations = new ExportDestination[] { @@ -2235,7 +2236,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_1", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 2", ExportDestinations = new ExportDestination[] { @@ -2296,7 +2297,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_1", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 2", ExportDestinations = new ExportDestination[] { @@ -2358,7 +2359,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_1", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 2", ExportDestinations = new ExportDestination[] { @@ -2375,7 +2376,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_2", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 3", ExportDestinations = new ExportDestination[] { @@ -2437,7 +2438,7 @@ public static class WorkflowRevisionsTestData new TaskObject { Id = "export_task_1", - Type = "Export", + Type = TaskTypeConstants.DicomExportTask, Description = "Export Workflow 1 Task 2", ExportDestinations = new ExportDestination[] {