fiup constant and test data

neildsouth · neildsouth · commit a400871d1a54 · 2023-12-21T16:29:12.000Z
Signed-off-by: Neil South &lt;neil.south@answerdigital.com&gt;
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -531,8 +531,8 @@ public async Task<bool> 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
@@ -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
@@ -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[]
                                 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`using Monai.Deploy.Messaging.Common;`
	`18`	`+using Monai.Deploy.WorkflowManager.Common.Contracts.Constants;`
`18`	`19`	`using Monai.Deploy.WorkflowManager.Common.Contracts.Models;`
`19`	`20`	`using Artifact = Monai.Deploy.WorkflowManager.Common.Contracts.Models.Artifact;`
`20`	`21`	`// ReSharper disable ArrangeObjectCreationWhenTypeEvident`
`@@ -2174,7 +2175,7 @@ public static class WorkflowRevisionsTestData`
`2174`	`2175`	`new TaskObject`
`2175`	`2176`	`{`
`2176`	`2177`	`Id = "export_task_1",`
`2177`		`- Type = "Export",`
	`2178`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2178`	`2179`	`Description = "Export Workflow 1 Task 2",`
`2179`	`2180`	`ExportDestinations = new ExportDestination[]`
`2180`	`2181`	`{`
`@@ -2235,7 +2236,7 @@ public static class WorkflowRevisionsTestData`
`2235`	`2236`	`new TaskObject`
`2236`	`2237`	`{`
`2237`	`2238`	`Id = "export_task_1",`
`2238`		`- Type = "Export",`
	`2239`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2239`	`2240`	`Description = "Export Workflow 1 Task 2",`
`2240`	`2241`	`ExportDestinations = new ExportDestination[]`
`2241`	`2242`	`{`
`@@ -2296,7 +2297,7 @@ public static class WorkflowRevisionsTestData`
`2296`	`2297`	`new TaskObject`
`2297`	`2298`	`{`
`2298`	`2299`	`Id = "export_task_1",`
`2299`		`- Type = "Export",`
	`2300`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2300`	`2301`	`Description = "Export Workflow 1 Task 2",`
`2301`	`2302`	`ExportDestinations = new ExportDestination[]`
`2302`	`2303`	`{`
`@@ -2358,7 +2359,7 @@ public static class WorkflowRevisionsTestData`
`2358`	`2359`	`new TaskObject`
`2359`	`2360`	`{`
`2360`	`2361`	`Id = "export_task_1",`
`2361`		`- Type = "Export",`
	`2362`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2362`	`2363`	`Description = "Export Workflow 1 Task 2",`
`2363`	`2364`	`ExportDestinations = new ExportDestination[]`
`2364`	`2365`	`{`
`@@ -2375,7 +2376,7 @@ public static class WorkflowRevisionsTestData`
`2375`	`2376`	`new TaskObject`
`2376`	`2377`	`{`
`2377`	`2378`	`Id = "export_task_2",`
`2378`		`- Type = "Export",`
	`2379`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2379`	`2380`	`Description = "Export Workflow 1 Task 3",`
`2380`	`2381`	`ExportDestinations = new ExportDestination[]`
`2381`	`2382`	`{`
`@@ -2437,7 +2438,7 @@ public static class WorkflowRevisionsTestData`
`2437`	`2438`	`new TaskObject`
`2438`	`2439`	`{`
`2439`	`2440`	`Id = "export_task_1",`
`2440`		`- Type = "Export",`
	`2441`	`+ Type = TaskTypeConstants.DicomExportTask,`
`2441`	`2442`	`Description = "Export Workflow 1 Task 2",`
`2442`	`2443`	`ExportDestinations = new ExportDestination[]`
`2443`	`2444`	`{`