fix test proj

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

Author: jackschofield23

src/Monai.Deploy.WorkflowManager.sln

@@ -59,11 +59,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Storage.Tests", "..\tests\UnitTests\Storage.Tests\Monai.Deploy.WorkflowManager.Storage.Tests.csproj", "{722C0D57-49F8-4178-88F0-06E369B797A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests", "..\tests\IntegrationTests\Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests\Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj", "{0325A986-7E8B-4688-B4FA-0680F220BE90}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview", "TaskManager\Plug-ins\AideClinicalReview\Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj", "{013395D4-2091-4AB8-96CB-867C0F982096}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskManager.AideClinicalReview.Tests", "..\tests\UnitTests\TaskManager.AideClinicalReview.Tests\TaskManager.AideClinicalReview.Tests.csproj", "{57D00445-0798-4D86-97D4-1586E1B020BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskManager.AideClinicalReview.Tests", "..\tests\UnitTests\TaskManager.AideClinicalReview.Tests\TaskManager.AideClinicalReview.Tests.csproj", "{57D00445-0798-4D86-97D4-1586E1B020BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests", "..\tests\IntegrationTests\WorkflowExecutor.IntegrationTests\Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj", "{91A0D599-472F-4238-A1A3-07807F9C5F61}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -175,10 +175,6 @@ Global
 		{722C0D57-49F8-4178-88F0-06E369B797A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{722C0D57-49F8-4178-88F0-06E369B797A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{722C0D57-49F8-4178-88F0-06E369B797A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0325A986-7E8B-4688-B4FA-0680F220BE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0325A986-7E8B-4688-B4FA-0680F220BE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0325A986-7E8B-4688-B4FA-0680F220BE90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0325A986-7E8B-4688-B4FA-0680F220BE90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{013395D4-2091-4AB8-96CB-867C0F982096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{013395D4-2091-4AB8-96CB-867C0F982096}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{013395D4-2091-4AB8-96CB-867C0F982096}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -187,6 +183,10 @@ Global
 		{57D00445-0798-4D86-97D4-1586E1B020BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57D00445-0798-4D86-97D4-1586E1B020BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57D00445-0798-4D86-97D4-1586E1B020BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91A0D599-472F-4238-A1A3-07807F9C5F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91A0D599-472F-4238-A1A3-07807F9C5F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91A0D599-472F-4238-A1A3-07807F9C5F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91A0D599-472F-4238-A1A3-07807F9C5F61}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -207,9 +207,9 @@ Global
 		{918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 		{A44F975E-70CA-49D6-8513-78F2D5210EAF} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 		{722C0D57-49F8-4178-88F0-06E369B797A3} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
-		{0325A986-7E8B-4688-B4FA-0680F220BE90} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 		{013395D4-2091-4AB8-96CB-867C0F982096} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1}
 		{57D00445-0798-4D86-97D4-1586E1B020BC} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
+		{91A0D599-472F-4238-A1A3-07807F9C5F61} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC0D56C8-D8CB-45CE-B528-F3DCF86D63ED}

src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs

@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Monai.Deploy.Storage.API;
 using Monai.Deploy.WorkflowManager.Common.Interfaces;
 using Monai.Deploy.WorkflowManager.Common.Services;
 using Monai.Deploy.WorkflowManager.PayloadListener.Services;
@@ -36,12 +35,13 @@ public static IServiceCollection AddWorkflowExecutor(this IServiceCollection ser
             services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
             {
                 var logger = s.GetService<ILogger<ConditionalParameterParser>>();
-                var storage = s.GetService<IStorageService>();
+                var payloadService = s.GetService<IPayloadService>();
+                var workflowService = s.GetService<IWorkflowService>();
                 var dicomStore = s.GetService<IDicomService>();
 
-                return new ConditionalParameterParser(logger, storage, dicomStore);
+                return new ConditionalParameterParser(logger, payloadService, workflowService, dicomStore);
             });
-            
+
             services.AddSingleton<PayloadListenerService>();
             services.AddHostedService(p => p.GetService<PayloadListenerService>());
 

src/WorkflowManager/packages.lock.json

@@ -1454,9 +1454,8 @@
           "Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
           "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
           "Microsoft.Extensions.Options": "6.0.0",
-          "Monai.Deploy.Messaging": "0.1.0-rc0047",
-          "Monai.Deploy.Storage": "0.1.0-rc0060",
-          "Monai.Deploy.Storage.MinIO": "0.1.0-rc0060",
+          "Monai.Deploy.Messaging.RabbitMQ": "0.1.2",
+          "Monai.Deploy.Storage.MinIO": "0.1.0",
           "Monai.Deploy.WorkflowManager.Common": "1.0.0",
           "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
           "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
@@ -1465,19 +1464,17 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "0.1.0-rc0047",
-          "Monai.Deploy.Storage": "0.1.0-rc0060",
-          "Monai.Deploy.Storage.MinIO": "0.1.0-rc0060"
+          "Monai.Deploy.Messaging.RabbitMQ": "0.1.2",
+          "Monai.Deploy.Storage.MinIO": "0.1.0"
         }
       },
       "monai.deploy.workflowmanager.taskmanager.argo": {
         "type": "Project",
         "dependencies": {
           "IdentityModel.OidcClient": "5.0.0",
           "KubernetesClient": "7.2.19",
-          "Monai.Deploy.Messaging": "0.1.0-rc0047",
-          "Monai.Deploy.Storage": "0.1.0-rc0060",
-          "Monai.Deploy.Storage.MinIO": "0.1.0-rc0060",
+          "Monai.Deploy.Messaging.RabbitMQ": "0.1.2",
+          "Monai.Deploy.Storage.MinIO": "0.1.0",
           "Monai.Deploy.WorkflowManager.Common": "1.0.0",
           "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
           "Newtonsoft.Json": "13.0.1"