diff --git a/.gitignore b/.gitignore index 8c4eb593b..990b81827 100644 --- a/.gitignore +++ b/.gitignore @@ -560,3 +560,4 @@ FodyWeavers.xsd # Additional files built by Visual Studio # End of https://www.toptal.com/developers/gitignore/api/aspnetcore,dotnetcore,visualstudio,visualstudiocode +/src/InformaticsGateway/Properties/launchSettings.json diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 76a3d3473..dc7dcac0a 100755 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -314,13 +314,15 @@ :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:49.698463427 Z + - 6.0.25 + - :when: 2022-08-16 23:05:49.698463427 Z - - :approve - Microsoft.EntityFrameworkCore - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 + - 6.0.25 :when: 2022-08-16 23:05:50.137694970 Z - - :approve - Microsoft.EntityFrameworkCore.Abstractions @@ -328,41 +330,53 @@ :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:51.008105271 Z + - 6.0.25 + - :when: 2022-08-16 23:05:51.008105271 Z - - :approve - Microsoft.EntityFrameworkCore.Analyzers - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:51.445711308 Z + - 6.0.25 + - :when: 2022-08-16 23:05:51.445711308 Z - - :approve - Microsoft.EntityFrameworkCore.Design - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:51.922790944 Z + - 6.0.25 + - :when: 2022-08-16 23:05:51.922790944 Z - - :approve - Microsoft.EntityFrameworkCore.InMemory - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:52.375150938 Z + - 6.0.25 + - :when: 2022-08-16 23:05:52.375150938 Z - - :approve - Microsoft.EntityFrameworkCore.Relational - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-16 23:05:52.828879230 Z + - 6.0.25 + - :when: 2022-08-16 23:05:52.828879230 Z +- - :approve + - Microsoft.EntityFrameworkCore.Tools + - :who: ndsouth + :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) + :versions: + - 6.0.25 + - :when: 2022-08-16 23:05:52.828879230 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.22 + - 6.0.25 :when: 2022-08-16 23:05:53.270526921 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite.Core @@ -370,6 +384,7 @@ :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - 6.0.22 + - 6.0.25 :when: 2022-08-16 23:05:53.706997823 Z - - :approve - Microsoft.Extensions.ApiDescription.Server @@ -512,7 +527,8 @@ :versions: - 6.0.21 - 6.0.22 - :when: 2022-08-29 18:11:22.090772006 Z + - 6.0.25 + - :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - :who: mocsharp @@ -520,14 +536,16 @@ :versions: - 6.0.21 - 6.0.22 - :when: 2022-08-29 18:11:22.090772006 Z + - 6.0.25 + - :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - 6.0.22 - :when: 2022-08-29 18:11:22.090772006 Z + - 6.0.25 + - :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions - :who: mocsharp diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index 6ede317d0..f4b8450b0 100755 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -54,9 +54,9 @@ - - - + + + diff --git a/src/Api/Storage/Hl7FileStorageMetadata.cs b/src/Api/Storage/Hl7FileStorageMetadata.cs old mode 100644 new mode 100755 index 2356f7738..576f88ae3 --- a/src/Api/Storage/Hl7FileStorageMetadata.cs +++ b/src/Api/Storage/Hl7FileStorageMetadata.cs @@ -54,6 +54,7 @@ public Hl7FileStorageMetadata(string connectionId, DataService dataType, string DataOrigin.DataService = dataType; DataOrigin.Source = dataOrigin; DataOrigin.Destination = IpAddress(); + DataOrigin.ArtifactType = Messaging.Common.ArtifactType.HL7; File = new StorageObjectMetadata(FileExtension) { @@ -63,4 +64,4 @@ public Hl7FileStorageMetadata(string connectionId, DataService dataType, string }; } } -} \ No newline at end of file +} diff --git a/src/Api/Test/packages.lock.json b/src/Api/Test/packages.lock.json index 697907692..c3b2fbbdd 100755 --- a/src/Api/Test/packages.lock.json +++ b/src/Api/Test/packages.lock.json @@ -116,8 +116,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -249,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -260,10 +260,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1278,10 +1278,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 06bca97d4..2f0038d42 100755 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -29,15 +29,15 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.5-rc0006, )", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "requested": "[1.0.5, )", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -47,11 +47,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.5-rc0006, )", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "requested": "[1.0.5, )", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } diff --git a/src/CLI/Test/packages.lock.json b/src/CLI/Test/packages.lock.json index 37b49effc..7ae5d5d97 100755 --- a/src/CLI/Test/packages.lock.json +++ b/src/CLI/Test/packages.lock.json @@ -164,8 +164,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -497,8 +497,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -508,10 +508,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1561,10 +1561,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json index cdce8b111..75418ec51 100755 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -115,8 +115,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -399,8 +399,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -410,10 +410,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -542,10 +542,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json index 8b97bc19b..49b143571 100755 --- a/src/Client/Test/packages.lock.json +++ b/src/Client/Test/packages.lock.json @@ -176,19 +176,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -198,39 +198,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -336,10 +336,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "HB1Zp1NY9m+HwYKLZBgUfNIt0xXzm4APARDuAIPODl8pT4g10oOiEDN8asOzx/sfL9xM+Sse5Zne9L+6qYi/iA==", + "resolved": "6.0.25", + "contentHash": "9vz47iGkzqhh0bGqomOTxaJNEEajeNcbSTSWwhh9Soo9lWm0UdPbw04CxXCQJPhc0aw9OaMnOxx7sCcde8/adA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" @@ -347,17 +347,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "yvz+0r3qAt6gNEKlGSBO1BXMhtD3Tt8yzU59dHASolpwlSHvgqy0tEP6KXn3MPoKlPr0CiAHUdzOwYSoljzRSg==" + "resolved": "6.0.25", + "contentHash": "9sd1K/rp/vlxrBWNa0i8fgHCBPg94cocGMsJr7z9e2zQGQxMHNGpspdcy/FRGPAh2CINQet/RrM6Ef196xI20w==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "PNj+/e/GCJh3ZNzxEGhkMpKJgmmbuGar6Uk/R3mPFZacTx6lBdLs4Ev7uf4XQWqTdJe56rK+2P3oF/9jIGbxgw==", + "resolved": "6.0.25", + "contentHash": "Cmhq0sgb53+dh9xHOlBEQUhi13vsZeQ4fcYC9JYO4med7pabj9x3100opCdUv+7UX+tUC1GPm/nco+1skJdLFA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -559,8 +559,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -570,10 +570,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1816,7 +1816,7 @@ "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "NLog.Web.AspNetCore": "[5.3.4, )", @@ -1827,10 +1827,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -1866,7 +1866,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.22, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.25, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1886,8 +1886,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", @@ -1916,9 +1916,9 @@ "monai.deploy.informaticsgateway.plugins.remoteappexecution": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json index eac0b2cfc..d3be0afb3 100755 --- a/src/Client/packages.lock.json +++ b/src/Client/packages.lock.json @@ -60,8 +60,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -155,8 +155,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -166,10 +166,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -275,10 +275,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Configuration/Test/packages.lock.json b/src/Configuration/Test/packages.lock.json index 6591f5152..9265712dc 100755 --- a/src/Configuration/Test/packages.lock.json +++ b/src/Configuration/Test/packages.lock.json @@ -124,8 +124,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -257,8 +257,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -268,10 +268,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1291,10 +1291,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index e7746d2d7..5af67fda9 100755 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -60,8 +60,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -155,8 +155,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -166,10 +166,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -275,10 +275,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/Api/Test/packages.lock.json b/src/Database/Api/Test/packages.lock.json index 84e33a6d5..93a1cc3a7 100755 --- a/src/Database/Api/Test/packages.lock.json +++ b/src/Database/Api/Test/packages.lock.json @@ -98,8 +98,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -231,8 +231,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -242,10 +242,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1265,10 +1265,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json index 6f18781ad..f86d76521 100755 --- a/src/Database/Api/packages.lock.json +++ b/src/Database/Api/packages.lock.json @@ -66,8 +66,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -161,8 +161,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -172,10 +172,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -281,10 +281,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.Designer.cs b/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.Designer.cs new file mode 100755 index 000000000..f1346c6dc --- /dev/null +++ b/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.Designer.cs @@ -0,0 +1,520 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; + +#nullable disable + +namespace Monai.Deploy.InformaticsGateway.Database.Migrations +{ + [DbContext(typeof(InformaticsGatewayContext))] + [Migration("20231123141944_addHl7Config")] + partial class addHl7Config + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "6.0.22"); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DataKeyValuePair", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("INTEGER"); + + b.HasKey("Key"); + + b.ToTable("DataKeyValuePair"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("DataLinkKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("SendingIdKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("DataLinkKey"); + + b.HasIndex("SendingIdKey"); + + b.ToTable("Hl7ApplicationConfig"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Models.DestinationApplicationEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("AeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedBy") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DateTimeUpdated") + .HasColumnType("TEXT"); + + b.Property("HostIp") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("UpdatedBy") + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.HasIndex(new[] { "Name" }, "idx_destination_name") + .IsUnique(); + + b.HasIndex(new[] { "Name", "AeTitle", "HostIp", "Port" }, "idx_source_all") + .IsUnique(); + + b.ToTable("DestinationApplicationEntities"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Models.DicomAssociationInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CalledAeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CallingAeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CorrelationId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DateTimeDisconnected") + .HasColumnType("TEXT"); + + b.Property("Duration") + .HasColumnType("TEXT"); + + b.Property("Errors") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("PayloadIds") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RemoteHost") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RemotePort") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("DicomAssociationHistories"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Models.ExternalAppDetails", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CorrelationId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DestinationFolder") + .HasColumnType("TEXT"); + + b.Property("ExportTaskID") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PatientId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PatientIdOutBound") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StudyInstanceUid") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StudyInstanceUidOutBound") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("WorkflowInstanceId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalAppDetails"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Models.MonaiApplicationEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT") + .HasColumnOrder(0); + + b.Property("AeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("AllowedSopClasses") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedBy") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DateTimeUpdated") + .HasColumnType("TEXT"); + + b.Property("Grouping") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IgnoredSopClasses") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PlugInAssemblies") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Timeout") + .HasColumnType("INTEGER"); + + b.Property("UpdatedBy") + .HasColumnType("TEXT"); + + b.Property("Workflows") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.HasIndex(new[] { "Name" }, "idx_monaiae_name") + .IsUnique(); + + b.ToTable("MonaiApplicationEntities"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Rest.InferenceRequest", b => + { + b.Property("InferenceRequestId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedBy") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("InputMetadata") + .HasColumnType("TEXT"); + + b.Property("InputResources") + .HasColumnType("TEXT"); + + b.Property("OutputResources") + .HasColumnType("TEXT"); + + b.Property("Priority") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("Status") + .HasColumnType("INTEGER"); + + b.Property("TransactionId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("TryCount") + .HasColumnType("INTEGER"); + + b.HasKey("InferenceRequestId"); + + b.HasIndex(new[] { "InferenceRequestId" }, "idx_inferencerequest_inferencerequestid") + .IsUnique(); + + b.HasIndex(new[] { "State" }, "idx_inferencerequest_state"); + + b.HasIndex(new[] { "TransactionId" }, "idx_inferencerequest_transactionid") + .IsUnique(); + + b.ToTable("InferenceRequests"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.SourceApplicationEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("AeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedBy") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DateTimeUpdated") + .HasColumnType("TEXT"); + + b.Property("HostIp") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedBy") + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.HasIndex(new[] { "Name", "AeTitle", "HostIp" }, "idx_source_all") + .IsUnique() + .HasDatabaseName("idx_source_all1"); + + b.HasIndex(new[] { "Name" }, "idx_source_name") + .IsUnique(); + + b.ToTable("SourceApplicationEntities"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Storage.Payload", b => + { + b.Property("PayloadId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CorrelationId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DataOrigins") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DataTrigger") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DestinationFolder") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Files") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MachineName") + .HasColumnType("TEXT"); + + b.Property("RetryCount") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TaskId") + .HasColumnType("TEXT"); + + b.Property("Timeout") + .HasColumnType("INTEGER"); + + b.Property("WorkflowInstanceId") + .HasColumnType("TEXT"); + + b.HasKey("PayloadId"); + + b.HasIndex(new[] { "CorrelationId", "PayloadId" }, "idx_payload_ids") + .IsUnique(); + + b.HasIndex(new[] { "State" }, "idx_payload_state"); + + b.ToTable("Payloads"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Hl7ApplicationConfigEntityId") + .HasColumnType("TEXT"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.HasIndex("Hl7ApplicationConfigEntityId"); + + b.ToTable("StringKeyValuePair"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.VirtualApplicationEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT") + .HasColumnOrder(0); + + b.Property("CreatedBy") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("DateTimeUpdated") + .HasColumnType("TEXT"); + + b.Property("PlugInAssemblies") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedBy") + .HasColumnType("TEXT"); + + b.Property("VirtualAeTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Workflows") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.HasIndex(new[] { "Name" }, "idx_virtualae_name") + .IsUnique(); + + b.ToTable("VirtualApplicationEntities"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Database.Api.StorageMetadataWrapper", b => + { + b.Property("CorrelationId") + .HasColumnType("TEXT"); + + b.Property("Identity") + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("IsUploaded") + .HasColumnType("INTEGER"); + + b.Property("TypeName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("CorrelationId", "Identity"); + + b.HasIndex(new[] { "CorrelationId" }, "idx_storagemetadata_correlation"); + + b.HasIndex(new[] { "CorrelationId", "Identity" }, "idx_storagemetadata_ids"); + + b.HasIndex(new[] { "IsUploaded" }, "idx_storagemetadata_uploaded"); + + b.ToTable("StorageMetadataWrapperEntities"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.HasOne("Monai.Deploy.InformaticsGateway.Api.DataKeyValuePair", "DataLink") + .WithMany() + .HasForeignKey("DataLinkKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", "SendingId") + .WithMany() + .HasForeignKey("SendingIdKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("DataLink"); + + b.Navigation("SendingId"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", b => + { + b.HasOne("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", null) + .WithMany("DataMapping") + .HasForeignKey("Hl7ApplicationConfigEntityId"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.Navigation("DataMapping"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.cs b/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.cs new file mode 100755 index 000000000..679888525 --- /dev/null +++ b/src/Database/EntityFramework/Migrations/20231123141944_addHl7Config.cs @@ -0,0 +1,106 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Monai.Deploy.InformaticsGateway.Database.Migrations +{ + public partial class addHl7Config : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "DataKeyValuePair", + columns: table => new + { + Key = table.Column(type: "TEXT", nullable: false), + Value = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_DataKeyValuePair", x => x.Key); + }); + + migrationBuilder.CreateTable( + name: "Hl7ApplicationConfig", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + SendingIdKey = table.Column(type: "TEXT", nullable: false), + DataLinkKey = table.Column(type: "TEXT", nullable: false), + DateTimeCreated = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Hl7ApplicationConfig", x => x.Id); + table.ForeignKey( + name: "FK_Hl7ApplicationConfig_DataKeyValuePair_DataLinkKey", + column: x => x.DataLinkKey, + principalTable: "DataKeyValuePair", + principalColumn: "Key", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "StringKeyValuePair", + columns: table => new + { + Key = table.Column(type: "TEXT", nullable: false), + Value = table.Column(type: "TEXT", nullable: false), + Hl7ApplicationConfigEntityId = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_StringKeyValuePair", x => x.Key); + table.ForeignKey( + name: "FK_StringKeyValuePair_Hl7ApplicationConfig_Hl7ApplicationConfigEntityId", + column: x => x.Hl7ApplicationConfigEntityId, + principalTable: "Hl7ApplicationConfig", + principalColumn: "Id"); + }); + + migrationBuilder.CreateIndex( + name: "IX_Hl7ApplicationConfig_DataLinkKey", + table: "Hl7ApplicationConfig", + column: "DataLinkKey"); + + migrationBuilder.CreateIndex( + name: "IX_Hl7ApplicationConfig_SendingIdKey", + table: "Hl7ApplicationConfig", + column: "SendingIdKey"); + + migrationBuilder.CreateIndex( + name: "IX_StringKeyValuePair_Hl7ApplicationConfigEntityId", + table: "StringKeyValuePair", + column: "Hl7ApplicationConfigEntityId"); + + migrationBuilder.AddForeignKey( + name: "FK_Hl7ApplicationConfig_StringKeyValuePair_SendingIdKey", + table: "Hl7ApplicationConfig", + column: "SendingIdKey", + principalTable: "StringKeyValuePair", + principalColumn: "Key", + onDelete: ReferentialAction.Cascade); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Hl7ApplicationConfig_DataKeyValuePair_DataLinkKey", + table: "Hl7ApplicationConfig"); + + migrationBuilder.DropForeignKey( + name: "FK_Hl7ApplicationConfig_StringKeyValuePair_SendingIdKey", + table: "Hl7ApplicationConfig"); + + migrationBuilder.DropTable( + name: "DataKeyValuePair"); + + migrationBuilder.DropTable( + name: "StringKeyValuePair"); + + migrationBuilder.DropTable( + name: "Hl7ApplicationConfig"); + } + } +} diff --git a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs index 888d54c32..6fd769dc5 100755 --- a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs +++ b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs @@ -17,6 +17,45 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.22"); + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DataKeyValuePair", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("INTEGER"); + + b.HasKey("Key"); + + b.ToTable("DataKeyValuePair"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("DataLinkKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DateTimeCreated") + .HasColumnType("TEXT"); + + b.Property("SendingIdKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("DataLinkKey"); + + b.HasIndex("SendingIdKey"); + + b.ToTable("Hl7ApplicationConfig"); + }); + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Models.DestinationApplicationEntity", b => { b.Property("Name") @@ -353,6 +392,25 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Payloads"); }); + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Hl7ApplicationConfigEntityId") + .HasColumnType("TEXT"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.HasIndex("Hl7ApplicationConfigEntityId"); + + b.ToTable("StringKeyValuePair"); + }); + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.VirtualApplicationEntity", b => { b.Property("Name") @@ -423,6 +481,37 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("StorageMetadataWrapperEntities"); }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.HasOne("Monai.Deploy.InformaticsGateway.Api.DataKeyValuePair", "DataLink") + .WithMany() + .HasForeignKey("DataLinkKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", "SendingId") + .WithMany() + .HasForeignKey("SendingIdKey") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("DataLink"); + + b.Navigation("SendingId"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.StringKeyValuePair", b => + { + b.HasOne("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", null) + .WithMany("DataMapping") + .HasForeignKey("Hl7ApplicationConfigEntityId"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Hl7ApplicationConfigEntity", b => + { + b.Navigation("DataMapping"); + }); #pragma warning restore 612, 618 } } diff --git a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj old mode 100644 new mode 100755 index b99824dd2..d9ad95499 --- a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj +++ b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj @@ -42,12 +42,12 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj b/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj old mode 100644 new mode 100755 index c9ad64d69..abff60683 --- a/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj +++ b/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json index 1360cc775..40ce6d70b 100755 --- a/src/Database/EntityFramework/Test/packages.lock.json +++ b/src/Database/EntityFramework/Test/packages.lock.json @@ -10,11 +10,11 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "CcL5ajX+/OkafcP5OMplCBnIgSfaQy5BUjEZQKZ9BlspnwFFucy+wcE0LL1ycOlWcDYGI42FnQ45dD1Kcz+ZKA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "T1wFaHL0WS51PlrSzWfBX2qppMbuIserPUaSwrw6Uhvg4WllsQPKYqFGAZC9bbUAihjgY5es7MIgSEtXYNdLiw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22" + "Microsoft.EntityFrameworkCore": "6.0.25" } }, "Microsoft.NET.Test.Sdk": { @@ -124,19 +124,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -146,39 +146,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -392,8 +392,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -403,10 +403,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1469,10 +1469,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -1502,8 +1502,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", diff --git a/src/Database/EntityFramework/packages.lock.json b/src/Database/EntityFramework/packages.lock.json index 18be93807..c80430fab 100755 --- a/src/Database/EntityFramework/packages.lock.json +++ b/src/Database/EntityFramework/packages.lock.json @@ -4,12 +4,12 @@ "net6.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -19,21 +19,21 @@ }, "Microsoft.EntityFrameworkCore.Design": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "es9TKd0cpM263Ou0QMEETN7MDzD7kXDkThiiXl1+c/69v97AZlzeLoM5tDdC0RC4L74ZWyk3+WMnoDPL93DDyQ==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "YawyMKj1f+GkwHrxMIf9tX84sMGgLFa5YoRmyuUugGhffiubkVLYIrlm4W0uSy2NzX4t6+V7keFLQf7lRQvDmA==", "dependencies": { "Humanizer.Core": "2.8.26", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -132,38 +132,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -315,8 +315,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -326,10 +326,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -473,10 +473,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj index 2fab0c504..bf29f1d77 100755 --- a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj +++ b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj @@ -68,7 +68,11 @@ - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json index e394689d1..8ad2d5e4f 100755 --- a/src/Database/MongoDB/Integration.Test/packages.lock.json +++ b/src/Database/MongoDB/Integration.Test/packages.lock.json @@ -132,8 +132,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -274,8 +274,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -285,10 +285,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1396,10 +1396,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/MongoDB/Repositories/Hl7ApplicationConfigRepository.cs b/src/Database/MongoDB/Repositories/Hl7ApplicationConfigRepository.cs old mode 100644 new mode 100755 index 04cdc1df8..b7a35ce5e --- a/src/Database/MongoDB/Repositories/Hl7ApplicationConfigRepository.cs +++ b/src/Database/MongoDB/Repositories/Hl7ApplicationConfigRepository.cs @@ -70,23 +70,22 @@ public Task> GetAllAsync(CancellationToken canc _retryPolicy.ExecuteAsync(() => _collection.Find(Builders.Filter.Empty).ToListAsync(cancellationToken)); - public Task GetByIdAsync(string id) => - _retryPolicy.ExecuteAsync(() => _collection - .Find(x => x.Id.Equals(id)) - .FirstOrDefaultAsync())!; + public Task GetByIdAsync(string id) + { + var GuidId = Guid.Parse(id); + return _retryPolicy.ExecuteAsync(() => _collection + .Find(x => x.Id == GuidId) + .FirstOrDefaultAsync())!; + } public Task DeleteAsync(string id, CancellationToken cancellationToken = default) { return _retryPolicy.ExecuteAsync(async () => { - var entity = await GetByIdAsync(id).ConfigureAwait(false); - if (entity is null) - { - throw new DatabaseException("Failed to delete entity."); - } + var entity = await GetByIdAsync(id).ConfigureAwait(false) ?? throw new DatabaseException("Failed to delete entity."); var result = await _collection - .DeleteOneAsync(Builders.Filter.Where(p => p.Id.Equals(id)), + .DeleteOneAsync(Builders.Filter.Where(p => p.Id == entity.Id), cancellationToken: cancellationToken).ConfigureAwait(false); if (result.DeletedCount == 0) @@ -112,10 +111,11 @@ await _collection.InsertOneAsync(configEntity, cancellationToken: cancellationTo public Task UpdateAsync(Hl7ApplicationConfigEntity configEntity, CancellationToken cancellationToken = default) { + return _retryPolicy.ExecuteAsync(async () => { var result = await _collection - .ReplaceOneAsync(Builders.Filter.Where(p => p.Id.Equals(configEntity.Id)), + .ReplaceOneAsync(Builders.Filter.Where(p => p.Id == configEntity.Id), configEntity, cancellationToken: cancellationToken).ConfigureAwait(false); if (result.ModifiedCount == 0) { diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json index 1cdbe1032..b248f4c03 100755 --- a/src/Database/MongoDB/packages.lock.json +++ b/src/Database/MongoDB/packages.lock.json @@ -86,8 +86,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -195,8 +195,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -206,10 +206,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -374,10 +374,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index 0f2abebb3..9fa7405f1 100755 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -12,15 +12,24 @@ "MongoDB.Driver": "2.14.1" } }, + "Microsoft.EntityFrameworkCore.Tools": { + "type": "Direct", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "2iPMR+DHXh2Xn9qoJ0ejzdHblpns73e1pZ/pyRbYDQi0HPJyq1/pTYDda1owJ5W2lxAGDg8l5Fl1jVp97fTR1g==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Design": "6.0.25" + } + }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "PNj+/e/GCJh3ZNzxEGhkMpKJgmmbuGar6Uk/R3mPFZacTx6lBdLs4Ev7uf4XQWqTdJe56rK+2P3oF/9jIGbxgw==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "Cmhq0sgb53+dh9xHOlBEQUhi13vsZeQ4fcYC9JYO4med7pabj9x3100opCdUv+7UX+tUC1GPm/nco+1skJdLFA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -85,6 +94,11 @@ "System.Threading.Channels": "6.0.0" } }, + "Humanizer.Core": { + "type": "Transitive", + "resolved": "2.8.26", + "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A==" + }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", @@ -102,19 +116,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -124,39 +138,48 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" + }, + "Microsoft.EntityFrameworkCore.Design": { + "type": "Transitive", + "resolved": "6.0.25", + "contentHash": "YawyMKj1f+GkwHrxMIf9tX84sMGgLFa5YoRmyuUugGhffiubkVLYIrlm4W0uSy2NzX4t6+V7keFLQf7lRQvDmA==", + "dependencies": { + "Humanizer.Core": "2.8.26", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25" + } }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -257,10 +280,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "HB1Zp1NY9m+HwYKLZBgUfNIt0xXzm4APARDuAIPODl8pT4g10oOiEDN8asOzx/sfL9xM+Sse5Zne9L+6qYi/iA==", + "resolved": "6.0.25", + "contentHash": "9vz47iGkzqhh0bGqomOTxaJNEEajeNcbSTSWwhh9Soo9lWm0UdPbw04CxXCQJPhc0aw9OaMnOxx7sCcde8/adA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" @@ -268,8 +291,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "yvz+0r3qAt6gNEKlGSBO1BXMhtD3Tt8yzU59dHASolpwlSHvgqy0tEP6KXn3MPoKlPr0CiAHUdzOwYSoljzRSg==" + "resolved": "6.0.25", + "contentHash": "9sd1K/rp/vlxrBWNa0i8fgHCBPg94cocGMsJr7z9e2zQGQxMHNGpspdcy/FRGPAh2CINQet/RrM6Ef196xI20w==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -354,8 +377,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -365,10 +388,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -587,10 +610,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -620,8 +643,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", diff --git a/src/InformaticsGateway/InternalVisibleTo.cs b/src/InformaticsGateway/InternalVisibleTo.cs old mode 100644 new mode 100755 diff --git a/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs b/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs old mode 100644 new mode 100755 index 419060787..8a7b3e8c8 --- a/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs +++ b/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs @@ -68,5 +68,27 @@ public static partial class Log [LoggerMessage(EventId = 815, Level = LogLevel.Information, Message = "HL7 client {clientId} disconnected.")] public static partial void Hl7ClientRemoved(this ILogger logger, Guid clientId); + + [LoggerMessage(EventId = 816, Level = LogLevel.Debug, Message = "HL7 config loaded. {config}")] + public static partial void Hl7ConfigLoaded(this ILogger logger, string config); + + [LoggerMessage(EventId = 817, Level = LogLevel.Information, Message = "No HL7 config found")] + public static partial void Hl7NoConfig(this ILogger logger); + + [LoggerMessage(EventId = 818, Level = LogLevel.Debug, Message = "HL7 no matching config found for message {message}")] + public static partial void Hl7NoMatchingConfig(this ILogger logger, string message); + + [LoggerMessage(EventId = 819, Level = LogLevel.Debug, Message = "HL7 found matching config found for. {Id} config: {config}")] + public static partial void Hl7FoundMatchingConfig(this ILogger logger, string Id, string config); + + [LoggerMessage(EventId = 820, Level = LogLevel.Warning, Message = "HL7 exception thrown extracting Hl7 Info")] + public static partial void Hl7ExceptionThrow(this ILogger logger, Exception ex); + + [LoggerMessage(EventId = 821, Level = LogLevel.Warning, Message = "HL7 external App Details not found")] + public static partial void Hl7ExtAppDetailsNotFound(this ILogger logger); + + [LoggerMessage(EventId = 822, Level = LogLevel.Debug, Message = "HL7 changing value {hl7Tag} from {oldValue} to {newValue}")] + public static partial void ChangingHl7Values(this ILogger logger, string hl7Tag, string oldValue, string newValue); + } } diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index a49afc36f..f1f927dd4 100755 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -38,7 +38,11 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/InformaticsGateway/Program.cs b/src/InformaticsGateway/Program.cs index 9eb227f55..0f8aaab8f 100755 --- a/src/InformaticsGateway/Program.cs +++ b/src/InformaticsGateway/Program.cs @@ -110,6 +110,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddScoped(); services.AddScoped(); diff --git a/src/InformaticsGateway/Properties/launchSettings.json b/src/InformaticsGateway/Properties/launchSettings.json deleted file mode 100755 index 11e711acb..000000000 --- a/src/InformaticsGateway/Properties/launchSettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "profiles": { - "Monai.Deploy.InformaticsGateway": { - "commandName": "Project", - "environmentVariables": { - "DOTNET_ENVIRONMENT": "Development", - "ELASTIC_CLIENT_APIVERSIONING": "true", - "LOGSTASH_URL": "tcp://localhost:50000", - "InformaticsGateway__messaging__publisherSettings__username": "rabbitmq", - "InformaticsGateway__messaging__publisherSettings__password": "rabbitmq", - "InformaticsGateway__messaging__subscriberSettings__username": "rabbitmq", - "InformaticsGateway__messaging__subscriberSettings__password": "rabbitmq", - "Kestrel__EndPoints__Http__Url": "http://+:5000", - "InformaticsGateway__dicom__scp__port": "1104", - "InformaticsGateway__dicom__scp__externalAppPort": "1105" - } - } - } -} \ No newline at end of file diff --git a/src/InformaticsGateway/Services/HealthLevel7/IMllpClientFactory.cs b/src/InformaticsGateway/Services/HealthLevel7/IMllpClientFactory.cs old mode 100644 new mode 100755 index e2d145b6e..fd3c09bd1 --- a/src/InformaticsGateway/Services/HealthLevel7/IMllpClientFactory.cs +++ b/src/InformaticsGateway/Services/HealthLevel7/IMllpClientFactory.cs @@ -22,11 +22,12 @@ namespace Monai.Deploy.InformaticsGateway.Services.HealthLevel7 { internal interface IMllpClientFactory { - IMllpClient CreateClient(ITcpClientAdapter client, Hl7Configuration configurations, ILogger logger); + IMllpClient CreateClient(ITcpClientAdapter client, Hl7Configuration configurations, IMllpExtract mIIpExtract, ILogger logger); } internal class MllpClientFactory : IMllpClientFactory { - public IMllpClient CreateClient(ITcpClientAdapter client, Hl7Configuration configurations, ILogger logger) => new MllpClient(client, configurations, logger); + public IMllpClient CreateClient(ITcpClientAdapter client, Hl7Configuration configurations, IMllpExtract mIIpExtract, ILogger logger) + => new MllpClient(client, configurations, mIIpExtract, logger); } } diff --git a/src/InformaticsGateway/Services/HealthLevel7/IMllpExtract.cs b/src/InformaticsGateway/Services/HealthLevel7/IMllpExtract.cs new file mode 100755 index 000000000..8fd8bbf37 --- /dev/null +++ b/src/InformaticsGateway/Services/HealthLevel7/IMllpExtract.cs @@ -0,0 +1,28 @@ +/* + * Copyright 2023 MONAI Consortium + * + * 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 System.Threading.Tasks; +using HL7.Dotnetcore; +using Monai.Deploy.InformaticsGateway.Api.Storage; + +namespace Monai.Deploy.InformaticsGateway.Services.HealthLevel7 +{ + internal interface IMllpExtract + { + Task ExtractInfo(Hl7FileStorageMetadata meta, Message message); + } +} diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs old mode 100644 new mode 100755 index 0a79c8d1f..3caef1a4f --- a/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs +++ b/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs @@ -38,6 +38,7 @@ internal sealed class MllpClient : IMllpClient private readonly List _exceptions; private readonly List _messages; private readonly IDisposable _loggerScope; + private readonly IMllpExtract _mIIpExtract; private bool _disposedValue; public Guid ClientId { get; } @@ -47,11 +48,12 @@ public string ClientIp get { return _client.RemoteEndPoint.ToString() ?? string.Empty; } } - public MllpClient(ITcpClientAdapter client, Hl7Configuration configurations, ILogger logger) + public MllpClient(ITcpClientAdapter client, Hl7Configuration configurations, IMllpExtract mIIpExtract, ILogger logger) { _client = client ?? throw new ArgumentNullException(nameof(client)); _configurations = configurations ?? throw new ArgumentNullException(nameof(configurations)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + _mIIpExtract = mIIpExtract ?? throw new ArgumentNullException(nameof(_mIIpExtract)); ClientId = Guid.NewGuid(); _exceptions = new List(); @@ -247,4 +249,4 @@ public void Dispose() GC.SuppressFinalize(this); } } -} \ No newline at end of file +} diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs new file mode 100755 index 000000000..94b2437fa --- /dev/null +++ b/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs @@ -0,0 +1,161 @@ +/* + * Copyright 2023 MONAI Consortium + * + * 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 System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using FellowOakDicom; +using HL7.Dotnetcore; +using Microsoft.Extensions.Logging; +using Monai.Deploy.InformaticsGateway.Api; +using Monai.Deploy.InformaticsGateway.Api.Models; +using Monai.Deploy.InformaticsGateway.Api.Storage; +using Monai.Deploy.InformaticsGateway.Database.Api.Repositories; +using Monai.Deploy.InformaticsGateway.Logging; + +namespace Monai.Deploy.InformaticsGateway.Services.HealthLevel7 +{ + internal sealed class MllpExtract : IMllpExtract + { + private readonly ILogger _logger; + private readonly IHl7ApplicationConfigRepository _hl7ApplicationConfigRepository; + private readonly IExternalAppDetailsRepository _externalAppDetailsRepository; + + public MllpExtract(IHl7ApplicationConfigRepository hl7ApplicationConfigRepository, IExternalAppDetailsRepository externalAppDetailsRepository, ILogger logger) + { + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + _hl7ApplicationConfigRepository = hl7ApplicationConfigRepository ?? throw new ArgumentNullException(nameof(hl7ApplicationConfigRepository)); + _externalAppDetailsRepository = externalAppDetailsRepository ?? throw new ArgumentNullException(nameof(externalAppDetailsRepository)); + } + + + public async Task ExtractInfo(Hl7FileStorageMetadata meta, Message message) + { + try + { + // load the config + var config = await _hl7ApplicationConfigRepository.GetAllAsync().ConfigureAwait(false); + if (config == null) + { + _logger.Hl7NoConfig(); + return message; + } + _logger.Hl7ConfigLoaded($"Config: {config}"); + // get config for vendorId + var configItem = GetConfig(config, message); + if (configItem == null) + { + _logger.Hl7NoMatchingConfig(message.HL7Message); + return message; + } + // extract data for the given fields + // Use Id to get record from Db + var details = await GetExtAppDetails(configItem, message); + + if (details is null) + { + _logger.Hl7ExtAppDetailsNotFound(); + return message; + } + + // fill in meta data with workflowInstance and Task ID + // repopulate message with data from record + + meta.WorkflowInstanceId = details.WorkflowInstanceId; + meta.TaskId = details.ExportTaskID; + meta.ChangeCorrelationId(_logger, details.CorrelationId); + + if (string.IsNullOrEmpty(details.DestinationFolder) is false) + { + meta.File.DestinationFolderOverride = true; + meta.File.UploadPath = $"{details.DestinationFolder}/{meta.DataTypeDirectoryName}/{meta.Id}{Hl7FileStorageMetadata.FileExtension}"; + } + message = RepopulateMessage(configItem, details, message); + } + catch (Exception ex) + { + _logger.Hl7ExceptionThrow(ex); + } + return message; + } + + private async Task GetExtAppDetails(Hl7ApplicationConfigEntity hl7ApplicationConfigEntity, Message message) + { + var tagId = message.GetValue(hl7ApplicationConfigEntity.DataLink.Key); + var type = hl7ApplicationConfigEntity.DataLink.Value; + switch (type) + { + case DataLinkType.PatientId: + return await _externalAppDetailsRepository.GetByPatientIdOutboundAsync(tagId, new CancellationToken()); + case DataLinkType.StudyInstanceUid: + return await _externalAppDetailsRepository.GetByStudyIdOutboundAsync(tagId, new CancellationToken()); + default: + break; + } + + throw new Exception($"Invalid DataLinkType: {type}"); + } + + internal static Hl7ApplicationConfigEntity? GetConfig(List config, Message message) + { + foreach (var item in config) + { + var t = message.GetValue(item.SendingId.Key); + if (item.SendingId.Value == message.GetValue(item.SendingId.Key)) + { + return item; + } + } + return null; + } + + private Message RepopulateMessage(Hl7ApplicationConfigEntity config, ExternalAppDetails details, Message message) + { + foreach (var item in config.DataMapping) + { + var tag = DicomTag.Parse(item.Value); + // these are the only two fields we have at the point + if (tag == DicomTag.PatientID) + { + var oldvalue = message.GetValue(item.Key); + message.SetValue(item.Key, details.PatientId); + _logger.ChangingHl7Values(item.Key, oldvalue, details.PatientId); + if (message.HL7Message.Contains(oldvalue)) + { + var newMess = message.HL7Message.Replace(oldvalue, details.PatientId); + message = new Message(newMess); + message.ParseMessage(); + } + } + else if (tag == DicomTag.StudyInstanceUID) + { + var oldvalue = message.GetValue(item.Key); + message.SetValue(item.Key, details.StudyInstanceUid); + _logger.ChangingHl7Values(item.Key, oldvalue, details.StudyInstanceUid); + if (message.HL7Message.Contains(oldvalue)) + { + var newMess = message.HL7Message.Replace(oldvalue, details.StudyInstanceUid); + message = new Message(newMess); + message.ParseMessage(); + } + } + } + return message; + } + } +} diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs index 24f7269cf..33e0d72ed 100755 --- a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs +++ b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs @@ -51,6 +51,7 @@ internal sealed class MllpService : IHostedService, IDisposable, IMonaiService private readonly IOptions _configuration; private readonly IStorageInfoProvider _storageInfoProvider; private readonly ConcurrentDictionary _activeTasks; + private readonly IMllpExtract _mIIpExtract; public int ActiveConnections { @@ -84,6 +85,7 @@ public MllpService(IServiceScopeFactory serviceScopeFactory, _payloadAssembler = serviceScope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IPayloadAssembler)); _fileSystem = serviceScope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IFileSystem)); _storageInfoProvider = serviceScope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IStorageInfoProvider)); + _mIIpExtract = serviceScope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IMllpExtract)); _activeTasks = new ConcurrentDictionary(); } @@ -131,7 +133,7 @@ private async Task BackgroundProcessing(CancellationToken cancellationToken) continue; } - mllpClient = _mllpClientFactory.CreateClient(client, _configuration.Value.Hl7, _logginFactory.CreateLogger()); + mllpClient = _mllpClientFactory.CreateClient(client, _configuration.Value.Hl7, _mIIpExtract, _logginFactory.CreateLogger()); _ = mllpClient.Start(OnDisconnect, cancellationToken); _activeTasks.TryAdd(mllpClient.ClientId, mllpClient); } @@ -168,11 +170,12 @@ private async Task OnDisconnect(IMllpClient client, MllpClientResult result) { foreach (var message in result.Messages) { - var hl7Fileetadata = new Hl7FileStorageMetadata(client.ClientId.ToString(), DataService.HL7, client.ClientIp); - await hl7Fileetadata.SetDataStream(message.HL7Message, _configuration.Value.Storage.TemporaryDataStorage, _fileSystem, _configuration.Value.Storage.LocalTemporaryStoragePath).ConfigureAwait(false); - var payloadId = await _payloadAssembler.Queue(client.ClientId.ToString(), hl7Fileetadata, new DataOrigin { DataService = DataService.HL7, Source = client.ClientIp, Destination = FileStorageMetadata.IpAddress() }).ConfigureAwait(false); - hl7Fileetadata.PayloadId = payloadId.ToString(); - _uploadQueue.Queue(hl7Fileetadata); + var hl7Filemetadata = new Hl7FileStorageMetadata(client.ClientId.ToString(), DataService.HL7, client.ClientIp); + var newMessage = await _mIIpExtract.ExtractInfo(hl7Filemetadata, message).ConfigureAwait(false); + await hl7Filemetadata.SetDataStream(newMessage.HL7Message, _configuration.Value.Storage.TemporaryDataStorage, _fileSystem, _configuration.Value.Storage.LocalTemporaryStoragePath).ConfigureAwait(false); + var payloadId = await _payloadAssembler.Queue(client.ClientId.ToString(), hl7Filemetadata, new DataOrigin { DataService = DataService.HL7, Source = client.ClientIp, Destination = FileStorageMetadata.IpAddress() }).ConfigureAwait(false); + hl7Filemetadata.PayloadId ??= payloadId.ToString(); + _uploadQueue.Queue(hl7Filemetadata); } } catch (Exception ex) @@ -223,4 +226,4 @@ public void Dispose() GC.SuppressFinalize(this); } } -} \ No newline at end of file +} diff --git a/src/InformaticsGateway/Services/Http/Hl7ApplicationConfigController.cs b/src/InformaticsGateway/Services/Http/Hl7ApplicationConfigController.cs old mode 100644 new mode 100755 index d49913ebe..4eadd2f5c --- a/src/InformaticsGateway/Services/Http/Hl7ApplicationConfigController.cs +++ b/src/InformaticsGateway/Services/Http/Hl7ApplicationConfigController.cs @@ -115,10 +115,9 @@ public async Task Put([FromBody] Hl7ApplicationConfigEntity confi return Problem(title: "Validation Failure.", statusCode: BadRequest, detail: message); } - configEntity.Id = Guid.NewGuid(); try { - await _repository.CreateAsync(configEntity).ConfigureAwait(false); + await _repository.UpdateAsync(configEntity).ConfigureAwait(false); return Ok(configEntity.Id); } catch (Exception ex) @@ -149,7 +148,7 @@ public async Task Post([FromBody] Hl7ApplicationConfigEntity conf try { - var result = await _repository.UpdateAsync(configEntity).ConfigureAwait(false); + var result = await _repository.CreateAsync(configEntity).ConfigureAwait(false); if (result is null) { return Problem(title: "Database error updating HL7 Application Configuration.", statusCode: BadRequest, diff --git a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj index 0f1df6ef4..7c303125e 100755 --- a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj +++ b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/InformaticsGateway/Test/Services/HealthLevel7/MllPExtractTests.cs b/src/InformaticsGateway/Test/Services/HealthLevel7/MllPExtractTests.cs new file mode 100755 index 000000000..ff25d27ac --- /dev/null +++ b/src/InformaticsGateway/Test/Services/HealthLevel7/MllPExtractTests.cs @@ -0,0 +1,178 @@ + +/* + * Copyright 2023 MONAI Consortium + * + * 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.InformaticsGateway.Services.HealthLevel7; +using System.Threading; +using Moq; +using Xunit; +using Microsoft.Extensions.Logging; +using System; +using Monai.Deploy.InformaticsGateway.Api; +using System.Collections.Generic; +using HL7.Dotnetcore; +using Monai.Deploy.InformaticsGateway.Database.Api.Repositories; +using Monai.Deploy.InformaticsGateway.Api.Storage; +using System.Threading.Tasks; +using Monai.Deploy.InformaticsGateway.Api.Models; +using FellowOakDicom; + +namespace Monai.Deploy.InformaticsGateway.Test.Services.HealthLevel7 +{ + public class MllPExtractTests + { + private const string SampleMessage = "MSH|^~\\&|MD|MD HOSPITAL|MD Test|MONAI Deploy|202207130000|SECURITY|MD^A01^ADT_A01|MSG00001|P|2.8||||\r\n"; + private const string ABCDEMessage = "MSH|^~\\&|Rayvolve|ABCDE|RIS|{InstitutionName}|{YYYYMMDDHHMMSS}||ORU^R01|{UniqueIdentifier}|P|2.5\r\nPID|{StudyInstanceUID}|{AccessionNumber}\r\nOBR|{StudyInstanceUID}||{AccessionNumber}|Rayvolve^{AlgorithmUsed}||||||||||||{AccessionNumber}|||||||F||{PriorityValues, ex: A^ASAP^HL70078}\r\nTQ1|||||||||{PriorityValues, ex: A^ASAP^HL70078}\r\nOBX|1|ST|113014^DICOM Study^DCM||{StudyInstanceUID}||||||O\r\nOBX|2|TX|59776-5^Procedure Findings^LN||{Textual findingsm, ex:\"Fracture detected\")}|||{Abnormal flag, ex : A^Abnormal^HL70078}|||F||||{ACR flag, ex : RID49482^Category 3 Non critical Actionable Finding^RadLex}\r\n"; + + private readonly Mock> _logger; + private readonly CancellationTokenSource _cancellationTokenSource; + private readonly MllpExtract _sut; + private readonly Mock _l7ApplicationConfigRepository = new Mock(); + private readonly Mock _externalAppDetailsRepository = new Mock(); + + public MllPExtractTests() + { + _logger = new Mock>(); + _cancellationTokenSource = new CancellationTokenSource(); + _sut = new MllpExtract(_l7ApplicationConfigRepository.Object, _externalAppDetailsRepository.Object, _logger.Object); + } + + [Fact(DisplayName = "Constructor Should Throw on missing arguments")] + public void Constructor_Should_Throw_on_missing_arguments() + { + Assert.Throws(() => new MllpExtract(null, null, null)); + Assert.Throws(() => new MllpExtract(_l7ApplicationConfigRepository.Object, null, null)); + Assert.Throws(() => new MllpExtract(_l7ApplicationConfigRepository.Object, _externalAppDetailsRepository.Object, null)); + + new MllpExtract(_l7ApplicationConfigRepository.Object, _externalAppDetailsRepository.Object, _logger.Object); + } + + [Fact(DisplayName = "ParseConfig Should Return Correct Item")] + public void ParseConfig_Should_Return_Correct_Item() + { + var correctid = new Guid("00000000-0000-0000-0000-000000000002"); + var azCorrectid = new Guid("00000000-0000-0000-0000-000000000001"); + var configs = new List { + new Hl7ApplicationConfigEntity{ Id= new Guid("00000000-0000-0000-0000-000000000001"), SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "ABCDE" } }, + new Hl7ApplicationConfigEntity{ Id= correctid, SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "MD HOSPITAL" } }, + }; + + var message = new Message(SampleMessage); + var isParsed = message.ParseMessage(); + + var config = MllpExtract.GetConfig(configs, message); + Assert.Equal(correctid, config?.Id); + + message = new Message(ABCDEMessage); + isParsed = message.ParseMessage(); + + config = MllpExtract.GetConfig(configs, message); + Assert.Equal(azCorrectid, config?.Id); + } + + [Fact(DisplayName = "Should Set MetaData On Hl7FileStorageMetadata Object")] + public async Task Should_Set_MetaData_On_Hl7FileStorageMetadata_Object() + { + var correctid = new Guid("00000000-0000-0000-0000-000000000002"); + var azCorrectid = new Guid("00000000-0000-0000-0000-000000000001"); + var configs = new List { + new Hl7ApplicationConfigEntity{ + Id= new Guid("00000000-0000-0000-0000-000000000001"), + SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "ABCDE" } + ,DataLink = new DataKeyValuePair{ Key = "PID.1", Value = DataLinkType.StudyInstanceUid } + }, + new Hl7ApplicationConfigEntity{ Id= correctid, SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "MD HOSPITAL" } }, + }; + + _l7ApplicationConfigRepository + .Setup(x => x.GetAllAsync(new CancellationToken())) + .ReturnsAsync(configs); + + _externalAppDetailsRepository.Setup(x => x.GetByStudyIdOutboundAsync("{StudyInstanceUID}", It.IsAny())) + .ReturnsAsync(new ExternalAppDetails + { + WorkflowInstanceId = "WorkflowInstanceId2", + ExportTaskID = "ExportTaskID2", + CorrelationId = "CorrelationId2", + DestinationFolder = "DestinationFolder2" + }); + + var message = new Message(ABCDEMessage); + var isParsed = message.ParseMessage(); + + var meatData = new Hl7FileStorageMetadata { Id = "metaId", File = new StorageObjectMetadata("txt") }; + + await _sut.ExtractInfo(meatData, message); + + Assert.Equal("WorkflowInstanceId2", meatData.WorkflowInstanceId); + Assert.Equal("ExportTaskID2", meatData.TaskId); + Assert.Equal("CorrelationId2", meatData.CorrelationId); + Assert.StartsWith("DestinationFolder2", meatData.File.UploadPath); + } + + [Fact(DisplayName = "Should Set Original Patient And Study Uid")] + public async Task Should_Set_Original_Patient_And_Study_Uid() + { + var correctid = new Guid("00000000-0000-0000-0000-000000000002"); + var azCorrectid = new Guid("00000000-0000-0000-0000-000000000001"); + var configs = new List { + new Hl7ApplicationConfigEntity{ + Id= new Guid("00000000-0000-0000-0000-000000000001"), + SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "ABCDE" } + ,DataLink = new DataKeyValuePair{ Key = "PID.1", Value = DataLinkType.StudyInstanceUid }, + DataMapping = new List{ + new StringKeyValuePair { Key = "PID.1", Value = DicomTag.StudyInstanceUID.ToString() }, + new StringKeyValuePair { Key = "OBR.3", Value = DicomTag.PatientID.ToString() }, + } + + }, + new Hl7ApplicationConfigEntity{ Id= correctid, SendingId = new StringKeyValuePair{ Key = "MSH.4", Value = "MD HOSPITAL" } }, + }; + + _l7ApplicationConfigRepository + .Setup(x => x.GetAllAsync(new CancellationToken())) + .ReturnsAsync(configs); + + _externalAppDetailsRepository.Setup(x => x.GetByStudyIdOutboundAsync(It.IsAny(), It.IsAny())) + .ReturnsAsync(new ExternalAppDetails + { + WorkflowInstanceId = "WorkflowInstanceId2", + ExportTaskID = "ExportTaskID2", + CorrelationId = "CorrelationId2", + DestinationFolder = "DestinationFolder2", + PatientId = "PatentID", + StudyInstanceUid = "StudyInstanceId" + }); + + var message = new Message(ABCDEMessage); + var isParsed = message.ParseMessage(); + + var te = message.GetValue("OBR.1"); + + var meatData = new Hl7FileStorageMetadata { Id = "metaId", File = new StorageObjectMetadata("txt") }; + + + message = await _sut.ExtractInfo(meatData, message); + + Assert.Equal("PatentID", message.GetValue("OBR.3")); + Assert.Equal("PatentID", message.GetValue("PID.2")); + Assert.Equal("StudyInstanceId", message.GetValue("PID.1")); + Assert.Equal("StudyInstanceId", message.GetValue("OBR.1")); + + } + } +} diff --git a/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs b/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs old mode 100644 new mode 100755 index f9900619c..8b74f950f --- a/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs +++ b/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs @@ -20,6 +20,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using FellowOakDicom; using HL7.Dotnetcore; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Configuration; @@ -38,6 +39,7 @@ public class MllpClientTest private readonly Hl7Configuration _config; private readonly Mock> _logger; private readonly CancellationTokenSource _cancellationTokenSource; + private readonly Mock _mIIpExtract = new Mock(); public MllpClientTest() { @@ -52,11 +54,12 @@ public MllpClientTest() [Fact(DisplayName = "Constructor")] public void Constructor() { - Assert.Throws(() => new MllpClient(null, null, null)); - Assert.Throws(() => new MllpClient(_tcpClient.Object, null, null)); - Assert.Throws(() => new MllpClient(_tcpClient.Object, _config, null)); + Assert.Throws(() => new MllpClient(null, null, null, null)); + Assert.Throws(() => new MllpClient(_tcpClient.Object, null, null, null)); + Assert.Throws(() => new MllpClient(_tcpClient.Object, _config, null, null)); + Assert.Throws(() => new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, null)); - new MllpClient(_tcpClient.Object, _config, _logger.Object); + new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); } [Fact(DisplayName = "ReceiveData - records exception thrown by network stream")] @@ -67,7 +70,7 @@ public async Task ReceiveData_ExceptionReadingStream() .ThrowsAsync(new Exception("error")); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -90,7 +93,7 @@ public async Task ReceiveData_ZeroByte() .ReturnsAsync(0); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -125,7 +128,7 @@ public async Task ReceiveData_InvalidMessage() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -166,7 +169,7 @@ public async Task ReceiveData_DisabledAck() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -207,7 +210,7 @@ public async Task ReceiveData_NeverSendAck() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -248,7 +251,7 @@ public async Task ReceiveData_ExceptionSendingAck() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -288,7 +291,7 @@ public async Task ReceiveData_CompleteWorkflow() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { @@ -334,7 +337,7 @@ public async Task ReceiveData_CompleteWorkflow_WithMultipleMessages() }); _tcpClient.Setup(p => p.GetStream()).Returns(stream.Object); - var client = new MllpClient(_tcpClient.Object, _config, _logger.Object); + var client = new MllpClient(_tcpClient.Object, _config, _mIIpExtract.Object, _logger.Object); var action = new Func(async (client, results) => { diff --git a/src/InformaticsGateway/Test/Services/HealthLevel7/MllpServiceTest.cs b/src/InformaticsGateway/Test/Services/HealthLevel7/MllpServiceTest.cs index 0c8abe39e..403f51d71 100755 --- a/src/InformaticsGateway/Test/Services/HealthLevel7/MllpServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/HealthLevel7/MllpServiceTest.cs @@ -21,6 +21,7 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; +using HL7.Dotnetcore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -56,6 +57,7 @@ public class MllpServiceTest private readonly Mock> _logger; private readonly IServiceProvider _serviceProvider; private readonly Mock _storageInfoProvider; + private readonly Mock _mIIpExtract = new Mock(); public MllpServiceTest() { @@ -85,6 +87,7 @@ public MllpServiceTest() services.AddScoped(p => _payloadAssembler.Object); services.AddScoped(p => _fileSystem.Object); services.AddScoped(p => _storageInfoProvider.Object); + services.AddScoped(p => _mIIpExtract.Object); _serviceProvider = services.BuildServiceProvider(); _serviceScopeFactory.Setup(p => p.CreateScope()).Returns(_serviceScope.Object); @@ -134,7 +137,7 @@ public async Task GivenTcpConnections_WhenConnectsAndDisconnectsFromMllpService_ var actions = new Dictionary>(); var mllpClients = new List>(); var checkEvent = new CountdownEvent(5); - _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny>())) + _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Returns(() => { var client = new Mock(); @@ -182,7 +185,7 @@ public async Task GivenAMllpService_WhenMaximumConnectionLimitIsConfigure_Expect { var checkEvent = new CountdownEvent(_options.Value.Hl7.MaximumNumberOfConnections); var mllpClients = new List>(); - _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny>())) + _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Returns(() => { var client = new Mock(); @@ -216,7 +219,7 @@ public async Task GivenConnectedTcpClients_WhenDisconnects_ExpectServiceToDispos var checkEvent = new ManualResetEventSlim(); var client = new Mock(); var callCount = 0; - _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny>())) + _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Returns(() => { client.Setup(p => p.Start(It.IsAny>(), It.IsAny())) @@ -274,7 +277,9 @@ public async Task GivenATcpClientWithHl7Messages_WhenDisconnected_ExpectMessageT { var checkEvent = new ManualResetEventSlim(); var client = new Mock(); - _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny>())) + _mIIpExtract.Setup(e => e.ExtractInfo(It.IsAny(), It.IsAny())) + .ReturnsAsync((Hl7FileStorageMetadata meta, Message Msg) => Msg); + _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Returns(() => { client.Setup(p => p.Start(It.IsAny>(), It.IsAny())) @@ -308,5 +313,48 @@ public async Task GivenATcpClientWithHl7Messages_WhenDisconnected_ExpectMessageT _uploadQueue.Verify(p => p.Queue(It.IsAny()), Times.Exactly(3)); _payloadAssembler.Verify(p => p.Queue(It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); } + + [RetryFact(10, 250)] + public async Task GivenATcpClientWithHl7Messages_WhenDisconnected_ExpectMessageToBeRePopulated() + { + var checkEvent = new ManualResetEventSlim(); + var client = new Mock(); + + _mIIpExtract.Setup(e => e.ExtractInfo(It.IsAny(), It.IsAny())) + .ReturnsAsync((Hl7FileStorageMetadata meta, Message Msg) => Msg); + + _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) + .Returns(() => + { + client.Setup(p => p.Start(It.IsAny>(), It.IsAny())) + .Callback, CancellationToken>((action, cancellationToken) => + { + var results = new MllpClientResult( + new List + { + new HL7.Dotnetcore.Message(""), + new HL7.Dotnetcore.Message(""), + new HL7.Dotnetcore.Message(""), + }, null); + action(client.Object, results); + checkEvent.Set(); + _cancellationTokenSource.Cancel(); + }); + client.Setup(p => p.Dispose()); + client.SetupGet(p => p.ClientId).Returns(Guid.NewGuid()); + return client.Object; + }); + + _tcpListener.Setup(p => p.AcceptTcpClientAsync(It.IsAny())) + .Returns(ValueTask.FromResult((new Mock()).Object)); + + var service = new MllpService(_serviceScopeFactory.Object, _options); + _ = service.StartAsync(_cancellationTokenSource.Token); + + Assert.True(checkEvent.Wait(3000)); + await Task.Delay(500).ConfigureAwait(false); + + _mIIpExtract.Verify(p => p.ExtractInfo(It.IsAny(), It.IsAny()), Times.Exactly(3)); + } } -} \ No newline at end of file +} diff --git a/src/InformaticsGateway/Test/Services/Http/Hl7ApplicationConfigControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/Hl7ApplicationConfigControllerTest.cs old mode 100644 new mode 100755 index 38d1bc89a..34dc2a2a8 --- a/src/InformaticsGateway/Test/Services/Http/Hl7ApplicationConfigControllerTest.cs +++ b/src/InformaticsGateway/Test/Services/Http/Hl7ApplicationConfigControllerTest.cs @@ -196,7 +196,7 @@ public async Task Put_GiveExpectedInput_ReturnsInternalServerError() var validApplicationEntity = ValidApplicationEntity("0001,0001"); _repo.Setup(r => r.GetByIdAsync(It.IsAny())) .ReturnsAsync(validApplicationEntity); - _repo.Setup(r => r.CreateAsync(It.IsAny(), It.IsAny())) + _repo.Setup(r => r.UpdateAsync(It.IsAny(), It.IsAny())) .Throws(new DatabaseException()); var result = await _controller.Put(validApplicationEntity); @@ -219,7 +219,7 @@ public async Task Post_GiveExpectedInput_ReturnsOK(string dicomStr) _repo.Setup(r => r.GetByIdAsync(It.IsAny())) .ReturnsAsync(validApplicationEntity); - _repo.Setup(r => r.UpdateAsync(It.IsAny(), It.IsAny())) + _repo.Setup(r => r.CreateAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(validApplicationEntity); var result = await _controller.Post(validApplicationEntity); @@ -309,7 +309,7 @@ public async Task Post_GiveExpectedInput_ReturnsInternalServerError2() var validApplicationEntity = ValidApplicationEntity("0001,0001"); _repo.Setup(r => r.GetByIdAsync(It.IsAny())) .ReturnsAsync(validApplicationEntity); - _repo.Setup(r => r.UpdateAsync(It.IsAny(), It.IsAny())) + _repo.Setup(r => r.CreateAsync(It.IsAny(), It.IsAny())) .Throws(new Exception()); var result = await _controller.Post(validApplicationEntity); diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json index f540f9174..5820049ac 100755 --- a/src/InformaticsGateway/Test/packages.lock.json +++ b/src/InformaticsGateway/Test/packages.lock.json @@ -31,11 +31,11 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "CcL5ajX+/OkafcP5OMplCBnIgSfaQy5BUjEZQKZ9BlspnwFFucy+wcE0LL1ycOlWcDYGI42FnQ45dD1Kcz+ZKA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "T1wFaHL0WS51PlrSzWfBX2qppMbuIserPUaSwrw6Uhvg4WllsQPKYqFGAZC9bbUAihjgY5es7MIgSEtXYNdLiw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22" + "Microsoft.EntityFrameworkCore": "6.0.25" } }, "Microsoft.NET.Test.Sdk": { @@ -419,19 +419,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -441,39 +441,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -579,10 +579,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "HB1Zp1NY9m+HwYKLZBgUfNIt0xXzm4APARDuAIPODl8pT4g10oOiEDN8asOzx/sfL9xM+Sse5Zne9L+6qYi/iA==", + "resolved": "6.0.25", + "contentHash": "9vz47iGkzqhh0bGqomOTxaJNEEajeNcbSTSWwhh9Soo9lWm0UdPbw04CxXCQJPhc0aw9OaMnOxx7sCcde8/adA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" @@ -590,17 +590,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "yvz+0r3qAt6gNEKlGSBO1BXMhtD3Tt8yzU59dHASolpwlSHvgqy0tEP6KXn3MPoKlPr0CiAHUdzOwYSoljzRSg==" + "resolved": "6.0.25", + "contentHash": "9sd1K/rp/vlxrBWNa0i8fgHCBPg94cocGMsJr7z9e2zQGQxMHNGpspdcy/FRGPAh2CINQet/RrM6Ef196xI20w==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "PNj+/e/GCJh3ZNzxEGhkMpKJgmmbuGar6Uk/R3mPFZacTx6lBdLs4Ev7uf4XQWqTdJe56rK+2P3oF/9jIGbxgw==", + "resolved": "6.0.25", + "contentHash": "Cmhq0sgb53+dh9xHOlBEQUhi13vsZeQ4fcYC9JYO4med7pabj9x3100opCdUv+7UX+tUC1GPm/nco+1skJdLFA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -816,8 +816,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -827,10 +827,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -2075,7 +2075,7 @@ "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "NLog.Web.AspNetCore": "[5.3.4, )", @@ -2086,10 +2086,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -2118,7 +2118,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.22, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.25, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -2138,8 +2138,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", @@ -2168,9 +2168,9 @@ "monai.deploy.informaticsgateway.plugins.remoteappexecution": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json index a574afbed..630572169 100755 --- a/src/InformaticsGateway/packages.lock.json +++ b/src/InformaticsGateway/packages.lock.json @@ -18,13 +18,23 @@ "resolved": "2.36.0", "contentHash": "N1HLMeIqYuY+4O69ItgZJoDBnnpNkK5N2pClceTJ2nFJxsP48iCsA4iz3tm43Yszi4r/vaThoc3UoLBfGP3vKw==" }, + "Microsoft.EntityFrameworkCore.Design": { + "type": "Direct", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "YawyMKj1f+GkwHrxMIf9tX84sMGgLFa5YoRmyuUugGhffiubkVLYIrlm4W0uSy2NzX4t6+V7keFLQf7lRQvDmA==", + "dependencies": { + "Humanizer.Core": "2.8.26", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25" + } + }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.5-rc0006, )", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "requested": "[1.0.5, )", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -76,16 +86,6 @@ "Swashbuckle.AspNetCore.SwaggerUI": "6.5.0" } }, - "AideDicomTools": { - "type": "Transitive", - "resolved": "0.1.1-rc0062", - "contentHash": "9m4nJ5FyKCdmj/hcnPxwKVgerZbxsBT4imyLUmfK+0S+CuRsGurXOVxH3ePKBq8tUbdzv/72pQV1ZaLa8+qj5g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "MongoDB.Driver": "2.21.0", - "fo-dicom": "5.1.1" - } - }, "Ardalis.GuardClauses": { "type": "Transitive", "resolved": "4.1.1", @@ -152,6 +152,11 @@ "System.Threading.Channels": "6.0.0" } }, + "Humanizer.Core": { + "type": "Transitive", + "resolved": "2.8.26", + "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A==" + }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", @@ -191,19 +196,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -213,39 +218,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -299,24 +304,6 @@ "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Configuration.CommandLine": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, "Microsoft.Extensions.Configuration.FileExtensions": { "type": "Transitive", "resolved": "6.0.0", @@ -341,17 +328,6 @@ "System.Text.Json": "6.0.0" } }, - "Microsoft.Extensions.Configuration.UserSecrets": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0" - } - }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.1", @@ -380,10 +356,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "HB1Zp1NY9m+HwYKLZBgUfNIt0xXzm4APARDuAIPODl8pT4g10oOiEDN8asOzx/sfL9xM+Sse5Zne9L+6qYi/iA==", + "resolved": "6.0.25", + "contentHash": "9vz47iGkzqhh0bGqomOTxaJNEEajeNcbSTSWwhh9Soo9lWm0UdPbw04CxXCQJPhc0aw9OaMnOxx7sCcde8/adA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" @@ -391,17 +367,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "yvz+0r3qAt6gNEKlGSBO1BXMhtD3Tt8yzU59dHASolpwlSHvgqy0tEP6KXn3MPoKlPr0CiAHUdzOwYSoljzRSg==" + "resolved": "6.0.25", + "contentHash": "9sd1K/rp/vlxrBWNa0i8fgHCBPg94cocGMsJr7z9e2zQGQxMHNGpspdcy/FRGPAh2CINQet/RrM6Ef196xI20w==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "PNj+/e/GCJh3ZNzxEGhkMpKJgmmbuGar6Uk/R3mPFZacTx6lBdLs4Ev7uf4XQWqTdJe56rK+2P3oF/9jIGbxgw==", + "resolved": "6.0.25", + "contentHash": "Cmhq0sgb53+dh9xHOlBEQUhi13vsZeQ4fcYC9JYO4med7pabj9x3100opCdUv+7UX+tUC1GPm/nco+1skJdLFA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -427,34 +403,6 @@ "resolved": "6.0.0", "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" }, - "Microsoft.Extensions.Hosting": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Microsoft.Extensions.Logging.Debug": "6.0.0", - "Microsoft.Extensions.Logging.EventLog": "6.0.0", - "Microsoft.Extensions.Logging.EventSource": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" - } - }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -497,55 +445,6 @@ "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0" } }, - "Microsoft.Extensions.Logging.Console": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.Debug": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.EventLog": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.EventSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", @@ -662,8 +561,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1072,11 +971,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" - }, "System.Diagnostics.Tools": { "type": "Transitive", "resolved": "4.3.0", @@ -1798,32 +1692,14 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "monai-deploy-informatics-gateway-pseudonymisation": { - "type": "Project", - "dependencies": { - "AideDicomTools": "[0.1.1-rc0062, )", - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", - "Microsoft.Extensions.Configuration": "[6.0.0, )", - "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", - "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "MongoDB.Driver": "[2.21.0, )", - "NLog": "[5.2.3, )", - "Polly": "[7.2.4, )", - "fo-dicom": "[5.1.1, )" - } - }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -1852,7 +1728,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.22, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.25, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1872,8 +1748,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", @@ -1902,9 +1778,9 @@ "monai.deploy.informaticsgateway.plugins.remoteappexecution": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", diff --git a/src/Plug-ins/RemoteAppExecution/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.csproj b/src/Plug-ins/RemoteAppExecution/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.csproj index bf2bc0cd2..b02fccd0a 100755 --- a/src/Plug-ins/RemoteAppExecution/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.csproj +++ b/src/Plug-ins/RemoteAppExecution/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.csproj @@ -47,13 +47,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Plug-ins/RemoteAppExecution/Test/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.Test.csproj b/src/Plug-ins/RemoteAppExecution/Test/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.Test.csproj old mode 100644 new mode 100755 index a1070e061..22f46686c --- a/src/Plug-ins/RemoteAppExecution/Test/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.Test.csproj +++ b/src/Plug-ins/RemoteAppExecution/Test/Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.Test.csproj @@ -43,9 +43,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json b/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json index 0437f4a5d..4d70f5c72 100755 --- a/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json +++ b/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json @@ -10,31 +10,31 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "CcL5ajX+/OkafcP5OMplCBnIgSfaQy5BUjEZQKZ9BlspnwFFucy+wcE0LL1ycOlWcDYGI42FnQ45dD1Kcz+ZKA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "T1wFaHL0WS51PlrSzWfBX2qppMbuIserPUaSwrw6Uhvg4WllsQPKYqFGAZC9bbUAihjgY5es7MIgSEtXYNdLiw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22" + "Microsoft.EntityFrameworkCore": "6.0.25" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -171,19 +171,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -193,20 +193,20 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, @@ -449,8 +449,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -460,10 +460,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1596,10 +1596,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -1629,9 +1629,9 @@ "monai.deploy.informaticsgateway.plugins.remoteappexecution": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", diff --git a/src/Plug-ins/RemoteAppExecution/packages.lock.json b/src/Plug-ins/RemoteAppExecution/packages.lock.json index 9e91af417..5c4215fea 100755 --- a/src/Plug-ins/RemoteAppExecution/packages.lock.json +++ b/src/Plug-ins/RemoteAppExecution/packages.lock.json @@ -4,12 +4,12 @@ "net6.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -19,31 +19,31 @@ }, "Microsoft.EntityFrameworkCore.Design": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "es9TKd0cpM263Ou0QMEETN7MDzD7kXDkThiiXl1+c/69v97AZlzeLoM5tDdC0RC4L74ZWyk3+WMnoDPL93DDyQ==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "YawyMKj1f+GkwHrxMIf9tX84sMGgLFa5YoRmyuUugGhffiubkVLYIrlm4W0uSy2NzX4t6+V7keFLQf7lRQvDmA==", "dependencies": { "Humanizer.Core": "2.8.26", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25" } }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -191,29 +191,29 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -378,8 +378,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -389,10 +389,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -590,10 +590,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index b40e1cf42..2d79b05c2 100755 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -30,15 +30,15 @@ - - + + - + diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json index bf3fee9d0..c3b9e5483 100755 --- a/tests/Integration.Test/packages.lock.json +++ b/tests/Integration.Test/packages.lock.json @@ -44,12 +44,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "vNe+y8ZsEf1CsfmfYttfKAz/IgCCtphgguvao0HWNJNdjZf9cabD288nZJ17b/WaQMWXhLwYAsofk8vNVkfTOA==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "txcqw2xrmvMoTIgzAdUk8JHLELofGgTK3i6glswVZs4SC8BOU1M/iSAtwMIVtAtfzxuBIUAbHPx+Ly6lfkYe7g==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.22", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.22", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.25", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.25", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -59,11 +59,11 @@ }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==", + "requested": "[6.0.25, )", + "resolved": "6.0.25", + "contentHash": "vaQNuXgUN0nIzFXQiPSb9iAaJqLvZA164Sx9mjF5rFQS5cwQ/AiymF0e4J0QH3P07Mf3zEVZE5u2fTO0NacuMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.25", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -132,11 +132,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.5-rc0006, )", - "resolved": "1.0.5-rc0006", - "contentHash": "luSfBhU4hFwyGk7SS05sfKHwxcCYjXimfmaTjNDjFKKjIYbd3IPm8lYDPSiszbZB53jpgNvYDy+aWJY8YlVXZg==", + "requested": "[1.0.5, )", + "resolved": "1.0.5", + "contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.5-rc0006", + "Monai.Deploy.Messaging": "1.0.5", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -345,38 +345,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==", + "resolved": "6.0.25", + "contentHash": "rbXNoMg/ylGyJxLcyetojuXFzvDG85M31DfFbqL8veN4P8oG6wmnPwWNn3/bDIEDVvdw15R092dxpobQeQcjGg==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "3ycEYrtWoa4kv5mUECU2LNBbWiYh345b1uQLvg4pHCEICXoJZ8Sfu/2yGloKiMNgMdDc02gFYCRHxsqQNZpnWA==" + "resolved": "6.0.25", + "contentHash": "DalO25C96LsIfAPlyizyun9y1XrIquRugPEGXC8+z7dFo+GyU0LRd0R11JDd3rJWjR18NOFYwqNenjyDpNRO3A==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "82SZfdrLe7bdDB8/3INV0UULvlUzsdHkrEYylDCrzFXRWHXG9eO5jJQjRHU8j9XkGIN+MSPgIlczBnqeDvB36A==" + "resolved": "6.0.25", + "contentHash": "i6UpdWqWxSBbIFOkaMoubM40yIjTZO+0rIUkY5JRltSeFI4PzncBBQcNVNXXjAmiLXF/xY0xTS+ykClbkV46Yg==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==", + "resolved": "6.0.25", + "contentHash": "ci2lR++x7R7LR71+HoeRnB9Z5VeOQ1ILLbFRhsjjWZyLrAMkdq7TK9Ll47jo1TXDWF8Ddeap1JgcptgPKkWSRA==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.22", + "Microsoft.EntityFrameworkCore": "6.0.25", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==", + "resolved": "6.0.25", + "contentHash": "IU4E8I9FS2sUVxJJ0w/4jogLQ8C0zvu/SO6b1tRmiiCtTrHhjUB0tqhxjrFnDXZ/mpCJOElw50+qhbcElm0CYw==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.22", - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", + "Microsoft.Data.Sqlite.Core": "6.0.25", + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -453,10 +453,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "HB1Zp1NY9m+HwYKLZBgUfNIt0xXzm4APARDuAIPODl8pT4g10oOiEDN8asOzx/sfL9xM+Sse5Zne9L+6qYi/iA==", + "resolved": "6.0.25", + "contentHash": "9vz47iGkzqhh0bGqomOTxaJNEEajeNcbSTSWwhh9Soo9lWm0UdPbw04CxXCQJPhc0aw9OaMnOxx7sCcde8/adA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" @@ -464,17 +464,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "yvz+0r3qAt6gNEKlGSBO1BXMhtD3Tt8yzU59dHASolpwlSHvgqy0tEP6KXn3MPoKlPr0CiAHUdzOwYSoljzRSg==" + "resolved": "6.0.25", + "contentHash": "9sd1K/rp/vlxrBWNa0i8fgHCBPg94cocGMsJr7z9e2zQGQxMHNGpspdcy/FRGPAh2CINQet/RrM6Ef196xI20w==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "PNj+/e/GCJh3ZNzxEGhkMpKJgmmbuGar6Uk/R3mPFZacTx6lBdLs4Ev7uf4XQWqTdJe56rK+2P3oF/9jIGbxgw==", + "resolved": "6.0.25", + "contentHash": "Cmhq0sgb53+dh9xHOlBEQUhi13vsZeQ4fcYC9JYO4med7pabj9x3100opCdUv+7UX+tUC1GPm/nco+1skJdLFA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.22" + "Microsoft.EntityFrameworkCore.Relational": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.25", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.25" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -666,8 +666,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.5-rc0006", - "contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==", + "resolved": "1.0.5", + "contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1954,7 +1954,7 @@ "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "NLog.Web.AspNetCore": "[5.3.4, )", @@ -1965,10 +1965,10 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.22, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.25, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[1.0.5-rc0006, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5-rc0006, )", + "Monai.Deploy.Messaging": "[1.0.5, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.5, )", "Monai.Deploy.Storage": "[0.2.18, )", "fo-dicom": "[5.1.1, )" } @@ -2004,7 +2004,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.22, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.25, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -2024,8 +2024,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )", @@ -2054,9 +2054,9 @@ "monai.deploy.informaticsgateway.plugins.remoteappexecution": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Relational": "[6.0.22, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )", + "Microsoft.EntityFrameworkCore": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.25, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.25, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )",