diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 027801285..ab8029e95 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -2364,22 +2364,24 @@ :when: 2022-10-21 05:32:02.785856125 Z - - :approve - Monai.Deploy.Messaging - - :who: samrooke + - :who: neildsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - 0.1.21 - 0.1.23 - 0.1.25 - :when: 2022-12-15 21:43:10.781625468 Z + - 1.0.0 + :when: 2023-29-08 21:43:10.781625468 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - - :who: samrooke + - :who: neildsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - 0.1.21 - 0.1.23 - 0.1.25 - :when: 2022-12-15 21:43:20.975488411 Z + - 1.0.0 + :when: 2023-29-08 21:43:20.975488411 Z - - :approve - Monai.Deploy.Storage - :who: neildsouth diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index a1d8eb30a..274efb480 100644 --- a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj +++ b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json index a829c0d1e..959a37076 100644 --- a/src/Common/Configuration/packages.lock.json +++ b/src/Common/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", diff --git a/src/Common/Miscellaneous/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json index 02fb527c5..53f4d5126 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -133,8 +133,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -205,10 +205,10 @@ "resolved": "6.0.0", "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } } diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 12a72ddc1..4d4309a42 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 7b741d850..6ff7fd3ac 100755 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index a3d2ad102..4596d1753 100755 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -247,8 +247,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -678,7 +678,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index f2c9f58dd..b83cfbc24 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -249,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -700,14 +700,14 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -719,7 +719,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 9e57e4d5a..1fc92b79e 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -527,8 +527,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1180,14 +1180,14 @@ "resolved": "13.0.1", "contentHash": "E1e/xFXB+Cbn7pLVlr+8E3nemEitIReVgmAMMMveADvZvXGuSGHP+1Cg6oA+SUfwXHfaXLQn4STCaPKtdIJkWA==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1199,7 +1199,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index fd9ead51b..e196d84ff 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -62,9 +62,9 @@ - + - + diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 2fc1b6ac7..104933168 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -74,9 +74,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -86,11 +86,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1589,14 +1589,14 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1616,7 +1616,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index 53bd57f08..68b990b0a 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -82,8 +82,7 @@ public PayloadService( FileCount = eventPayload.FileCount, CorrelationId = eventPayload.CorrelationId, Bucket = eventPayload.Bucket, - CalledAeTitle = eventPayload.CalledAeTitle, - CallingAeTitle = eventPayload.CallingAeTitle, + DataTrigger = eventPayload.DataTrigger, Timestamp = eventPayload.Timestamp, PatientDetails = patientDetails, PayloadDeleted = PayloadDeleted.No diff --git a/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs b/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs new file mode 100644 index 000000000..ea2f482c0 --- /dev/null +++ b/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs @@ -0,0 +1,52 @@ +// +// Copyright 2023 Guy’s and St Thomas’ NHS Foundation Trust +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using Monai.Deploy.Messaging.Events; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Mongo.Migration.Migrations.Document; +using MongoDB.Bson; +using MongoDB.Bson.Serialization; + +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations +{ + public class M003_Payload_addDataTrigger : DocumentMigration + { + public M003_Payload_addDataTrigger() : base("1.0.3") { } + + public override void Up(BsonDocument document) + { + var calling = document.GetValue("CallingAeTitle").AsString; + var called = document.GetValue("CalledAeTitle").AsString; + document.Remove("CallingAeTitle"); + document.Remove("CalledAeTitle"); + var trigger = new DataOrigin { DataService = DataService.DIMSE, Source = calling, Destination = called }; + document.Add("DataTrigger", trigger.ToJson(), true); + } + + public override void Down(BsonDocument document) + { + try + { + var trigger = BsonSerializer.Deserialize(document.GetValue("DataTrigger").ToBson()); + document.Remove("DataTrigger"); + document.Add("CallingAeTitle", trigger.Source); + document.Add("CalledAeTitle", trigger.Destination); + } + catch + { // can ignore we dont want failures stopping startup ! + } + } + } +} diff --git a/src/WorkflowManager/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs index c46dbd222..4164ed9a3 100755 --- a/src/WorkflowManager/Contracts/Models/Payload.cs +++ b/src/WorkflowManager/Contracts/Models/Payload.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using Monai.Deploy.Messaging.Common; +using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Mongo.Migration.Documents; using Mongo.Migration.Documents.Attributes; @@ -26,11 +27,11 @@ namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { - [CollectionLocation("Payloads"), RuntimeVersion("1.0.1")] + [CollectionLocation("Payloads"), RuntimeVersion("1.0.3")] public class Payload : IDocument { [JsonConverter(typeof(DocumentVersionConvert)), BsonSerializer(typeof(DocumentVersionConverBson))] - public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 1); + public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 3); [JsonProperty(PropertyName = "id")] public string Id { get; set; } = string.Empty; @@ -53,12 +54,6 @@ public class Payload : IDocument [JsonProperty(PropertyName = "bucket")] public string Bucket { get; set; } = string.Empty; - [JsonProperty(PropertyName = "calling_aetitle")] - public string CallingAeTitle { get; set; } = string.Empty; - - [JsonProperty(PropertyName = "called_aetitle")] - public string CalledAeTitle { get; set; } = string.Empty; - [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } @@ -70,6 +65,8 @@ public class Payload : IDocument [JsonProperty(PropertyName = "patient_details")] public PatientDetails PatientDetails { get; set; } = new PatientDetails(); + + public DataOrigin DataTrigger { get; set; } = new DataOrigin { DataService = DataService.DIMSE }; } public enum PayloadDeleted diff --git a/src/WorkflowManager/Contracts/Models/PayloadDto.cs b/src/WorkflowManager/Contracts/Models/PayloadDto.cs index 5988e9fa2..0f7ca2733 100644 --- a/src/WorkflowManager/Contracts/Models/PayloadDto.cs +++ b/src/WorkflowManager/Contracts/Models/PayloadDto.cs @@ -31,8 +31,7 @@ public PayloadDto(Payload payload) FileCount = payload.FileCount; CorrelationId = payload.CorrelationId; Bucket = payload.Bucket; - CallingAeTitle = payload.CallingAeTitle; - CalledAeTitle = payload.CalledAeTitle; + DataTrigger = payload.DataTrigger; Timestamp = payload.Timestamp; Files = payload.Files; PatientDetails = payload.PatientDetails; diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index a44456706..a235082ed 100644 --- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 0d40b9c17..d37568330 100755 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -269,8 +269,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -679,7 +679,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 95b73263e..3dc0373e1 100755 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -210,8 +210,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -635,7 +635,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json index d5185dcdb..bf40ee3d4 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json @@ -713,11 +713,11 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, - "monai.deploy.workflowmanager.common.configuration": { + "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Storage": "[0.2.15, )" } }, "monai.deploy.workflowmanager.contracts": { diff --git a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs index 0e1ba99ab..a0a2b29a6 100644 --- a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs +++ b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs @@ -30,8 +30,8 @@ public static bool IsValid(this WorkflowRequestEvent workflowRequestMessage, out var valid = true; - valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CallingAeTitle, validationErrors); - valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CalledAeTitle, validationErrors); + valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.DataTrigger.Source, validationErrors); + valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.DataTrigger.Destination, validationErrors); valid &= IsBucketValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.Bucket, validationErrors); valid &= IsCorrelationIdValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CorrelationId, validationErrors); valid &= IsPayloadIdValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.PayloadId.ToString(), validationErrors); diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 39bd70d80..08522a2d7 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -261,8 +261,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -738,14 +738,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -754,14 +762,6 @@ "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.common": { - "type": "Project", - "dependencies": { - "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": { @@ -774,7 +774,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -805,9 +805,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index 95972abad..abbd3085f 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -246,8 +246,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -705,13 +705,6 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { - "type": "Project", - "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Storage": "[0.2.18, )" - } - }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { @@ -720,10 +713,17 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, + "monai.deploy.workflowmanager.common.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Storage": "[0.2.18, )" + } + }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 19d41bf81..e898b1551 100755 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -235,8 +235,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -669,7 +669,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 3be6d0a6c..78f290ea5 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -135,7 +135,7 @@ public async Task ProcessPayload(WorkflowRequestEvent message, Payload pay } else { - var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.CalledAeTitle, message.CallingAeTitle); + var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.DataTrigger.Destination, message.DataTrigger.Source); workflows = new List(result); } diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index dd2cb8f1a..9d5cfe7db 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -261,8 +261,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -738,14 +738,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -754,14 +762,6 @@ "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.common": { - "type": "Project", - "dependencies": { - "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": { @@ -774,7 +774,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index d4aaf8047..eb93f2588 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -45,11 +45,11 @@ - + - + diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 3a74206e6..38e87bf7b 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -70,9 +70,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -82,11 +82,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1182,14 +1182,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.common.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1198,14 +1206,6 @@ "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.common": { - "type": "Project", - "dependencies": { - "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": { @@ -1218,7 +1218,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -1259,8 +1259,8 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Http": "[3.1.0, )", - "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { @@ -1274,9 +1274,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj index 86671c6b9..63c8f7718 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs index 47f7c2c3b..95b4440a7 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs @@ -14,7 +14,9 @@ * limitations under the License. */ +using System.Text.Json.Serialization; using Newtonsoft.Json; +using Monai.Deploy.Messaging.Events; namespace Monai.Deploy.WorkflowManager.Common.IntegrationTests.Models { @@ -34,12 +36,10 @@ public class WorkflowRequestMessage [JsonProperty(PropertyName = "bucket")] public string Bucket { get; set; } = default!; - - [JsonProperty(PropertyName = "calling_aetitle")] - public string CallingAeTitle { get; set; } = default!; - - [JsonProperty(PropertyName = "called_aetitle")] - public string CalledAeTitle { get; set; } = default!; + + [JsonProperty(PropertyName = "trigger")] + [JsonPropertyName("trigger")] + public DataOrigin DataTrigger { get; set; } = new DataOrigin { DataService = DataService.DIMSE }; [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 0bb20bae2..854e410c0 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs index a93c9e974..86f379a0f 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs @@ -300,8 +300,8 @@ public void AssertPayloadCollection(Payload payloadCollection, PatientDetails pa { payloadCollection.PayloadId.Should().Be(workflowRequestMessage.PayloadId.ToString()); payloadCollection.Bucket.Should().Be(workflowRequestMessage.Bucket); - payloadCollection.CallingAeTitle.Should().Be(workflowRequestMessage.CallingAeTitle); - payloadCollection.CalledAeTitle.Should().Be(workflowRequestMessage.CalledAeTitle); + payloadCollection.DataTrigger.Source.Should().Be(workflowRequestMessage.DataTrigger.Source); + payloadCollection.DataTrigger.Destination.Should().Be(workflowRequestMessage.DataTrigger.Destination); payloadCollection.CorrelationId.Should().Be(workflowRequestMessage.CorrelationId); payloadCollection.Timestamp.Should().BeCloseTo(DateTime.UtcNow, precision: TimeSpan.FromMinutes(1)); payloadCollection.PatientDetails.Should().BeEquivalentTo(patientDetails, options => options.Excluding(x => x.PatientDob)); diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs index 975f7556f..61bc1e16c 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs @@ -37,8 +37,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3636b-81dd-44a9-8c4b-71adec7d47b2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -60,8 +59,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "86c0f117-4021-412e-b163-0dc621df672a", Workflows = new List { Guid.NewGuid().ToString() }, @@ -83,8 +81,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_2", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "30a8e0c6-e6c4-458f-aa4d-b224b493d3c0", Workflows = new List { Guid.NewGuid().ToString() }, @@ -106,8 +103,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -129,8 +125,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -152,8 +147,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -175,8 +169,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -198,8 +191,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -221,8 +213,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -244,8 +235,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -267,8 +257,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -290,8 +279,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3636b-81dd-44a9-8c4b-71adec7d47b2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -313,8 +301,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3635b-81dd-44a9-8c3b-71adec7d47c6", Workflows = new List { Guid.NewGuid().ToString() }, @@ -337,8 +324,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "d5c3633b-41de-44a9-8c3a-71adec3d47c1", Workflows = new List { Guid.NewGuid().ToString() }, @@ -361,8 +347,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c1", Workflows = new List { Guid.NewGuid().ToString() }, @@ -385,8 +370,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -409,8 +393,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c3", Workflows = new List { Guid.NewGuid().ToString() }, diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs index 409ccb772..aa9c01090 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs @@ -39,8 +39,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "PACS", Destination = "MONAI" }, } }, new WorkflowRequestTestData @@ -53,8 +52,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "No_AE" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -67,8 +65,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId, Helper.GetWorkflowByName("Basic_Workflow_2").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "No_AE" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -81,8 +78,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "Basic_AE", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "Basic_AE_3" ,Source = "Basic_AE" }, } }, new WorkflowRequestTestData @@ -95,8 +91,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI_2", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI_2" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -109,8 +104,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Multi_Rev_Old", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Multi_Rev_Old", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -123,8 +117,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_Multiple_Revisions_2").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "No_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -136,8 +129,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -149,8 +141,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -162,8 +153,7 @@ public static class WorkflowRequestsTestData PayloadId = Guid.NewGuid(), Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -176,7 +166,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3" }, } }, new WorkflowRequestTestData @@ -189,7 +179,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Source = "MWM" } } }, new WorkflowRequestTestData @@ -202,8 +192,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Multi_Created", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Multi_Created", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -216,8 +205,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MWM", - CallingAeTitle = "Multi_Dispatch", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MWM" ,Source = "Multi_Dispatch" }, } }, new WorkflowRequestTestData @@ -230,8 +218,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MWM", - CallingAeTitle = "Complete_Dispatch", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MWM", Source = "Complete_Dispatch" }, } }, new WorkflowRequestTestData @@ -244,8 +231,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Same_Ae", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Same_Ae", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -258,8 +244,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -272,8 +257,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -286,8 +270,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -300,8 +283,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Non_Existant_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Non_Existant_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -314,8 +296,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Router_1", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Router_1", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -328,8 +309,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Artifact_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Artifact_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -342,8 +322,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Non_Existent_Called_AE", - CallingAeTitle = "Non_Existent_Calling_AE", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Non_Existent_Called_AE", Source = "Non_Existent_Calling_AE" }, } }, new WorkflowRequestTestData @@ -356,8 +335,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "TEST", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "TEST" }, } }, new WorkflowRequestTestData @@ -370,8 +348,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "PACS1", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "PACS1" }, } }, new WorkflowRequestTestData @@ -384,8 +361,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "PACS2", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "PACS2" }, } }, }; diff --git a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs index 1021ede64..dcc1ed626 100644 --- a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs +++ b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs @@ -75,8 +75,7 @@ public async Task CreateAsync_ValidWorkflowAndDicom_ReturnsTrue() { Timestamp = DateTime.UtcNow, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -96,8 +95,7 @@ public async Task CreateAsync_ValidWorkflowAndDicom_ReturnsTrue() Timestamp = workflowRequest.Timestamp, Bucket = workflowRequest.Bucket, FileCount = workflowRequest.FileCount, - CalledAeTitle = workflowRequest.CalledAeTitle, - CallingAeTitle = workflowRequest.CallingAeTitle, + DataTrigger = workflowRequest.DataTrigger, CorrelationId = workflowRequest.CorrelationId, PayloadId = workflowRequest.PayloadId.ToString(), PatientDetails = patientDetails, @@ -121,8 +119,7 @@ public async Task CreateAsync_ValidWorkflowPayloadExists_ReturnsExisting() { Timestamp = DateTime.UtcNow, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -142,8 +139,7 @@ public async Task CreateAsync_ValidWorkflowPayloadExists_ReturnsExisting() Timestamp = workflowRequest.Timestamp, Bucket = workflowRequest.Bucket, FileCount = workflowRequest.FileCount, - CalledAeTitle = workflowRequest.CalledAeTitle, - CallingAeTitle = workflowRequest.CallingAeTitle, + DataTrigger = workflowRequest.DataTrigger, CorrelationId = workflowRequest.CorrelationId, PayloadId = workflowRequest.PayloadId.ToString(), PatientDetails = patientDetails, @@ -178,8 +174,7 @@ public async Task GetByIdAsync_ValidId_ReturnsPayload() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -214,8 +209,7 @@ public async Task GetAll_ReturnsCompletedPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -258,8 +252,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -270,8 +263,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -282,8 +274,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } diff --git a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs index a58a45b26..3edab7a06 100644 --- a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs @@ -49,7 +49,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessage_ThrowsArgumentNullExc public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsMoreThan15Charchaters_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = "abcdefghijklmnop"; + message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -59,7 +59,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsMo public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsNull_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = string.Empty; + message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -69,7 +69,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsNu public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsWhiteSpace_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -79,7 +79,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsWh public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsEmptyString_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = String.Empty; + message.DataTrigger.Destination = String.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -89,7 +89,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsEm public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsMoreThan15Charchaters_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = "abcdefghijklmnop"; + message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -99,7 +99,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsMor public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsNull_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = string.Empty; + message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -109,7 +109,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsNul public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsWhiteSpace_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -119,7 +119,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsWhi public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsEmptyString_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -247,8 +247,7 @@ private static WorkflowRequestEvent CreateWorkflowRequestMessageWithNoWorkFlow() FileCount = 2, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AeTitle", - CallingAeTitle = "CallingAeTitle", + DataTrigger = new Messaging.Events.DataOrigin { Source = "AeTitle", Destination = "CallingAeTitle" }, }; } } diff --git a/tests/UnitTests/PayloadListener.Tests/packages.lock.json b/tests/UnitTests/PayloadListener.Tests/packages.lock.json index 835cbf018..0f5defbad 100644 --- a/tests/UnitTests/PayloadListener.Tests/packages.lock.json +++ b/tests/UnitTests/PayloadListener.Tests/packages.lock.json @@ -332,8 +332,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -832,14 +832,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common": { + "type": "Project", + "dependencies": { + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + } + }, + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -848,14 +856,6 @@ "fo-dicom": "[5.0.3, )" } }, - "monai.deploy.workflowmanager.common": { - "type": "Project", - "dependencies": { - "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": { @@ -868,7 +868,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -909,9 +909,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index dc101406c..b810adeea 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -175,8 +175,7 @@ public async Task ProcessPayload_ValidAeTitleWorkflowRequest_ReturnesTrue() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow }; @@ -231,8 +230,7 @@ public async Task ProcessPayload_ValidWorkflowIdRequest_ReturnesTrue() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -317,8 +315,7 @@ public async Task ProcessPayload_ValidWorkflowIdRequestWithArtifacts_ReturnesTru var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -413,8 +410,7 @@ public async Task ProcessPayload_RouterTaskWithMultipleDestinations_DispatchesMu var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -496,8 +492,7 @@ public async Task ProcessPayload_WithExportTask_DispatchesExport() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -586,8 +581,7 @@ public async Task ProcessPayload_WithInvalidExportTask_DoesNotDispatchExport() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -659,8 +653,7 @@ public async Task ProcessPayload_FileNotFound_FailsWorkflow() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -745,8 +738,7 @@ public async Task ProcessPayload_WorkflowAlreadyStarted_TaskNotDispatched() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, PayloadId = Guid.NewGuid(), @@ -2467,8 +2459,7 @@ public async Task ProcessPayload_WithExternalAppTask_Dispatches() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 7882ef8c4..300bab6a7 100755 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -634,8 +634,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -645,10 +645,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1990,8 +1990,8 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.0, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.18, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", @@ -2021,7 +2021,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -2046,7 +2046,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" }