diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 2dc65f55e..dfd7c670f 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -553,22 +553,22 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "MongoDB.Bson": "[2.17.1, )" + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "MongoDB.Bson": "2.17.1" } } } diff --git a/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs index 13da12ee8..5223f66ab 100644 --- a/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs @@ -50,7 +50,7 @@ public interface IWorkflowRepository /// Retrieves a list of workflows based on an aeTitle. /// /// An aeTitle to retrieve workflows for. - Task> GetWorkflowsByAeTitleAsync(string aeTitle); + Task> GetWorkflowsByAeTitleAsync(List aeTitles); /// /// Creates a workflow object. diff --git a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs index 1bf572aee..2e230e56c 100644 --- a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs +++ b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs @@ -111,19 +111,28 @@ public async Task GetByAeTitleAsync(string aeTitle) return workflow; } - public async Task> GetWorkflowsByAeTitleAsync(string aeTitle) + public async Task> GetWorkflowsByAeTitleAsync(List aeTitles) { - Guard.Against.NullOrWhiteSpace(aeTitle, nameof(aeTitle)); + Guard.Against.NullOrEmpty(aeTitles, nameof(aeTitles)); var workflows = new List(); - workflows = await _workflowCollection - .Find(x => x.Workflow.InformaticsGateway.AeTitle == aeTitle && x.Deleted == null) - .Sort(Builders.Sort.Descending("Revision")) - .ToListAsync(); + foreach (var aeTitle in aeTitles) + { + var wfs = await _workflowCollection + .Find(x => x.Workflow.InformaticsGateway.AeTitle == aeTitle && x.Deleted == null) + .ToListAsync(); + + workflows.AddRange(wfs); + } #pragma warning restore CS8602 // Dereference of a possibly null reference. - workflows = workflows.GroupBy(w => w.WorkflowId).Select(g => g.First()).ToList(); + workflows = workflows + .Distinct() + .OrderByDescending(w => w.Revision) + .GroupBy(w => w.WorkflowId) + .Select(g => g.First()) + .ToList(); return workflows; } diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index b644e562b..e42d09328 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -823,19 +823,19 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } } } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 0ac6abeef..f9c8dde72 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -757,11 +757,11 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } } } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index ec77ee866..42c128ca5 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -897,90 +897,90 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" } } } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 0ed395c1d..0097304cf 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -780,19 +780,19 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } } } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 9c28f5ac5..87d0fef43 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -94,9 +94,20 @@ public async Task ProcessPayload(WorkflowRequestEvent message, Payload pay var processed = true; var workflows = new List(); - workflows = message.Workflows?.Any() != true ? - await _workflowRepository.GetWorkflowsByAeTitleAsync(message.CalledAeTitle) as List : - await _workflowRepository.GetByWorkflowsIdsAsync(message.Workflows) as List; + if (message.Workflows?.Any() == true) + { + workflows = await _workflowRepository.GetByWorkflowsIdsAsync(message.Workflows) as List; + } + else + { + var aeTitles = new List + { + message.CalledAeTitle, + message.CallingAeTitle + }; + + workflows = await _workflowRepository.GetWorkflowsByAeTitleAsync(aeTitles) as List; + } if (workflows is null || workflows.Any() is false) { diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index dfa8a3006..b5a179f43 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -899,73 +899,73 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } } } diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index b31627210..27ce536c0 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -1664,119 +1664,119 @@ "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", + "Monai.Deploy.WorkflowManager.Common": "1.0.0" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Microsoft.Extensions.Hosting": "6.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" } } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature index 228b1b052..f3ac8946c 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature @@ -27,6 +27,7 @@ Scenario Outline: Publish a valid workflow request which creates a single workfl | workflow | workflowRequestMessage | | Basic_Workflow_1 | Basic_AeTitle_WF_Request | | Basic_Workflow_1 | Basic_Id_WF_Request | + | Basic_Workflow_3 | Basic_AeTitle_WF_Request | @WorkflowRequest Scenario Outline: Publish a valid workflow request which creates multiple workflow instances @@ -36,9 +37,10 @@ Scenario Outline: Publish a valid workflow request which creates multiple workfl Then I can see 2 Workflow Instances are created And 2 Task Dispatch events are published Examples: - | workflow_1 | workflow_2 | workflowRequestMessage | - | Same_AeTitle_1 | Same_AeTitle_2 | Same_AeTitle | - | Basic_Workflow_1 | Basic_Workflow_2 | Basic_Multi_Id_WF_Request | + | workflow_1 | workflow_2 | workflowRequestMessage | + | Same_AeTitle_1 | Same_AeTitle_2 | Same_AeTitle | + | Basic_Workflow_1 | Basic_Workflow_2 | Basic_Multi_Id_WF_Request | + | Basic_Workflow_1 | Basic_Workflow_3 | Basic_AeTitle_WF_Request | @WorkflowRequest Scenario: Publish a valid workflow request with mismatched AE title and workflow ID @@ -71,9 +73,10 @@ Scenario: Publish an invalid workflow request which does not create a workflow i | Missing_CorrelationID_Invalid_WF_Request | | Missing_CallingAETitle_Invalid_WF_Request | | Missing_CalledAETitle_Invalid_WF_Request | + | No_Matching_AE_Title | @WorkflowRequest -Scenario: Publish a valid workflow request with an exiting Workflow Instance with a Task which is not dispatched +Scenario: Publish a valid workflow request with an existing Workflow Instance with a Task which is not dispatched Given I have a clinical workflow Multi_Request_Workflow_Created And I have a Workflow Instance Existing_WFI_Created with no artifacts When I publish a Workflow Request Message Multi_WF_Created with no artifacts @@ -81,7 +84,7 @@ Scenario: Publish a valid workflow request with an exiting Workflow Instance wit And 1 Task Dispatch event is published @WorkflowRequest -Scenario: Publish a valid workflow request with an exiting Workflow Instance with a Task which is dispatched +Scenario: Publish a valid workflow request with an existing Workflow Instance with a Task which is dispatched Given I have a clinical workflow Multi_Request_Workflow_Dispatched And I have a Workflow Instance Existing_WFI_Dispatched with no artifacts When I publish a Workflow Request Message Multi_WF_Dispatched with no artifacts @@ -91,7 +94,7 @@ Scenario: Publish a valid workflow request with an exiting Workflow Instance wit @DeleteWorkflows Scenario: Delete a workflow with 1 revision and the workflow cannot trigger any new workflow instances Given I have a clinical workflow Basic_Workflow_1_Deleted - And I publish a Workflow Request Message Static_AeTitle_WF_Request with artifacts full_patient_metadata in minio + And I publish a Workflow Request Message No_Matching_AE_Title with artifacts full_patient_metadata in minio Then No workflow instances will be created @DeleteWorkflows diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs index f72406cc6..159918fa4 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs @@ -40,7 +40,7 @@ public static class WorkflowRequestsTestData CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, CalledAeTitle = "Basic_AE", - CallingAeTitle = "MWM", + CallingAeTitle = "Basic_AE_3", } }, new WorkflowRequestTestData @@ -50,7 +50,6 @@ public static class WorkflowRequestsTestData { Bucket = "bucket1", PayloadId = Guid.NewGuid(), - Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, @@ -83,7 +82,7 @@ public static class WorkflowRequestsTestData CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + CallingAeTitle = "Basic_AE", } }, new WorkflowRequestTestData @@ -216,8 +215,8 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, - CalledAeTitle = "Multi_Dispatch", - CallingAeTitle = "MWM", + CalledAeTitle = "MWM", + CallingAeTitle = "Multi_Dispatch", } }, new WorkflowRequestTestData @@ -244,8 +243,8 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, - CalledAeTitle = "Basic_AE", - CallingAeTitle = "MWM", + CalledAeTitle = "MWM", + CallingAeTitle = "Basic_AE", } }, new WorkflowRequestTestData @@ -320,16 +319,16 @@ public static class WorkflowRequestsTestData }, new WorkflowRequestTestData { - Name = "Static_AeTitle_WF_Request", + Name = "No_Matching_AE_Title", WorkflowRequestMessage = new WorkflowRequestMessage { Bucket = "bucket1", - PayloadId = new Guid("23b96697-0174-465c-b9cb-368b20a4591d"), + PayloadId = Guid.NewGuid(), Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.Now, - CalledAeTitle = "Static_AE", - CallingAeTitle = "Static_AE", + CalledAeTitle = "Non_Existent_Called_AE", + CallingAeTitle = "Non_Existent_Calling_AE", } }, }; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index 4bcfee479..d866dbda4 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -133,7 +133,7 @@ public async Task ProcessPayload_ValidAeTitleWorkflowRequest_ReturnesTrue() } }; - _workflowRepository.Setup(w => w.GetWorkflowsByAeTitleAsync(workflowRequest.CalledAeTitle)).ReturnsAsync(workflows); + _workflowRepository.Setup(w => w.GetWorkflowsByAeTitleAsync(It.IsAny>())).ReturnsAsync(workflows); _workflowRepository.Setup(w => w.GetByWorkflowIdAsync(workflows[0].WorkflowId)).ReturnsAsync(workflows[0]); _workflowInstanceRepository.Setup(w => w.CreateAsync(It.IsAny>())).ReturnsAsync(true); _workflowInstanceRepository.Setup(w => w.GetByWorkflowsIdsAsync(It.IsAny>())).ReturnsAsync(new List()); diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 881b9a627..5d78c30cb 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -1697,147 +1697,147 @@ "monai.deploy.workflowmanager": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", - "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", - "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "[5.0.0, )", - "Microsoft.EntityFrameworkCore": "[6.0.8, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Logging.Console": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage.MinIO": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Authentication": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )", - "Swashbuckle.AspNetCore": "[6.4.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "6.0.8", + "Microsoft.AspNetCore.Mvc.Versioning": "5.0.0", + "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "5.0.0", + "Microsoft.EntityFrameworkCore": "6.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Hosting": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.6-rc0001", + "Monai.Deploy.Storage.MinIO": "0.2.5", + "Monai.Deploy.WorkflowManager.Authentication": "1.0.0", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "1.0.0", + "Monai.Deploy.WorkflowManager.PayloadListener": "1.0.0", + "Newtonsoft.Json": "13.0.1", + "Swashbuckle.AspNetCore": "6.4.0" } }, "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", + "Monai.Deploy.WorkflowManager.Common": "1.0.0" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Microsoft.Extensions.Hosting": "6.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", - "Monai.Deploy.Storage": "[0.2.5, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.193", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.6-rc0001", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" } } }