diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6545b5ddd..788bb5ac9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -127,7 +127,7 @@ jobs: cache: yes - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -180,7 +180,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -259,7 +259,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -281,7 +281,7 @@ jobs: popd - name: Upload Integration Test Results - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 if: always() with: name: integration-${{ matrix.feature }} @@ -323,7 +323,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -359,7 +359,7 @@ jobs: dir -r ~/release - name: Upload CLI - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: artifacts path: ~/release @@ -436,7 +436,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v3.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -473,7 +473,7 @@ jobs: Get-ChildItem ~\release -Recurse - name: Upload docs - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: artifacts path: ~/release diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 457d83411..01f54b686 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -39,7 +39,7 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/castleproject/Core/raw/master/LICENSE) :versions: - - 5.1.0 + - 5.1.1 :when: 2022-08-16 23:05:30.666349504 Z - - :approve - ConsoleAppFramework @@ -102,7 +102,7 @@ - :who: mocsharp :why: MIT (https://github.com/GitTools/GitVersion/raw/main/LICENSE) :versions: - - 5.11.1 + - 5.12.0 :when: 2022-08-16 23:05:34.633372053 Z - - :approve - HL7-dotnetcore @@ -319,70 +319,70 @@ - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE) :versions: - - 17.4.0 + - 17.4.1 :when: 2022-08-16 23:05:48.342748414 Z - - :approve - Microsoft.Data.Sqlite.Core - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.12 + - 6.0.13 :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.12 + - 6.0.13 :when: 2022-08-16 23:05:50.137694970 Z - - :approve - Microsoft.EntityFrameworkCore.Abstractions - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.12 + - 6.0.13 :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.12 + - 6.0.13 :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.12 + - 6.0.13 :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.12 + - 6.0.13 :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.12 + - 6.0.13 :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.12 + - 6.0.13 :when: 2022-08-16 23:05:53.270526921 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite.Core - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.12 + - 6.0.13 :when: 2022-08-16 23:05:53.706997823 Z - - :approve - Microsoft.Extensions.ApiDescription.Server @@ -524,7 +524,7 @@ :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - 6.0.11 - - 6.0.12 + - 6.0.13 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions @@ -532,7 +532,7 @@ :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - 6.0.11 - - 6.0.12 + - 6.0.13 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore @@ -540,7 +540,7 @@ :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - 6.0.11 - - 6.0.12 + - 6.0.13 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions @@ -689,7 +689,7 @@ - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/microsoft/vstest/main/LICENSE) :versions: - - 17.4.0 + - 17.4.1 :when: 2022-09-01 23:06:13.008314524 Z - - :approve - Microsoft.NETCore.Platforms @@ -739,14 +739,14 @@ - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - - 17.4.0 + - 17.4.1 :when: 2022-08-16 23:06:16.175705981 Z - - :approve - Microsoft.TestPlatform.TestHost - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - - 17.4.0 + - 17.4.1 :when: 2022-08-16 23:06:17.671459450 Z - - :approve - Microsoft.Toolkit.HighPerformance @@ -831,14 +831,8 @@ :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) :versions: - 4.18.1 + - 4.18.4 :when: 2022-08-16 23:06:23.359197359 Z -- - :approve - - Moq - - :who: mocsharp - :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) - :versions: - - 4.18.3 - :when: 2022-08-16 23:06:23.843184482 Z - - :approve - NETStandard.Library - :who: mocsharp @@ -972,28 +966,28 @@ - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.4.0 + - 6.5.0 :when: 2022-08-16 23:06:33.817705411 Z - - :approve - Swashbuckle.AspNetCore.Swagger - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.4.0 + - 6.5.0 :when: 2022-08-16 23:06:34.264757523 Z - - :approve - Swashbuckle.AspNetCore.SwaggerGen - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.4.0 + - 6.5.0 :when: 2022-08-16 23:06:34.716116883 Z - - :approve - Swashbuckle.AspNetCore.SwaggerUI - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.4.0 + - 6.5.0 :when: 2022-08-16 23:06:35.164249703 Z - - :approve - System.AppContext @@ -2222,7 +2216,7 @@ - :who: mocsharp :why: MIT (https://github.com/JoshKeegan/xRetry/raw/master/LICENSE) :versions: - - 1.8.0 + - 1.9.0 :when: 2022-08-16 23:07:57.794503140 Z - - :approve - xunit @@ -2341,21 +2335,21 @@ - :who: mocsharp :why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt) :versions: - - 5.1.0 + - 5.1.1 :when: 2022-10-12 03:14:06.538744982 Z - - :approve - NLog.Extensions.Logging - :who: mocsharp :why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE) :versions: - - 5.2.0 + - 5.2.1 :when: 2022-10-12 03:14:06.964203977 Z - - :approve - NLog.Web.AspNetCore - :who: mocsharp :why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE) :versions: - - 5.2.0 + - 5.2.1 :when: 2022-10-12 03:14:07.396706995 Z - - :approve - fo-dicom.NLog @@ -2397,28 +2391,28 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.18.0 + - 2.19.0 :when: 2022-11-16 23:38:53.891380809 Z - - :approve - MongoDB.Driver - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.18.0 + - 2.19.0 :when: 2022-11-16 23:38:54.213853364 Z - - :approve - MongoDB.Driver.Core - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.18.0 + - 2.19.0 :when: 2022-11-16 23:38:54.553730219 Z - - :approve - MongoDB.Libmongocrypt - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 1.6.0 + - 1.7.0 :when: 2022-11-16 23:38:54.863359236 Z - - :approve - SharpCompress diff --git a/docs/api/rest/fhir.md b/docs/api/rest/fhir.md index dd5df8f88..a45525e23 100644 --- a/docs/api/rest/fhir.md +++ b/docs/api/rest/fhir.md @@ -14,7 +14,7 @@ ~ limitations under the License. --> -# DICOMWeb STOW-RS APIs +# FHIR APIs The `fhir/` endpoint implements the specifications defined in [section 3.1.0 RESTful API](http://hl7.org/implement/standards/fhir/http.html) defined by HL7 (Health Level 7 International) to enable triggering new workflows. The FHIR service supports multiple versions of the Fast Healthcare Interoperability Resources (FHIR) specifications published by Health Level 7 International (HL7). diff --git a/docs/api/rest/toc.yml b/docs/api/rest/toc.yml index 27d12f266..439ca319d 100644 --- a/docs/api/rest/toc.yml +++ b/docs/api/rest/toc.yml @@ -14,6 +14,10 @@ - name: Configuration href: config.md +- name: DICOMWeb STOW + href: dicomweb-stow.md +- name: FHIR + href: fhir.md - name: Health href: health.md - name: Inference Request diff --git a/docs/changelog.md b/docs/changelog.md index fd98e7830..63ee8e9f7 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,6 +17,14 @@ # Changelog +## 0.3.8 + +[GitHub Milestone 0.3.8](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/14) + +- Clears payloads that are created by the same instance of MIG at startup. +- Fixes bad Mongodb configuration resulted in GUIDs not being (de)serialized correctly. + + ## 0.3.7 [GitHub Milestone 0.3.7](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/13) diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index 7a14db599..2d8e9585c 100644 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -27,11 +27,11 @@ - + All - + diff --git a/src/Api/Storage/Payload.cs b/src/Api/Storage/Payload.cs index 5b601e07a..fb46d5ea4 100644 --- a/src/Api/Storage/Payload.cs +++ b/src/Api/Storage/Payload.cs @@ -46,12 +46,14 @@ public enum PayloadState private readonly Stopwatch _lastReceived; private bool _disposedValue; - public Guid PayloadId { get; } + public Guid PayloadId { get; private set; } public uint Timeout { get; init; } public string Key { get; init; } + public string? MachineName { get; init; } + public DateTime DateTimeCreated { get; private set; } public int RetryCount { get; set; } @@ -81,6 +83,7 @@ public Payload(string key, string correlationId, uint timeout) _lastReceived = new Stopwatch(); CorrelationId = correlationId; + MachineName = Environment.MachineName; DateTimeCreated = DateTime.UtcNow; PayloadId = Guid.NewGuid(); Key = key; diff --git a/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj b/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj index 4a04855a4..7825a3077 100644 --- a/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj +++ b/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj @@ -33,9 +33,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Api/Test/packages.lock.json b/src/Api/Test/packages.lock.json index 1babfad02..9cfd72763 100644 --- a/src/Api/Test/packages.lock.json +++ b/src/Api/Test/packages.lock.json @@ -10,12 +10,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "System.IO.Abstractions.TestingHelpers": { @@ -29,9 +29,9 @@ }, "xRetry": { "type": "Direct", - "requested": "[1.8.0, )", - "resolved": "1.8.0", - "contentHash": "H8KXWHBjQASwD4y/7L2j7j4KLmg8z4+mCV4atrhZvJVnCkVSKLkWe1lfKGmaCYkKt2dJnC4yH+tJXGqthSkGGg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "NeIbJrwpc5EUPagx/mdd/7KzpR36BO8IWrsbgtvOVjxD2xtmNfUHieZ24PeZ4oCYiLBcTviCy+og/bE/OvPchw==", "dependencies": { "xunit.core": "[2.4.0, 3.0.0)" } @@ -107,13 +107,13 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -226,8 +226,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -235,10 +235,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1267,20 +1267,20 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 5a6e87970..33d1dc770 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Macross.Json.Extensions": { "type": "Direct", @@ -16,9 +16,9 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Monai.Deploy.Messaging": { "type": "Direct", @@ -279,10 +279,10 @@ "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj index b04005958..fbe64001b 100644 --- a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj +++ b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj @@ -51,7 +51,7 @@ - + All diff --git a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj index 481dc7af9..aa07db4db 100644 --- a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj +++ b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj @@ -33,11 +33,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/CLI/Test/packages.lock.json b/src/CLI/Test/packages.lock.json index bfff2f281..f00960bd3 100644 --- a/src/CLI/Test/packages.lock.json +++ b/src/CLI/Test/packages.lock.json @@ -10,21 +10,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "System.CommandLine.Hosting": { @@ -49,9 +49,9 @@ }, "xRetry": { "type": "Direct", - "requested": "[1.8.0, )", - "resolved": "1.8.0", - "contentHash": "H8KXWHBjQASwD4y/7L2j7j4KLmg8z4+mCV4atrhZvJVnCkVSKLkWe1lfKGmaCYkKt2dJnC4yH+tJXGqthSkGGg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "NeIbJrwpc5EUPagx/mdd/7KzpR36BO8IWrsbgtvOVjxD2xtmNfUHieZ24PeZ4oCYiLBcTviCy+og/bE/OvPchw==", "dependencies": { "xunit.core": "[2.4.0, 3.0.0)" } @@ -96,8 +96,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -159,8 +159,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -169,8 +169,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -474,8 +474,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -483,10 +483,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1553,53 +1553,53 @@ "mig-cli": { "type": "Project", "dependencies": { - "Crayon": "2.0.69", - "Docker.DotNet": "3.125.12", - "Microsoft.Extensions.Hosting": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Client": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "System.CommandLine": "2.0.0-beta4.22272.1", - "System.CommandLine.Hosting": "0.4.0-alpha.22272.1", - "System.CommandLine.Rendering": "0.4.0-alpha.22272.1", - "System.IO.Abstractions": "17.2.3" + "Crayon": "[2.0.69, )", + "Docker.DotNet": "[3.125.12, )", + "Microsoft.Extensions.Hosting": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Logging.Console": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Client": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "System.CommandLine": "[2.0.0-beta4.22272.1, )", + "System.CommandLine.Hosting": "[0.4.0-alpha.22272.1, )", + "System.CommandLine.Rendering": "[0.4.0-alpha.22272.1, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.client": { "type": "Project", "dependencies": { - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0" + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json index f5245a9a1..91f915c56 100644 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -21,9 +21,9 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Microsoft.Extensions.Hosting": { "type": "Direct", @@ -182,8 +182,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -1421,36 +1421,36 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.client": { "type": "Project", "dependencies": { - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0" + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj index 1d7713966..4d47d403b 100644 --- a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj +++ b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj @@ -28,7 +28,7 @@ - + All diff --git a/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj b/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj index 8ebbc2f44..0a4483cbc 100644 --- a/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj +++ b/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj @@ -31,14 +31,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Client.Common/Test/packages.lock.json b/src/Client.Common/Test/packages.lock.json index 0c9173250..003cdee47 100644 --- a/src/Client.Common/Test/packages.lock.json +++ b/src/Client.Common/Test/packages.lock.json @@ -19,28 +19,28 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "xRetry": { "type": "Direct", - "requested": "[1.8.0, )", - "resolved": "1.8.0", - "contentHash": "H8KXWHBjQASwD4y/7L2j7j4KLmg8z4+mCV4atrhZvJVnCkVSKLkWe1lfKGmaCYkKt2dJnC4yH+tJXGqthSkGGg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "NeIbJrwpc5EUPagx/mdd/7KzpR36BO8IWrsbgtvOVjxD2xtmNfUHieZ24PeZ4oCYiLBcTviCy+og/bE/OvPchw==", "dependencies": { "xunit.core": "[2.4.0, 3.0.0)" } @@ -64,8 +64,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -77,8 +77,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -92,8 +92,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -101,10 +101,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1086,8 +1086,8 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } } } diff --git a/src/Client.Common/packages.lock.json b/src/Client.Common/packages.lock.json index 2b8dfa262..8f3d6535a 100644 --- a/src/Client.Common/packages.lock.json +++ b/src/Client.Common/packages.lock.json @@ -13,9 +13,9 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "System.Text.Json": { "type": "Direct", diff --git a/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj b/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj index ea2ce1a6f..ec8adbd0f 100644 --- a/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj +++ b/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj @@ -25,7 +25,7 @@ - + All diff --git a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj index b5870bd14..ff5c6b1a9 100644 --- a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj +++ b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj @@ -33,13 +33,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json index f49806ad4..eda715042 100644 --- a/src/Client/Test/packages.lock.json +++ b/src/Client/Test/packages.lock.json @@ -10,21 +10,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "xunit": { @@ -76,8 +76,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -190,8 +190,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -200,19 +200,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -222,39 +222,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -389,10 +389,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TdsjGYOHDg8656T2tWHUXNkYFUFstL/L9GEjboasuAetubH52yHkNpQV6WuqA6BpbfZHZj8xwKqN7aL7ZWO1Rg==", + "resolved": "6.0.13", + "contentHash": "uuKZ6qDgghq8uYUvZj/QuVe4+vH/N1KxbrSTnW86/u5DzrFMuiyCt80OLt/XmetwMZwZjpHC/F/9aaQ9u7kIQg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.3", "Microsoft.Extensions.Options": "6.0.0" @@ -400,17 +400,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "7GN8C+pcaIBMDQA6OOgBEWT+1Y/OhZTxzovNXIxxBsfU4xI7bmjez5321ya5rN2NbJXUmStNnJics78RkPQO4w==" + "resolved": "6.0.13", + "contentHash": "NVV3zsB1tGV70kNDACH3Os7Lt66hspVayN3LpNgnyfxAfq/TL4cCU4yZgwWUCvWs0Nx6o0Di5h8Q75Aehl9q0Q==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TWtq9Hnjq8mTHbbe2JBLa5FR7wlxecFK/PjYQFWru+BVCWCXvRtscO/+S9/Dlz5XkgNzEfLwO9KvUqoh3EybtA==", + "resolved": "6.0.13", + "contentHash": "zm2bGsjCK42VQkVddXtvo7sI4cyX50MREIOqOhfeibV7VSqHVjbplvPd7f6U3vJBQ12n+uNg+jprqUwi00ia+w==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -662,8 +662,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -671,10 +671,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -784,32 +784,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -818,8 +819,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "NETStandard.Library": { "type": "Transitive", @@ -845,25 +846,25 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" + "resolved": "5.1.1", + "contentHash": "YBfUDzipCaucs+8ieCDp8XECumiWsQbZwSUVLlt9i7FGV03nOPqoVzLtmlhbTxq4TN92BBsLacqPAE/ZyDDJ1g==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "wzVFG5p8Nwbs1Ws29T8YJg+UbJfsh61h6U4xArnDSrtVvOoccwKtoFPZWwbym3ZTiTFmHIf7Ugu1j/WnT7z3vg==", + "resolved": "5.2.1", + "contentHash": "b16cdOklZ3gfeuiyewsAmR2It/55Ar+plwsyo7CjgfwZtH1c5B2ZyYIGt1Ho+fPMOKEHkPU/trXZqAg9Oipiiw==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.0" + "NLog": "5.1.1" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "DqFgdydAWW+pshPdzh0ydk2jJrrVaZmBNz5+p9K8N9q/4BOPJ94S2fD8t9erd7ZMhnigaqOq/HqZH4nGGOYTbA==", + "resolved": "5.2.1", + "contentHash": "yusksFxJxIoXJbU/aH9IJHmNKNNk2a9hYLSzd02kr7EX3Oc2+IRpp50VUEwZpq0tWEdlqYOUCLlzLMtHDHkxSA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.0" + "NLog.Extensions.Logging": "5.2.1" } }, "NuGet.Frameworks": { @@ -1025,35 +1026,35 @@ }, "Swashbuckle.AspNetCore": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", + "resolved": "6.5.0", + "contentHash": "FK05XokgjgwlCI6wCT+D4/abtQkL1X1/B9Oas6uIwHFmYrIO9WUD5aLC9IzMs9GnHfUXOtXZ2S43gN1mhs5+aA==", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.5.0" } }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", + "resolved": "6.5.0", + "contentHash": "XWmCmqyFmoItXKFsQSwQbEAsjDKcxlNf1l+/Ki42hcb6LjKL8m5Db69OTvz5vLonMSRntYO1XLqz0OP+n3vKnA==", "dependencies": { "Microsoft.OpenApi": "1.2.3" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", + "resolved": "6.5.0", + "contentHash": "Y/qW8Qdg9OEs7V013tt+94OdPxbRdbhcEbw4NiwGvf4YBcfhL/y7qp/Mjv/cENsQ2L3NqJ2AOu94weBy/h4KvA==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" + "resolved": "6.5.0", + "contentHash": "OvbvxX+wL8skxTBttcBsVxdh73Fag4xwqEU2edh4JMn7Ws/xJHnY/JB1e9RoCb6XpDxUF3hD9A0Z1lEUx40Pfw==" }, "System.Buffers": { "type": "Transitive", @@ -1672,10 +1673,10 @@ "DotNext.Threading": "[4.7.4, )", "HL7-dotnetcore": "[2.29.0, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.12, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.13, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1690,10 +1691,10 @@ "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.13, )", "Monai.Deploy.Storage.MinIO": "[0.2.13, )", - "NLog": "[5.1.0, )", - "NLog.Web.AspNetCore": "[5.2.0, )", + "NLog": "[5.1.1, )", + "NLog.Web.AspNetCore": "[5.2.1, )", "Polly": "[7.2.3, )", - "Swashbuckle.AspNetCore": "[6.4.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )", "fo-dicom": "[5.0.3, )", "fo-dicom.NLog": "[5.0.3, )" } @@ -1702,7 +1703,7 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", "Monai.Deploy.Messaging": "[0.1.19, )", "Monai.Deploy.Storage": "[0.2.13, )" @@ -1711,26 +1712,26 @@ "monai.deploy.informaticsgateway.client": { "type": "Project", "dependencies": { - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0" + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { @@ -1749,11 +1750,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1765,7 +1766,7 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", "Polly": "[7.2.3, )" @@ -1774,8 +1775,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -1787,21 +1788,21 @@ "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "MongoDB.Driver": "2.18.0", - "MongoDB.Driver.Core": "2.18.0" + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Microsoft.Net.Http.Headers": "2.2.8", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", - "System.Linq.Async": "6.0.1", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Net.Http.Headers": "[2.2.8, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", + "System.Linq.Async": "[6.0.1, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json index e1efacf6b..c05c90703 100644 --- a/src/Client/packages.lock.json +++ b/src/Client/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Microsoft.AspNet.WebApi.Client": { "type": "Direct", @@ -84,8 +84,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -1182,27 +1182,27 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj index 4a74ecd74..5f6b10313 100644 --- a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj +++ b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj @@ -30,7 +30,7 @@ - + All diff --git a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj index 8f6a9cfc6..2ddd4c4c5 100644 --- a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj +++ b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj @@ -29,8 +29,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Common/Test/packages.lock.json b/src/Common/Test/packages.lock.json index 519ca4b70..1f9a690f9 100644 --- a/src/Common/Test/packages.lock.json +++ b/src/Common/Test/packages.lock.json @@ -10,21 +10,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "System.IO.Abstractions": { @@ -69,8 +69,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -103,8 +103,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", @@ -150,8 +150,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -159,10 +159,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1163,10 +1163,10 @@ "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json index 9a2b36402..2f146e49d 100644 --- a/src/Common/packages.lock.json +++ b/src/Common/packages.lock.json @@ -30,9 +30,9 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "System.IO.Abstractions": { "type": "Direct", diff --git a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj index 3c7961289..f4cfdd412 100644 --- a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj @@ -26,7 +26,7 @@ - + All diff --git a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj index 3853cb9c9..ba0769e32 100644 --- a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj +++ b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj @@ -34,8 +34,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Configuration/Test/packages.lock.json b/src/Configuration/Test/packages.lock.json index 6dd3029e8..114c1fca7 100644 --- a/src/Configuration/Test/packages.lock.json +++ b/src/Configuration/Test/packages.lock.json @@ -10,21 +10,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "System.IO.Abstractions.TestingHelpers": { @@ -76,8 +76,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -115,13 +115,13 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -234,8 +234,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -243,10 +243,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1280,32 +1280,32 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } } } diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 212a6d3ae..f76bcf8c3 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", @@ -114,8 +114,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -280,20 +280,20 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj index b34fdd51a..c6d71e477 100644 --- a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj +++ b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj index 7ae3ec3e5..aeafc16ff 100644 --- a/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj +++ b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj @@ -25,7 +25,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Database/Api/Test/packages.lock.json b/src/Database/Api/Test/packages.lock.json index 817c91935..1ee628df1 100644 --- a/src/Database/Api/Test/packages.lock.json +++ b/src/Database/Api/Test/packages.lock.json @@ -10,12 +10,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "xunit": { @@ -89,16 +89,16 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -108,13 +108,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -247,8 +247,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -256,10 +256,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1301,41 +1301,41 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } } } diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json index f42d478d5..5f6a548c0 100644 --- a/src/Database/Api/packages.lock.json +++ b/src/Database/Api/packages.lock.json @@ -4,12 +4,12 @@ "net6.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -77,13 +77,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -323,32 +323,32 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } } } diff --git a/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs b/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs index 71df8d733..0374ae130 100644 --- a/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs @@ -24,6 +24,7 @@ namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configuration { #pragma warning disable CS8604, CS8603 + internal class PayloadConfiguration : IEntityTypeConfiguration { public void Configure(EntityTypeBuilder builder) @@ -46,6 +47,7 @@ public void Configure(EntityTypeBuilder builder) builder.Property(j => j.RetryCount).IsRequired(); builder.Property(j => j.State).IsRequired(); builder.Property(j => j.CorrelationId).IsRequired(); + builder.Property(j => j.MachineName); builder.Property(j => j.Files) .HasConversion( v => JsonSerializer.Serialize(v, jsonSerializerSettings), @@ -62,5 +64,6 @@ public void Configure(EntityTypeBuilder builder) builder.HasIndex(p => new { p.CorrelationId, p.PayloadId }, "idx_payload_ids").IsUnique(); } } + #pragma warning restore CS8604, CS8603 } diff --git a/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.Designer.cs b/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.Designer.cs new file mode 100644 index 000000000..2baa6fcd4 --- /dev/null +++ b/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.Designer.cs @@ -0,0 +1,316 @@ +// +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("20230131233123_R3_0.3.8")] + partial class R3_038 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "6.0.13"); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.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.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("RemoteHost") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RemotePort") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("DicomAssociationHistories"); + }); + + modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.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("Grouping") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IgnoredSopClasses") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Timeout") + .HasColumnType("INTEGER"); + + 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("DateTimeCreated") + .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("Timeout") + .HasColumnType("INTEGER"); + + 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.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"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.cs b/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.cs new file mode 100644 index 000000000..5b56367b8 --- /dev/null +++ b/src/Database/EntityFramework/Migrations/20230131233123_R3_0.3.8.cs @@ -0,0 +1,25 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Monai.Deploy.InformaticsGateway.Database.Migrations +{ + public partial class R3_038 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "MachineName", + table: "Payloads", + type: "TEXT", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "MachineName", + table: "Payloads"); + } + } +} diff --git a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs index cd7dedcb3..dcce1e068 100644 --- a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs +++ b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs @@ -15,7 +15,7 @@ partial class InformaticsGatewayContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "6.0.12"); + modelBuilder.HasAnnotation("ProductVersion", "6.0.13"); modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DestinationApplicationEntity", b => { @@ -254,6 +254,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("TEXT"); + b.Property("MachineName") + .HasColumnType("TEXT"); + b.Property("RetryCount") .HasColumnType("INTEGER"); diff --git a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj index 8950f1f0e..40739f155 100644 --- a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj +++ b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj @@ -37,12 +37,12 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Database/EntityFramework/Repositories/PayloadRepository.cs b/src/Database/EntityFramework/Repositories/PayloadRepository.cs index 1e5a1499a..e70590acc 100644 --- a/src/Database/EntityFramework/Repositories/PayloadRepository.cs +++ b/src/Database/EntityFramework/Repositories/PayloadRepository.cs @@ -104,7 +104,7 @@ public async Task RemovePendingPayloadsAsync(CancellationToken cancellation return await _retryPolicy.ExecuteAsync(async () => { var count = 0; - await _dataset.Where(p => p.State == Payload.PayloadState.Created).ForEachAsync( + await _dataset.Where(p => p.State == Payload.PayloadState.Created && p.MachineName == Environment.MachineName).ForEachAsync( p => { _dataset.Remove(p); 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 index 8032a770e..6f8b0dda0 100644 --- 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,9 +25,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json index de72708b0..434b590ed 100644 --- a/src/Database/EntityFramework/Test/packages.lock.json +++ b/src/Database/EntityFramework/Test/packages.lock.json @@ -10,30 +10,30 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "6A42n1ehuWTIsqbOzcA82aNePXF+xrrSfiD0wbW99NCDpNra4m6A3EkFS1yb8hDkc7yY64BkNQV5YhsB/5UgBA==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "NEOR8DI3v3heJkWLhyu7LyoXLGB0qNlkABzkzQ+90/YTjFlQU/L/tbG2cKMsZXtk4hlTI10Xzn24h+YkUNustw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12" + "Microsoft.EntityFrameworkCore": "6.0.13" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "xunit": { @@ -76,8 +76,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -115,24 +115,24 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -142,39 +142,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -360,8 +360,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -369,10 +369,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1461,54 +1461,54 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", + "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )" } } } diff --git a/src/Database/EntityFramework/packages.lock.json b/src/Database/EntityFramework/packages.lock.json index 8df7a1ecc..48b9b341f 100644 --- 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.12, )", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "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.12, )", - "resolved": "6.0.12", - "contentHash": "R4rse/Dli8xqyDoQ0BVO8ECAEuwsDvu+qolTyvJl0mmFJodcxTHZQ8dUxxElqk+fTkiHE9rBMIZPoLE10ZCOCA==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "ycFZrBWsQNhd9icPPd/HatodZp0Y3oAsyhvwPIpElhRnh50VrJ/Jl/PyY0uekkvafMBbhN/XS2Xkk3BgDNh5Tg==", "dependencies": { "Humanizer.Core": "2.8.26", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -132,38 +132,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -470,41 +470,41 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } } } diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj index deb391d5c..4990cc54b 100644 --- a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj +++ b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj @@ -63,14 +63,14 @@ - + All - + - + diff --git a/src/Database/MongoDB/Configurations/InferenceRequestConfiguration.cs b/src/Database/MongoDB/Configurations/InferenceRequestConfiguration.cs index caa7721f5..9683ce426 100644 --- a/src/Database/MongoDB/Configurations/InferenceRequestConfiguration.cs +++ b/src/Database/MongoDB/Configurations/InferenceRequestConfiguration.cs @@ -16,10 +16,7 @@ */ using Monai.Deploy.InformaticsGateway.Api.Rest; -using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.Serialization.IdGenerators; -using MongoDB.Bson.Serialization.Serializers; namespace Monai.Deploy.InformaticsGateway.Database.MongoDB.Configurations { @@ -30,9 +27,8 @@ public static void Configure() BsonClassMap.RegisterClassMap(j => { j.AutoMap(); - j.MapIdMember(c => c.InferenceRequestId) - .SetIdGenerator(GuidGenerator.Instance) - .SetSerializer(new GuidSerializer(BsonType.String)); + j.SetIdMember(j.GetMemberMap(c => c.InferenceRequestId)); + j.MapIdMember(c => c.InferenceRequestId); j.SetIgnoreExtraElements(true); j.UnmapProperty(p => p.Application); diff --git a/src/Database/MongoDB/Configurations/MongoDBEntityBaseConfiguration.cs b/src/Database/MongoDB/Configurations/MongoDBEntityBaseConfiguration.cs index 000193dee..c7ee5ac3d 100644 --- a/src/Database/MongoDB/Configurations/MongoDBEntityBaseConfiguration.cs +++ b/src/Database/MongoDB/Configurations/MongoDBEntityBaseConfiguration.cs @@ -16,10 +16,7 @@ */ using Monai.Deploy.InformaticsGateway.Api; -using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.Serialization.IdGenerators; -using MongoDB.Bson.Serialization.Serializers; namespace Monai.Deploy.InformaticsGateway.Database.MongoDB.Configurations { @@ -30,9 +27,8 @@ public static void Configure() BsonClassMap.RegisterClassMap(j => { j.SetIsRootClass(true); - j.MapIdMember(c => c.Id) - .SetIdGenerator(GuidGenerator.Instance) - .SetSerializer(new GuidSerializer(BsonType.String)); + j.SetIdMember(j.GetMemberMap(c => c.Id)); + j.MapIdMember(c => c.Id); j.MapMember(c => c.DateTimeCreated); }); } diff --git a/src/Database/MongoDB/Configurations/PayloadConfiguration.cs b/src/Database/MongoDB/Configurations/PayloadConfiguration.cs index 447c9fec5..6c0c8706c 100644 --- a/src/Database/MongoDB/Configurations/PayloadConfiguration.cs +++ b/src/Database/MongoDB/Configurations/PayloadConfiguration.cs @@ -15,10 +15,7 @@ */ using Monai.Deploy.InformaticsGateway.Api.Storage; -using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.Serialization.IdGenerators; -using MongoDB.Bson.Serialization.Serializers; namespace Monai.Deploy.InformaticsGateway.Database.MongoDB.Configurations { @@ -29,9 +26,9 @@ public static void Configure() BsonClassMap.RegisterClassMap(j => { j.AutoMap(); - j.MapIdMember(c => c.PayloadId) - .SetIdGenerator(GuidGenerator.Instance) - .SetSerializer(new GuidSerializer(BsonType.String)); + j.SetIdMember(j.GetMemberMap(c => c.PayloadId)); + j.MapIdProperty(j => j.PayloadId); + j.SetIgnoreExtraElements(true); j.UnmapProperty(p => p.CalledAeTitle); @@ -44,7 +41,6 @@ public static void Configure() BsonClassMap.RegisterClassMap(); BsonClassMap.RegisterClassMap(); BsonClassMap.RegisterClassMap(); - } } } diff --git a/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj b/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj index eac3aaece..616e12cf5 100644 --- a/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj +++ b/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj @@ -27,8 +27,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json index f370bb2c9..2050bfa39 100644 --- a/src/Database/MongoDB/Integration.Test/packages.lock.json +++ b/src/Database/MongoDB/Integration.Test/packages.lock.json @@ -19,21 +19,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "xunit": { @@ -76,8 +76,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -123,16 +123,16 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -142,13 +142,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -281,8 +281,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -290,10 +290,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -360,32 +360,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -394,8 +395,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "NETStandard.Library": { "type": "Transitive", @@ -1430,49 +1431,49 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "MongoDB.Driver": "2.18.0", - "MongoDB.Driver.Core": "2.18.0" + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } } } diff --git a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj index b174e0184..61d9a8158 100644 --- a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj +++ b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj @@ -37,8 +37,8 @@ - - + + diff --git a/src/Database/MongoDB/MongoDatabaseMigrationManager.cs b/src/Database/MongoDB/MongoDatabaseMigrationManager.cs index 543540068..16151e1ef 100644 --- a/src/Database/MongoDB/MongoDatabaseMigrationManager.cs +++ b/src/Database/MongoDB/MongoDatabaseMigrationManager.cs @@ -17,6 +17,9 @@ using Microsoft.Extensions.Hosting; using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Database.MongoDB.Configurations; +using MongoDB.Bson; +using MongoDB.Bson.Serialization; +using MongoDB.Bson.Serialization.Serializers; namespace Monai.Deploy.InformaticsGateway.Database.MongoDB { @@ -24,6 +27,10 @@ public class MongoDatabaseMigrationManager : IDatabaseMigrationManager { public IHost Migrate(IHost host) { +#pragma warning disable 618 + BsonDefaults.GuidRepresentationMode = GuidRepresentationMode.V3; + BsonSerializer.RegisterSerializer(typeof(Guid), new GuidSerializer(GuidRepresentation.Standard)); +#pragma warning restore MonaiApplicationEntityConfiguration.Configure(); MongoDBEntityBaseConfiguration.Configure(); DestinationApplicationEntityConfiguration.Configure(); diff --git a/src/Database/MongoDB/Repositories/PayloadRepository.cs b/src/Database/MongoDB/Repositories/PayloadRepository.cs index 8a5d30806..6a3f50dbf 100644 --- a/src/Database/MongoDB/Repositories/PayloadRepository.cs +++ b/src/Database/MongoDB/Repositories/PayloadRepository.cs @@ -69,12 +69,6 @@ private void CreateIndexes() var indexDefinitionState = Builders.IndexKeys .Ascending(_ => _.State); _collection.Indexes.CreateOne(new CreateIndexModel(indexDefinitionState)); - - var indexDefinition = Builders.IndexKeys.Combine( - Builders.IndexKeys.Ascending(_ => _.CorrelationId), - Builders.IndexKeys.Ascending(_ => _.PayloadId)); - - _collection.Indexes.CreateOne(new CreateIndexModel(indexDefinition, options)); } public async Task AddAsync(Payload item, CancellationToken cancellationToken = default) @@ -130,7 +124,7 @@ public async Task RemovePendingPayloadsAsync(CancellationToken cancellation { return await _retryPolicy.ExecuteAsync(async () => { - var results = await _collection.DeleteManyAsync(Builders.Filter.Where(p => p.State == Payload.PayloadState.Created), cancellationToken).ConfigureAwait(false); + var results = await _collection.DeleteManyAsync(Builders.Filter.Where(p => p.State == Payload.PayloadState.Created && p.MachineName == Environment.MachineName), cancellationToken).ConfigureAwait(false); return Convert.ToInt32(results.DeletedCount); }).ConfigureAwait(false); } diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json index 166175a72..220fe4c6d 100644 --- a/src/Database/MongoDB/packages.lock.json +++ b/src/Database/MongoDB/packages.lock.json @@ -4,26 +4,27 @@ "net6.0": { "MongoDB.Driver": { "type": "Direct", - "requested": "[2.18.0, )", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "requested": "[2.19.0, )", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Direct", - "requested": "[2.18.0, )", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "requested": "[2.19.0, )", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -92,11 +93,11 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -106,13 +107,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -291,16 +292,16 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -408,41 +409,41 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } } } diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index d2dd8eb58..1e5e1ecd2 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -14,18 +14,18 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -71,13 +71,13 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "TWtq9Hnjq8mTHbbe2JBLa5FR7wlxecFK/PjYQFWru+BVCWCXvRtscO/+S9/Dlz5XkgNzEfLwO9KvUqoh3EybtA==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "zm2bGsjCK42VQkVddXtvo7sI4cyX50MREIOqOhfeibV7VSqHVjbplvPd7f6U3vJBQ12n+uNg+jprqUwi00ia+w==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -155,47 +155,47 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -263,10 +263,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TdsjGYOHDg8656T2tWHUXNkYFUFstL/L9GEjboasuAetubH52yHkNpQV6WuqA6BpbfZHZj8xwKqN7aL7ZWO1Rg==", + "resolved": "6.0.13", + "contentHash": "uuKZ6qDgghq8uYUvZj/QuVe4+vH/N1KxbrSTnW86/u5DzrFMuiyCt80OLt/XmetwMZwZjpHC/F/9aaQ9u7kIQg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.3", "Microsoft.Extensions.Options": "6.0.0" @@ -274,8 +274,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "7GN8C+pcaIBMDQA6OOgBEWT+1Y/OhZTxzovNXIxxBsfU4xI7bmjez5321ya5rN2NbJXUmStNnJics78RkPQO4w==" + "resolved": "6.0.13", + "contentHash": "NVV3zsB1tGV70kNDACH3Os7Lt66hspVayN3LpNgnyfxAfq/TL4cCU4yZgwWUCvWs0Nx6o0Di5h8Q75Aehl9q0Q==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -402,32 +402,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -436,8 +437,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -587,62 +588,62 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.0.3, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.19", - "Monai.Deploy.Storage": "0.2.13", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.19, )", + "Monai.Deploy.Storage": "[0.2.13, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.3, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0" + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", + "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "MongoDB.Driver": "2.18.0", - "MongoDB.Driver.Core": "2.18.0" + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } } } diff --git a/src/DicomWebClient/CLI/packages.lock.json b/src/DicomWebClient/CLI/packages.lock.json index a7d23637f..dcd37d8e5 100644 --- a/src/DicomWebClient/CLI/packages.lock.json +++ b/src/DicomWebClient/CLI/packages.lock.json @@ -1474,20 +1474,20 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Microsoft.Net.Http.Headers": "2.2.8", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", - "System.Linq.Async": "6.0.1", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Net.Http.Headers": "[2.2.8, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", + "System.Linq.Async": "[6.0.1, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj index c2af0ca26..8174123d1 100644 --- a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj +++ b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj @@ -45,7 +45,7 @@ - + All diff --git a/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj b/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj index 3f8cc84e2..2a89943e9 100644 --- a/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj +++ b/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj @@ -31,14 +31,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/DicomWebClient/Test/packages.lock.json b/src/DicomWebClient/Test/packages.lock.json index c4e8195b9..7a58f346f 100644 --- a/src/DicomWebClient/Test/packages.lock.json +++ b/src/DicomWebClient/Test/packages.lock.json @@ -19,28 +19,28 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "xRetry": { "type": "Direct", - "requested": "[1.8.0, )", - "resolved": "1.8.0", - "contentHash": "H8KXWHBjQASwD4y/7L2j7j4KLmg8z4+mCV4atrhZvJVnCkVSKLkWe1lfKGmaCYkKt2dJnC4yH+tJXGqthSkGGg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "NeIbJrwpc5EUPagx/mdd/7KzpR36BO8IWrsbgtvOVjxD2xtmNfUHieZ24PeZ4oCYiLBcTviCy+og/bE/OvPchw==", "dependencies": { "xunit.core": "[2.4.0, 3.0.0)" } @@ -64,8 +64,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -107,8 +107,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", @@ -190,8 +190,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -199,10 +199,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1208,20 +1208,20 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Microsoft.Net.Http.Headers": "2.2.8", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", - "System.Linq.Async": "6.0.1", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Net.Http.Headers": "[2.2.8, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", + "System.Linq.Async": "[6.0.1, )", + "fo-dicom": "[5.0.3, )" } } } diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json index 714d952dd..f5518ba5f 100644 --- a/src/DicomWebClient/packages.lock.json +++ b/src/DicomWebClient/packages.lock.json @@ -30,9 +30,9 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "Microsoft.AspNet.WebApi.Client": { "type": "Direct", @@ -1254,8 +1254,8 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.0.1, )", + "System.Text.Json": "[6.0.7, )" } } } diff --git a/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs b/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs index ea27adfe0..f57327565 100644 --- a/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs +++ b/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs @@ -24,7 +24,7 @@ public static partial class Log [LoggerMessage(EventId = 3000, Level = LogLevel.Information, Message = "[Startup] Removing payloads from database.")] public static partial void RemovingPendingPayloads(this ILogger logger); - [LoggerMessage(EventId = 3002, Level = LogLevel.Information, Message = "[Startup] {count} payloads restored from database.")] + [LoggerMessage(EventId = 3002, Level = LogLevel.Information, Message = "[Startup] {count} pending payloads removed from database.")] public static partial void TotalNumberOfPayloadsRemoved(this ILogger logger, int count); [LoggerMessage(EventId = 3003, Level = LogLevel.Information, Message = "File added to bucket {key}. Queue size: {count}")] diff --git a/src/InformaticsGateway/Logging/Log.700.PayloadService.cs b/src/InformaticsGateway/Logging/Log.700.PayloadService.cs index b37c56fa7..06f781890 100644 --- a/src/InformaticsGateway/Logging/Log.700.PayloadService.cs +++ b/src/InformaticsGateway/Logging/Log.700.PayloadService.cs @@ -116,13 +116,22 @@ public static partial class Log [LoggerMessage(EventId = 736, Level = LogLevel.Debug, Message = "Failed to delete temporary file {identifier} from temporary bucket {bucket} at {remotePath}.")] public static partial void ErrorDeletingFileAfterMoveComplete(this ILogger logger, string bucket, string identifier, string remotePath); - [LoggerMessage(EventId = 737, Level = LogLevel.Trace, Message = "File found on storage service {bucket}: {filePath}.")] - public static partial void FileFounddOnStorageService(this ILogger logger, string bucket, string filePath); + [LoggerMessage(EventId = 737, Level = LogLevel.Trace, Message = "File found on storage service {bucket}: {filePaths}.")] + public static partial void FileFounddOnStorageService(this ILogger logger, string bucket, string filePaths); [LoggerMessage(EventId = 738, Level = LogLevel.Error, Message = "Error listing files on storage service.")] public static partial void ErrorListingFilesOnStorageService(this ILogger logger, Exception ex); [LoggerMessage(EventId = 739, Level = LogLevel.Trace, Message = "Total number of files found on storage service {bucket}: {count}.")] public static partial void FilesFounddOnStorageService(this ILogger logger, string bucket, int count); + + [LoggerMessage(EventId = 740, Level = LogLevel.Error, Message = "Some or all files were missing in payload {payloadId}, will abort the request.")] + public static partial void DeletePayloadDueToMissingFiles(this ILogger logger, Guid payloadId, Exception ex); + + [LoggerMessage(EventId = 741, Level = LogLevel.Error, Message = "File {file} not found in {payloadId}.")] + public static partial void FileMissingInPayload(this ILogger logger, Guid payloadId, string file, Exception ex); + + [LoggerMessage(EventId = 742, Level = LogLevel.Critical, Message = "Storage service connection error.")] + public static partial void StorageServiceConnectionError(this ILogger logger, Exception ex); } } diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index 7c03c3cc4..db97f1971 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -40,13 +40,13 @@ - + All - + - - + + @@ -55,10 +55,10 @@ - - + + - + diff --git a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs index a539f5f23..38aed2197 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs @@ -135,20 +135,21 @@ private async void OnTimedEvent(Object source, System.Timers.ElapsedEventArgs e) var payload = await _payloads[key].Task.ConfigureAwait(false); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "CorrelationId", payload.CorrelationId } }); - if (payload.IsUploadCompleted()) + // Wait for timer window closes before sending payload for processing + if (payload.HasTimedOut) { - if (_payloads.TryRemove(key, out _)) + if (payload.IsUploadCompleted()) { - await QueueBucketForNotification(key, payload).ConfigureAwait(false); + if (_payloads.TryRemove(key, out _)) + { + await QueueBucketForNotification(key, payload).ConfigureAwait(false); + } + else + { + _logger.BucketRemoveError(key); + } } - else - { - _logger.BucketRemoveError(key); - } - } - else if (payload.HasTimedOut) - { - if (payload.AnyUploadFailures()) + else if (payload.AnyUploadFailures()) { _payloads.TryRemove(key, out _); _logger.PayloadRemovedWithFailureUploads(key); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs index 74de2b12d..ab1936ca4 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs @@ -26,6 +26,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Minio.Exceptions; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; @@ -70,7 +71,7 @@ public async Task MoveFilesAsync(Payload payload, ActionBlock moveQueue if (payload.State != Payload.PayloadState.Move) { - throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncorrectState); + throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncorrectState, false); } var stopwatch = Stopwatch.StartNew(); @@ -115,7 +116,7 @@ private async Task NotifyIfCompleted(Payload payload, ActionBlock notif } else // we should never hit this else block. { - throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncompletePayload); + throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncompletePayload, false); } } @@ -182,13 +183,18 @@ await _storageService.CopyObjectAsync( file.GetPayloadPath(payloadId), cancellationToken).ConfigureAwait(false); - var exists = await _storageService.VerifyObjectExistsAsync(_options.Value.Storage.StorageServiceBucketName, file.GetPayloadPath(payloadId), cancellationToken).ConfigureAwait(false); - - if (!exists) - { - _logger.FileMovedVerificationFailure(payloadId, file.UploadPath); - throw new PayloadNotifyException(PayloadNotifyException.FailureReason.MoveFailure); - } + await VerifyFileExists(payloadId, file, cancellationToken).ConfigureAwait(false); + } + catch (ObjectNotFoundException ex) when (ex.ServerMessage.Contains("Not found", StringComparison.OrdinalIgnoreCase)) // TODO: StorageLib shall not throw any errors from MINIO + { + // when file cannot be found on the Storage Service, we assume file has been moved previously by verifying the file exists on destination. + _logger.FileMissingInPayload(payloadId, file.GetTempStoragPath(_options.Value.Storage.RemoteTemporaryStoragePath), ex); + await VerifyFileExists(payloadId, file, cancellationToken).ConfigureAwait(false); + } + catch (ConnectionException ex) // TODO: StorageLib shall not throw any errors from MINIO + { + _logger.StorageServiceConnectionError(ex); + throw new PayloadNotifyException(PayloadNotifyException.FailureReason.ServiceUnavailable); } catch (Exception ex) { @@ -211,16 +217,29 @@ await _storageService.CopyObjectAsync( } } + private async Task VerifyFileExists(Guid payloadId, StorageObjectMetadata file, CancellationToken cancellationToken) + { + var exists = await _storageService.VerifyObjectExistsAsync(_options.Value.Storage.StorageServiceBucketName, file.GetPayloadPath(payloadId), cancellationToken).ConfigureAwait(false); + + if (!exists) + { + _logger.FileMovedVerificationFailure(payloadId, file.UploadPath); + throw new PayloadNotifyException(PayloadNotifyException.FailureReason.MoveFailure, false); + } + } + private async Task LogFilesInMinIo(string bucketName, CancellationToken cancellationToken) { try { var listingResults = await _storageService.ListObjectsAsync(bucketName, recursive: true, cancellationToken: cancellationToken).ConfigureAwait(false); _logger.FilesFounddOnStorageService(bucketName, listingResults.Count); + var files = new List(); foreach (var item in listingResults) { - _logger.FileFounddOnStorageService(bucketName, item.FilePath); + files.Add(item.FilePath); } + _logger.FileFounddOnStorageService(bucketName, string.Join(Environment.NewLine, files)); } catch (Exception ex) { @@ -237,7 +256,15 @@ private async Task UpdatePayloadState(Payload payload, Exception try { - if (payload.RetryCount > _options.Value.Storage.Retries.DelaysMilliseconds.Length) + if (ex is AggregateException aggregateException && + aggregateException.InnerExceptions.Any(p => (p is PayloadNotifyException payloadNotifyEx) && payloadNotifyEx.ShallRetry == false)) + { + _logger.DeletePayloadDueToMissingFiles(payload.PayloadId, ex); + await repository.RemoveAsync(payload, cancellationToken).ConfigureAwait(false); + _logger.PayloadDeleted(payload.PayloadId); + return PayloadAction.Deleted; + } + else if (payload.RetryCount > _options.Value.Storage.Retries.DelaysMilliseconds.Length) { _logger.MoveFailureStopRetry(payload.PayloadId, ex); await repository.RemoveAsync(payload, cancellationToken).ConfigureAwait(false); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadMoveException.cs b/src/InformaticsGateway/Services/Connectors/PayloadMoveException.cs index ae71a6817..c3f8010b5 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadMoveException.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadMoveException.cs @@ -22,6 +22,7 @@ namespace Monai.Deploy.InformaticsGateway.Services.Connectors public class PayloadNotifyException : Exception { public FailureReason Reason { get; } + public bool ShallRetry { get; } public enum FailureReason { @@ -29,11 +30,17 @@ public enum FailureReason IncorrectState, IncompletePayload, MoveFailure, + ServiceUnavailable, } - public PayloadNotifyException(FailureReason reason) + public PayloadNotifyException(FailureReason reason) : this(reason, true) + { + } + + public PayloadNotifyException(FailureReason reason, bool shllRetry) { Reason = reason; + ShallRetry = shllRetry; } protected PayloadNotifyException(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) diff --git a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs index 2ff2a26f9..b7d539047 100644 --- a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs +++ b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs @@ -76,11 +76,11 @@ private void BackgroundProcessing(CancellationToken cancellationToken) { tasks.Add(Task.Run(async () => { - await StartWorker(i, cancellationToken); - })); + await StartWorker(i, cancellationToken).ConfigureAwait(false); + }, cancellationToken)); } - Task.WaitAll(tasks.ToArray()); + Task.WaitAll(tasks.ToArray(), cancellationToken); } catch (ObjectDisposedException ex) { @@ -104,7 +104,7 @@ private async Task StartWorker(int thread, CancellationToken cancellationToken) try { var item = await _uplaodQueue.Dequeue(cancellationToken); - await ProcessObject(item); + await ProcessObject(item).ConfigureAwait(false); } catch (OperationCanceledException ex) { diff --git a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj index 2ee72c63a..21014c79c 100644 --- a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj +++ b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj @@ -36,17 +36,17 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json index 974674de1..cef4ab5fa 100644 --- a/src/InformaticsGateway/Test/packages.lock.json +++ b/src/InformaticsGateway/Test/packages.lock.json @@ -22,42 +22,42 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "6A42n1ehuWTIsqbOzcA82aNePXF+xrrSfiD0wbW99NCDpNra4m6A3EkFS1yb8hDkc7yY64BkNQV5YhsB/5UgBA==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "NEOR8DI3v3heJkWLhyu7LyoXLGB0qNlkABzkzQ+90/YTjFlQU/L/tbG2cKMsZXtk4hlTI10Xzn24h+YkUNustw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12" + "Microsoft.EntityFrameworkCore": "6.0.13" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "Swashbuckle.AspNetCore": { "type": "Direct", - "requested": "[6.4.0, )", - "resolved": "6.4.0", - "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", + "requested": "[6.5.0, )", + "resolved": "6.5.0", + "contentHash": "FK05XokgjgwlCI6wCT+D4/abtQkL1X1/B9Oas6uIwHFmYrIO9WUD5aLC9IzMs9GnHfUXOtXZ2S43gN1mhs5+aA==", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.5.0" } }, "System.IO.Abstractions.TestingHelpers": { @@ -71,9 +71,9 @@ }, "xRetry": { "type": "Direct", - "requested": "[1.8.0, )", - "resolved": "1.8.0", - "contentHash": "H8KXWHBjQASwD4y/7L2j7j4KLmg8z4+mCV4atrhZvJVnCkVSKLkWe1lfKGmaCYkKt2dJnC4yH+tJXGqthSkGGg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "NeIbJrwpc5EUPagx/mdd/7KzpR36BO8IWrsbgtvOVjxD2xtmNfUHieZ24PeZ4oCYiLBcTviCy+og/bE/OvPchw==", "dependencies": { "xunit.core": "[2.4.0, 3.0.0)" } @@ -127,8 +127,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -424,8 +424,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -434,19 +434,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -456,39 +456,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -623,10 +623,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TdsjGYOHDg8656T2tWHUXNkYFUFstL/L9GEjboasuAetubH52yHkNpQV6WuqA6BpbfZHZj8xwKqN7aL7ZWO1Rg==", + "resolved": "6.0.13", + "contentHash": "uuKZ6qDgghq8uYUvZj/QuVe4+vH/N1KxbrSTnW86/u5DzrFMuiyCt80OLt/XmetwMZwZjpHC/F/9aaQ9u7kIQg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.3", "Microsoft.Extensions.Options": "6.0.0" @@ -634,17 +634,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "7GN8C+pcaIBMDQA6OOgBEWT+1Y/OhZTxzovNXIxxBsfU4xI7bmjez5321ya5rN2NbJXUmStNnJics78RkPQO4w==" + "resolved": "6.0.13", + "contentHash": "NVV3zsB1tGV70kNDACH3Os7Lt66hspVayN3LpNgnyfxAfq/TL4cCU4yZgwWUCvWs0Nx6o0Di5h8Q75Aehl9q0Q==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TWtq9Hnjq8mTHbbe2JBLa5FR7wlxecFK/PjYQFWru+BVCWCXvRtscO/+S9/Dlz5XkgNzEfLwO9KvUqoh3EybtA==", + "resolved": "6.0.13", + "contentHash": "zm2bGsjCK42VQkVddXtvo7sI4cyX50MREIOqOhfeibV7VSqHVjbplvPd7f6U3vJBQ12n+uNg+jprqUwi00ia+w==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -901,8 +901,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -910,10 +910,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -1023,32 +1023,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -1057,8 +1058,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "NETStandard.Library": { "type": "Transitive", @@ -1084,25 +1085,25 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" + "resolved": "5.1.1", + "contentHash": "YBfUDzipCaucs+8ieCDp8XECumiWsQbZwSUVLlt9i7FGV03nOPqoVzLtmlhbTxq4TN92BBsLacqPAE/ZyDDJ1g==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "wzVFG5p8Nwbs1Ws29T8YJg+UbJfsh61h6U4xArnDSrtVvOoccwKtoFPZWwbym3ZTiTFmHIf7Ugu1j/WnT7z3vg==", + "resolved": "5.2.1", + "contentHash": "b16cdOklZ3gfeuiyewsAmR2It/55Ar+plwsyo7CjgfwZtH1c5B2ZyYIGt1Ho+fPMOKEHkPU/trXZqAg9Oipiiw==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.0" + "NLog": "5.1.1" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "DqFgdydAWW+pshPdzh0ydk2jJrrVaZmBNz5+p9K8N9q/4BOPJ94S2fD8t9erd7ZMhnigaqOq/HqZH4nGGOYTbA==", + "resolved": "5.2.1", + "contentHash": "yusksFxJxIoXJbU/aH9IJHmNKNNk2a9hYLSzd02kr7EX3Oc2+IRpp50VUEwZpq0tWEdlqYOUCLlzLMtHDHkxSA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.0" + "NLog.Extensions.Logging": "5.2.1" } }, "NuGet.Frameworks": { @@ -1264,24 +1265,24 @@ }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", + "resolved": "6.5.0", + "contentHash": "XWmCmqyFmoItXKFsQSwQbEAsjDKcxlNf1l+/Ki42hcb6LjKL8m5Db69OTvz5vLonMSRntYO1XLqz0OP+n3vKnA==", "dependencies": { "Microsoft.OpenApi": "1.2.3" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", + "resolved": "6.5.0", + "contentHash": "Y/qW8Qdg9OEs7V013tt+94OdPxbRdbhcEbw4NiwGvf4YBcfhL/y7qp/Mjv/cENsQ2L3NqJ2AOu94weBy/h4KvA==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" + "resolved": "6.5.0", + "contentHash": "OvbvxX+wL8skxTBttcBsVxdh73Fag4xwqEU2edh4JMn7Ws/xJHnY/JB1e9RoCb6XpDxUF3hD9A0Z1lEUx40Pfw==" }, "System.Buffers": { "type": "Transitive", @@ -1900,10 +1901,10 @@ "DotNext.Threading": "[4.7.4, )", "HL7-dotnetcore": "[2.29.0, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.12, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.13, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1918,10 +1919,10 @@ "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.13, )", "Monai.Deploy.Storage.MinIO": "[0.2.13, )", - "NLog": "[5.1.0, )", - "NLog.Web.AspNetCore": "[5.2.0, )", + "NLog": "[5.1.1, )", + "NLog.Web.AspNetCore": "[5.2.1, )", "Polly": "[7.2.3, )", - "Swashbuckle.AspNetCore": "[6.4.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )", "fo-dicom": "[5.0.3, )", "fo-dicom.NLog": "[5.0.3, )" } @@ -1930,7 +1931,7 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", "Monai.Deploy.Messaging": "[0.1.19, )", "Monai.Deploy.Storage": "[0.2.13, )" @@ -1968,11 +1969,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1984,7 +1985,7 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", "Polly": "[7.2.3, )" @@ -1993,8 +1994,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -2007,8 +2008,8 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.18.0, )", - "MongoDB.Driver.Core": "[2.18.0, )" + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { diff --git a/src/InformaticsGateway/appsettings.Development.json b/src/InformaticsGateway/appsettings.Development.json index 5133e95df..c8146c334 100644 --- a/src/InformaticsGateway/appsettings.Development.json +++ b/src/InformaticsGateway/appsettings.Development.json @@ -41,4 +41,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json index 31efabb53..602670424 100644 --- a/src/InformaticsGateway/packages.lock.json +++ b/src/InformaticsGateway/packages.lock.json @@ -50,9 +50,9 @@ }, "GitVersion.MsBuild": { "type": "Direct", - "requested": "[5.11.1, )", - "resolved": "5.11.1", - "contentHash": "JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==" + "requested": "[5.12.0, )", + "resolved": "5.12.0", + "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA==" }, "HL7-dotnetcore": { "type": "Direct", @@ -74,12 +74,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -95,19 +95,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "7GN8C+pcaIBMDQA6OOgBEWT+1Y/OhZTxzovNXIxxBsfU4xI7bmjez5321ya5rN2NbJXUmStNnJics78RkPQO4w==" + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "NVV3zsB1tGV70kNDACH3Os7Lt66hspVayN3LpNgnyfxAfq/TL4cCU4yZgwWUCvWs0Nx6o0Di5h8Q75Aehl9q0Q==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "TWtq9Hnjq8mTHbbe2JBLa5FR7wlxecFK/PjYQFWru+BVCWCXvRtscO/+S9/Dlz5XkgNzEfLwO9KvUqoh3EybtA==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "zm2bGsjCK42VQkVddXtvo7sI4cyX50MREIOqOhfeibV7VSqHVjbplvPd7f6U3vJBQ12n+uNg+jprqUwi00ia+w==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13" } }, "Microsoft.Extensions.Hosting": { @@ -235,17 +235,17 @@ }, "NLog": { "type": "Direct", - "requested": "[5.1.0, )", - "resolved": "5.1.0", - "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YBfUDzipCaucs+8ieCDp8XECumiWsQbZwSUVLlt9i7FGV03nOPqoVzLtmlhbTxq4TN92BBsLacqPAE/ZyDDJ1g==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "DqFgdydAWW+pshPdzh0ydk2jJrrVaZmBNz5+p9K8N9q/4BOPJ94S2fD8t9erd7ZMhnigaqOq/HqZH4nGGOYTbA==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "yusksFxJxIoXJbU/aH9IJHmNKNNk2a9hYLSzd02kr7EX3Oc2+IRpp50VUEwZpq0tWEdlqYOUCLlzLMtHDHkxSA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.0" + "NLog.Extensions.Logging": "5.2.1" } }, "Polly": { @@ -256,14 +256,14 @@ }, "Swashbuckle.AspNetCore": { "type": "Direct", - "requested": "[6.4.0, )", - "resolved": "6.4.0", - "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", + "requested": "[6.5.0, )", + "resolved": "6.5.0", + "contentHash": "FK05XokgjgwlCI6wCT+D4/abtQkL1X1/B9Oas6uIwHFmYrIO9WUD5aLC9IzMs9GnHfUXOtXZ2S43gN1mhs5+aA==", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.5.0" } }, "AspNetCore.HealthChecks.MongoDb": { @@ -351,47 +351,47 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -521,10 +521,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TdsjGYOHDg8656T2tWHUXNkYFUFstL/L9GEjboasuAetubH52yHkNpQV6WuqA6BpbfZHZj8xwKqN7aL7ZWO1Rg==", + "resolved": "6.0.13", + "contentHash": "uuKZ6qDgghq8uYUvZj/QuVe4+vH/N1KxbrSTnW86/u5DzrFMuiyCt80OLt/XmetwMZwZjpHC/F/9aaQ9u7kIQg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.3", "Microsoft.Extensions.Options": "6.0.0" @@ -768,32 +768,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -802,8 +803,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "NETStandard.Library": { "type": "Transitive", @@ -829,12 +830,12 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "wzVFG5p8Nwbs1Ws29T8YJg+UbJfsh61h6U4xArnDSrtVvOoccwKtoFPZWwbym3ZTiTFmHIf7Ugu1j/WnT7z3vg==", + "resolved": "5.2.1", + "contentHash": "b16cdOklZ3gfeuiyewsAmR2It/55Ar+plwsyo7CjgfwZtH1c5B2ZyYIGt1Ho+fPMOKEHkPU/trXZqAg9Oipiiw==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.0" + "NLog": "5.1.1" } }, "RabbitMQ.Client": { @@ -986,24 +987,24 @@ }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", + "resolved": "6.5.0", + "contentHash": "XWmCmqyFmoItXKFsQSwQbEAsjDKcxlNf1l+/Ki42hcb6LjKL8m5Db69OTvz5vLonMSRntYO1XLqz0OP+n3vKnA==", "dependencies": { "Microsoft.OpenApi": "1.2.3" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", + "resolved": "6.5.0", + "contentHash": "Y/qW8Qdg9OEs7V013tt+94OdPxbRdbhcEbw4NiwGvf4YBcfhL/y7qp/Mjv/cENsQ2L3NqJ2AOu94weBy/h4KvA==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" + "resolved": "6.5.0", + "contentHash": "OvbvxX+wL8skxTBttcBsVxdh73Fag4xwqEU2edh4JMn7Ws/xJHnY/JB1e9RoCb6XpDxUF3hD9A0Z1lEUx40Pfw==" }, "System.Buffers": { "type": "Transitive", @@ -1569,7 +1570,7 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", "Monai.Deploy.Messaging": "[0.1.19, )", "Monai.Deploy.Storage": "[0.2.13, )" @@ -1607,11 +1608,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1623,7 +1624,7 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", "Polly": "[7.2.3, )" @@ -1632,8 +1633,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -1646,8 +1647,8 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.18.0, )", - "MongoDB.Driver.Core": "[2.18.0, )" + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { diff --git a/tests/Integration.Test/Common/Assertions.cs b/tests/Integration.Test/Common/Assertions.cs index 0aef382db..33787d549 100644 --- a/tests/Integration.Test/Common/Assertions.cs +++ b/tests/Integration.Test/Common/Assertions.cs @@ -199,7 +199,15 @@ internal void ShouldHaveCorrectNumberOfWorkflowRequestMessages(DataProvider data message.ApplicationId.Should().Be(MessageBrokerConfiguration.InformaticsGatewayApplicationId); var request = message.ConvertTo(); request.Should().NotBeNull(); - request.FileCount.Should().Be((dataProvider.DicomSpecs.NumberOfExpectedFiles(dataProvider.StudyGrouping))); + + if (dataProvider.ClientSendOverAssociations == 1 || messages.Count == 1) + { + request.FileCount.Should().Be((dataProvider.DicomSpecs.NumberOfExpectedFiles(dataProvider.StudyGrouping))); + } + else + { + request.FileCount.Should().Be(dataProvider.DicomSpecs.FileCount / dataProvider.ClientSendOverAssociations); + } if (dataProvider.Workflows is not null) { diff --git a/tests/Integration.Test/Common/DataProvider.cs b/tests/Integration.Test/Common/DataProvider.cs index cdab85f37..069282473 100644 --- a/tests/Integration.Test/Common/DataProvider.cs +++ b/tests/Integration.Test/Common/DataProvider.cs @@ -38,6 +38,9 @@ internal class DataProvider public DicomStatus DimseRsponse { get; internal set; } public string StudyGrouping { get; internal set; } public string[] Workflows { get; internal set; } = null; + public int ClientTimeout { get; internal set; } + public int ClientAssociationPulseTime { get; internal set; } = 0; + public int ClientSendOverAssociations { get; internal set; } = 1; public DataProvider(Configurations configurations, ISpecFlowOutputHelper outputHelper) { diff --git a/tests/Integration.Test/Common/DicomCStoreDataClient.cs b/tests/Integration.Test/Common/DicomCStoreDataClient.cs index da8c357b0..848590694 100644 --- a/tests/Integration.Test/Common/DicomCStoreDataClient.cs +++ b/tests/Integration.Test/Common/DicomCStoreDataClient.cs @@ -16,6 +16,7 @@ using System.Diagnostics; using Ardalis.GuardClauses; +using FellowOakDicom; using FellowOakDicom.Network; using FellowOakDicom.Network.Client; using Monai.Deploy.InformaticsGateway.Configuration; @@ -48,15 +49,59 @@ public async Task SendAsync(DataProvider dataProvider, params object[] args) var host = args[1].ToString(); var port = (int)args[2]; var calledAeTitle = args[3].ToString(); - var timeout = (TimeSpan)args[4]; + var timeout = TimeSpan.FromSeconds(dataProvider.ClientTimeout); + var associations = dataProvider.ClientSendOverAssociations; + var pauseTime = TimeSpan.FromSeconds(dataProvider.ClientAssociationPulseTime); _outputHelper.WriteLine($"C-STORE: {callingAeTitle} => {host}:{port}@{calledAeTitle}"); var stopwatch = new Stopwatch(); stopwatch.Start(); - var dicomClient = DicomClientFactory.Create(host, port, false, callingAeTitle, calledAeTitle); - var countdownEvent = new CountdownEvent(dataProvider.DicomSpecs.Files.Count); + + var filesPerAssociations = dataProvider.DicomSpecs.Files.Count / associations; + var failureStatus = new List(); - foreach (var file in dataProvider.DicomSpecs.Files) + for (int i = 0; i < associations; i++) + { + var files = dataProvider.DicomSpecs.Files.Skip(i * filesPerAssociations).Take(filesPerAssociations).ToList(); + if (i + 1 == associations && dataProvider.DicomSpecs.Files.Count > (i + 1) * filesPerAssociations) + { + files.AddRange(dataProvider.DicomSpecs.Files.Skip(i * filesPerAssociations)); + } + + try + { + await SendBatchAsync( + files, + callingAeTitle, + host, + port, + calledAeTitle, + timeout, + stopwatch, + failureStatus); + await Task.Delay(pauseTime); + } + catch (DicomAssociationRejectedException ex) + { + _outputHelper.WriteLine($"Association Rejected: {ex.Message}"); + dataProvider.DimseRsponse = DicomStatus.Cancel; + } + } + + stopwatch.Stop(); + lock (SyncRoot) + { + TotalTime += (int)stopwatch.Elapsed.TotalMilliseconds; + } + _outputHelper.WriteLine($"DICOMsend:{stopwatch.Elapsed.TotalSeconds}s"); + dataProvider.DimseRsponse = (failureStatus.Count == 0) ? DicomStatus.Success : failureStatus.First(); + } + + private async Task SendBatchAsync(List files, string callingAeTitle, string host, int port, string calledAeTitle, TimeSpan timeout, Stopwatch stopwatch, List failureStatus) + { + var dicomClient = DicomClientFactory.Create(host, port, false, callingAeTitle, calledAeTitle); + var countdownEvent = new CountdownEvent(files.Count); + foreach (var file in files) { var cStoreRequest = new DicomCStoreRequest(file); cStoreRequest.OnResponseReceived += (DicomCStoreRequest request, DicomCStoreResponse response) => @@ -67,24 +112,8 @@ public async Task SendAsync(DataProvider dataProvider, params object[] args) await dicomClient.AddRequestAsync(cStoreRequest); } - try - { - await dicomClient.SendAsync(); - countdownEvent.Wait(timeout); - stopwatch.Stop(); - lock (SyncRoot) - { - TotalTime += (int)stopwatch.Elapsed.TotalMilliseconds; - } - _outputHelper.WriteLine($"DICOMsend:{stopwatch.Elapsed.TotalSeconds}s"); - } - catch (DicomAssociationRejectedException ex) - { - _outputHelper.WriteLine($"Association Rejected: {ex.Message}"); - dataProvider.DimseRsponse = DicomStatus.Cancel; - } - - dataProvider.DimseRsponse = (failureStatus.Count == 0) ? DicomStatus.Success : failureStatus.First(); + await dicomClient.SendAsync(); + countdownEvent.Wait(timeout); } } } diff --git a/tests/Integration.Test/Drivers/RabbitMqConsumer.cs b/tests/Integration.Test/Drivers/RabbitMqConsumer.cs index 06f17f66a..38f07d716 100644 --- a/tests/Integration.Test/Drivers/RabbitMqConsumer.cs +++ b/tests/Integration.Test/Drivers/RabbitMqConsumer.cs @@ -16,6 +16,7 @@ */ using System.Collections.Concurrent; +using System.Diagnostics; using Monai.Deploy.Messaging.Messages; using Monai.Deploy.Messaging.RabbitMQ; using TechTalk.SpecFlow.Infrastructure; @@ -32,7 +33,6 @@ internal class RabbitMqConsumer : IDisposable public IReadOnlyList Messages { get { return _messages.ToList(); } } - public CountdownEvent MessageWaitHandle { get; private set; } public RabbitMqConsumer(RabbitMQMessageSubscriberService subscriberService, string queueName, ISpecFlowOutputHelper outputHelper) { @@ -54,15 +54,13 @@ public RabbitMqConsumer(RabbitMQMessageSubscriberService subscriberService, stri _messages.Add(eventArgs.Message); subscriberService.Acknowledge(eventArgs.Message); _outputHelper.WriteLine($"{DateTime.UtcNow} - {queueName} message received with correlation ID={eventArgs.Message.CorrelationId}, delivery tag={eventArgs.Message.DeliveryTag}"); - MessageWaitHandle?.Signal(); }); } - public void SetupMessageHandle(int count) + public void ClearMessages() { - _outputHelper.WriteLine($"Expecting {count} {_queueName} messages from RabbitMQ"); + _outputHelper.WriteLine($"Clearing messages received from RabbitMQ"); _messages.Clear(); - MessageWaitHandle = new CountdownEvent(count); } protected virtual void Dispose(bool disposing) @@ -84,5 +82,18 @@ public void Dispose() Dispose(disposing: true); GC.SuppressFinalize(this); } + + internal async Task WaitforAsync(int messageCount, TimeSpan messageWaitTimeSpan) + { + var stopwatch = new Stopwatch(); + stopwatch.Start(); + + while (messageCount > _messages.Count && stopwatch.Elapsed < messageWaitTimeSpan) + { + await Task.Delay(100); + } + + return messageCount >= _messages.Count; + } } } diff --git a/tests/Integration.Test/Features/AcrApi.feature b/tests/Integration.Test/Features/AcrApi.feature index 9c0bbec5c..9ad899b79 100644 --- a/tests/Integration.Test/Features/AcrApi.feature +++ b/tests/Integration.Test/Features/AcrApi.feature @@ -28,7 +28,7 @@ Feature: ACR API Given a DICOM study on a remote DICOMweb service And an ACR API request to query & retrieve by When the ACR API request is sent - Then a workflow requests sent to the message broker + Then a single workflow request is sent to the message broker And a study is uploaded to the storage service Examples: diff --git a/tests/Integration.Test/Features/DicomDimseScp.feature b/tests/Integration.Test/Features/DicomDimseScp.feature index fcaea8823..b14b93d4f 100644 --- a/tests/Integration.Test/Features/DicomDimseScp.feature +++ b/tests/Integration.Test/Features/DicomDimseScp.feature @@ -31,14 +31,17 @@ Feature: DICOM DIMSE SCP Services Scenario: Response to C-ECHO-RQ Given a called AE Title named 'C-ECHO-TEST' that groups by '0020,000D' for 5 seconds - When a C-ECHO-RQ is sent to 'C-ECHO-TEST' from 'TEST-RUNNER' with timeout of 30 seconds + And a DICOM client configured with 30 seconds timeout + When a C-ECHO-RQ is sent to 'C-ECHO-TEST' from 'TEST-RUNNER' Then a successful response should be received @messaging_workflow_request @messaging Scenario Outline: Respond to C-STORE-RQ and group data by Study Instance UID Given a called AE Title named 'C-STORE-STUDY' that groups by '0020,000D' for 3 seconds + And a DICOM client configured with 300 seconds timeout + And a DICOM client configured to send data over 1 associations and wait 0 between each association And studies - When a C-STORE-RQ is sent to 'Informatics Gateway' with AET 'C-STORE-STUDY' from 'TEST-RUNNER' with timeout of 300 seconds + When a C-STORE-RQ is sent to 'Informatics Gateway' with AET 'C-STORE-STUDY' from 'TEST-RUNNER' Then a successful response should be received And workflow requests sent to message broker And studies are uploaded to storage service @@ -53,8 +56,10 @@ Feature: DICOM DIMSE SCP Services @messaging_workflow_request @messaging Scenario Outline: Respond to C-STORE-RQ and group data by Series Instance UID Given a called AE Title named 'C-STORE-SERIES' that groups by '0020,000E' for 3 seconds + And a DICOM client configured with 300 seconds timeout + And a DICOM client configured to send data over 1 associations and wait 0 between each association And studies with series per study - When a C-STORE-RQ is sent to 'Informatics Gateway' with AET 'C-STORE-SERIES' from 'TEST-RUNNER' with timeout of 300 seconds + When a C-STORE-RQ is sent to 'Informatics Gateway' with AET 'C-STORE-SERIES' from 'TEST-RUNNER' Then a successful response should be received And workflow requests sent to message broker And studies are uploaded to storage service @@ -65,3 +70,19 @@ Feature: DICOM DIMSE SCP Services | CT | 1 | 2 | | MG | 1 | 3 | | US | 1 | 2 | + + @messaging_workflow_request @messaging + Scenario Outline: Respond to C-STORE-RQ and group data by Study Instance UID over multiple associations + Given a called AE Title named 'C-STORE-STUDY' that groups by '0020,000D' for 5 seconds + And a DICOM client configured with 300 seconds timeout + And a DICOM client configured to send data over associations and wait between each association + And studies with series per study + When C-STORE-RQ are sent to 'Informatics Gateway' with AET 'C-STORE-STUDY' from 'TEST-RUNNER' + Then a successful response should be received + And workflow requests sent to message broker + And studies are uploaded to storage service + + Examples: + | modality | study_count | series_count | seconds | workflow_requests | + | MG | 1 | 3 | 3 | 1 | + | MG | 1 | 3 | 6 | 3 | diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index bac224f0b..335441126 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -26,17 +26,17 @@ - - + + - + - + diff --git a/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs index 56845731c..80c8aea65 100644 --- a/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs @@ -59,7 +59,7 @@ public async Task GivenADICOMStudySentToAETFromWithTimeoutOfSeconds() { var modality = "US"; _dataProvider.GenerateDicomData(modality, WorkflowStudyCount); - _receivedMessages.SetupMessageHandle(WorkflowStudyCount); + _receivedMessages.ClearMessages(); var storeScu = _objectContainer.Resolve("StoreSCU"); await storeScu.SendAsync(_dataProvider, "TEST-RUNNER", _configurations.OrthancOptions.Host, _configurations.OrthancOptions.DimsePort, "ORTHANC", TimeSpan.FromSeconds(300)); @@ -80,17 +80,16 @@ public async Task WhenTheACRAPIRequestIsSentTo() await _informaticsGatewayClient.Inference.NewInferenceRequest(_dataProvider.AcrRequest, CancellationToken.None); } - [Then(@"a workflow requests sent to the message broker")] - public void ThenAWorkflowRequestsSentToTheMessageBroker() + [Then(@"a single workflow request is sent to the message broker")] + public async Task ThenAWorkflowRequestsSentToTheMessageBroker() { - _receivedMessages.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(1, MessageWaitTimeSpan)).Should().BeTrue(); _assertions.ShouldHaveCorrectNumberOfWorkflowRequestMessagesAndAcrRequest(_dataProvider, _receivedMessages.Messages, WorkflowStudyCount); } [Then(@"a study is uploaded to the storage service")] public async Task ThenAStudyIsUploadedToTheStorageService() { - _receivedMessages.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue(); _receivedMessages.Messages.Should().NotBeNullOrEmpty(); await _assertions.ShouldHaveUploadedDicomDataToMinio(_receivedMessages.Messages, _dataProvider.DicomSpecs.FileHashes); } diff --git a/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs index 82b1d6bc4..e88e2ef40 100644 --- a/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs @@ -88,7 +88,8 @@ public void GivenXStudiesWithYSeriesPerStudy(int studyCount, string modality, in Guard.Against.NegativeOrZero(seriesPerStudy); _dataProvider.GenerateDicomData(modality, studyCount, seriesPerStudy); - _receivedMessages.SetupMessageHandle(_dataProvider.DicomSpecs.NumberOfExpectedRequests(_dataProvider.StudyGrouping)); + + _receivedMessages.ClearMessages(); } [Given(@"a called AE Title named '([^']*)' that groups by '([^']*)' for (.*) seconds")] @@ -125,12 +126,28 @@ await _informaticsGatewayClient.MonaiScpAeTitle.Create(new MonaiApplicationEntit } } - [When(@"a C-ECHO-RQ is sent to '([^']*)' from '([^']*)' with timeout of (.*) seconds")] - public async Task WhenAC_ECHO_RQIsSentToFromWithTimeoutOfSeconds(string calledAeTitle, string callingAeTitle, int clientTimeoutSeconds) + [Given(@"a DICOM client configured with (.*) seconds timeout")] + public void GivenADICOMClientConfiguredWithSecondsTimeout(int timeout) + { + Guard.Against.NegativeOrZero(timeout); + _dataProvider.ClientTimeout = timeout; + } + + [Given(@"a DICOM client configured to send data over (.*) associations and wait (.*) between each association")] + public void GivenADICOMClientConfiguredToSendDataOverAssociationsAndWaitSecondsBetweenEachAssociation(int associations, int pulseTime) + { + Guard.Against.NegativeOrZero(associations); + Guard.Against.Negative(pulseTime); + + _dataProvider.ClientSendOverAssociations = associations; + _dataProvider.ClientAssociationPulseTime = pulseTime; + } + + [When(@"a C-ECHO-RQ is sent to '([^']*)' from '([^']*)'")] + public async Task WhenAC_ECHO_RQIsSentToFromWithTimeoutOfSeconds(string calledAeTitle, string callingAeTitle) { Guard.Against.NullOrWhiteSpace(calledAeTitle); Guard.Against.NullOrWhiteSpace(callingAeTitle); - Guard.Against.NegativeOrZero(clientTimeoutSeconds); var echoScu = _objectContainer.Resolve("EchoSCU"); await echoScu.SendAsync( @@ -139,7 +156,7 @@ await echoScu.SendAsync( _configuration.InformaticsGatewayOptions.Host, _informaticsGatewayConfiguration.Dicom.Scp.Port, calledAeTitle, - TimeSpan.FromSeconds(clientTimeoutSeconds)); + TimeSpan.FromSeconds(_dataProvider.ClientTimeout)); } [Then(@"a successful response should be received")] @@ -148,13 +165,13 @@ public void ThenASuccessfulResponseShouldBeReceived() _dataProvider.DimseRsponse.Should().Be(DicomStatus.Success); } - [When(@"a C-STORE-RQ is sent to '([^']*)' with AET '([^']*)' from '([^']*)' with timeout of (.*) seconds")] - public async Task WhenAC_STORE_RQIsSentToWithAETFromWithTimeoutOfSeconds(string application, string calledAeTitle, string callingAeTitle, int clientTimeoutSeconds) + [When(@"a C-STORE-RQ is sent to '([^']*)' with AET '([^']*)' from '([^']*)'")] + [When(@"C-STORE-RQ are sent to '([^']*)' with AET '([^']*)' from '([^']*)'")] + public async Task WhenAC_STORE_RQIsSentToWithAETFromWithTimeoutOfSeconds(string application, string calledAeTitle, string callingAeTitle) { Guard.Against.NullOrWhiteSpace(application); Guard.Against.NullOrWhiteSpace(calledAeTitle); Guard.Against.NullOrWhiteSpace(callingAeTitle); - Guard.Against.NegativeOrZero(clientTimeoutSeconds); var storeScu = _objectContainer.Resolve("StoreSCU"); @@ -168,8 +185,7 @@ await storeScu.SendAsync( callingAeTitle, host, port, - calledAeTitle, - TimeSpan.FromSeconds(clientTimeoutSeconds)); + calledAeTitle); _dataProvider.ReplaceGeneratedDicomDataWithHashes(); } diff --git a/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs index bf383b356..63df359e7 100644 --- a/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs @@ -51,7 +51,7 @@ public void GivenNStudies(int studyCount, string modality, string grouping) _dataProvider.GenerateDicomData(modality, studyCount); _dataProvider.StudyGrouping = grouping; - _receivedMessages.SetupMessageHandle(_dataProvider.DicomSpecs.NumberOfExpectedRequests(grouping)); + _receivedMessages.ClearMessages(); } [Given(@"a workflow named '(.*)'")] diff --git a/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs index b78d655e9..6d62a6723 100644 --- a/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs @@ -132,14 +132,14 @@ public void WhenAExportRequestIsReceivedDesignatedFor(string routingKey) exportRequestEvent.CorrelationId, string.Empty); - _receivedMessages.SetupMessageHandle(1); + _receivedMessages.ClearMessages(); _messagePublisher.Publish(routingKey, message.ToMessage()); } [Then(@"Informatics Gateway exports the studies to the DICOM SCP")] public async Task ThenExportTheInstancesToTheDicomScp() { - _receivedMessages.MessageWaitHandle.Wait(DicomScpWaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(1, DicomScpWaitTimeSpan)).Should().BeTrue(); foreach (var key in _dataProvider.DicomSpecs.FileHashes.Keys) { @@ -151,7 +151,7 @@ public async Task ThenExportTheInstancesToTheDicomScp() [Then(@"Informatics Gateway exports the studies to Orthanc")] public async Task ThenExportTheInstancesToOrthanc() { - _receivedMessages.MessageWaitHandle.Wait(DicomScpWaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(1, DicomScpWaitTimeSpan)).Should().BeTrue(); var httpClient = new HttpClient(); var dicomWebClient = new DicomWebClient(httpClient, null); dicomWebClient.ConfigureServiceUris(new Uri(_configuration.OrthancOptions.DicomWebRoot)); diff --git a/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs b/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs index ab38d8c6b..d1122a070 100644 --- a/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs @@ -57,7 +57,7 @@ public async Task GivenHl7MessagesInVersionX(string version, string format) Guard.Against.NullOrWhiteSpace(format); await _dataProvider.GenerateFhirMessages(version, format); - _receivedMessages.SetupMessageHandle(_dataProvider.FhirSpecs.Files.Count); + _receivedMessages.ClearMessages(); } [When(@"the FHIR messages are sent to Informatics Gateway")] @@ -67,9 +67,9 @@ public async Task WhenTheMessagesAreSentToInformaticsGateway() } [Then(@"workflow requests are sent to message broker")] - public void ThenWorkflowRequestAreSentToMessageBroker() + public async Task ThenWorkflowRequestAreSentToMessageBrokerAsync() { - _receivedMessages.MessageWaitHandle.Wait(WaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(_dataProvider.FhirSpecs.Files.Count, WaitTimeSpan)).Should().BeTrue(); } [Then(@"FHIR resources are uploaded to storage service")] diff --git a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs index 53436dfd5..22ccde5f3 100644 --- a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs +++ b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs @@ -49,7 +49,7 @@ public async Task GivenHl7MessagesInVersionX(string version) { Guard.Against.NullOrWhiteSpace(version); await _dataProvider.GenerateHl7Messages(version); - _receivedMessages.SetupMessageHandle(1); + _receivedMessages.ClearMessages(); } [When(@"the message are sent to Informatics Gateway")] @@ -71,9 +71,9 @@ public void ThenAcknowledgementAreReceived() } [Then(@"a workflow requests sent to message broker")] - public void ThenAWorkflowRequestIsSentToMessageBroker() + public async Task ThenAWorkflowRequestIsSentToMessageBrokerAsync() { - _receivedMessages.MessageWaitHandle.Wait(WaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(_dataProvider.HL7Specs.Files.Count, WaitTimeSpan)).Should().BeTrue(); } [Then(@"messages are uploaded to storage service")] diff --git a/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs b/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs index 7c362328a..896923162 100644 --- a/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs @@ -53,22 +53,21 @@ public void GivenNStudies(int studyCount, string modality) _dataProvider.GenerateDicomData(modality, studyCount); - _receivedMessages.SetupMessageHandle(_dataProvider.DicomSpecs.NumberOfExpectedRequests(_dataProvider.StudyGrouping)); + _receivedMessages.ClearMessages(); } [Then(@"(.*) workflow requests sent to message broker")] - public void ThenWorkflowRequestSentToMessageBroker(int workflowCount) + public async Task ThenWorkflowRequestSentToMessageBrokerAsync(int workflowCount) { Guard.Against.NegativeOrZero(workflowCount); - _receivedMessages.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue(); + (await _receivedMessages.WaitforAsync(workflowCount, MessageWaitTimeSpan)).Should().BeTrue(); _assertions.ShouldHaveCorrectNumberOfWorkflowRequestMessages(_dataProvider, _receivedMessages.Messages, workflowCount); } [Then(@"studies are uploaded to storage service")] public async Task ThenXXFilesUploadedToStorageService() { - _receivedMessages.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue(); await _assertions.ShouldHaveUploadedDicomDataToMinio(_receivedMessages.Messages, _dataProvider.DicomSpecs.FileHashes); } } diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json index 9a1865af0..c6a4880da 100644 --- a/tests/Integration.Test/packages.lock.json +++ b/tests/Integration.Test/packages.lock.json @@ -36,12 +36,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "SnTTQzyP+VUibyONIxi4e2crxYzkW5qfO64tmqxaY5J0KzJolR/nHo8ty4wParaeoybSQz7m9p+6lC7xJ1SHBg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.13", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.13", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -51,11 +51,11 @@ }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.12, )", - "resolved": "6.0.12", - "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", + "requested": "[6.0.13, )", + "resolved": "6.0.13", + "contentHash": "lh9ggbl2PwAoAcNH4wA22casTHK0cElJN2m2Ap7X5itOpJVAJDBhHMdXR+Mh1yoQ7Dq9EsUSFlJJFQ2Yskf9/Q==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.13", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -103,12 +103,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.4.0, )", - "resolved": "17.4.0", - "contentHash": "VtNZQ83ntG2aEUjy1gq6B4HNdn96se6FmdY/03At8WiqDReGrApm6OB2fNiSHz9D6IIEtWtNZ2FSH0RJDVXl/w==", + "requested": "[17.4.1, )", + "resolved": "17.4.1", + "contentHash": "kJ5/v2ad+VEg1fL8UH18nD71Eu+Fq6dM4RKBVqlV2MLSEK/AW4LUkqlk7m7G+BrxEDJVwPjxHam17nldxV80Ow==", "dependencies": { - "Microsoft.CodeCoverage": "17.4.0", - "Microsoft.TestPlatform.TestHost": "17.4.0" + "Microsoft.CodeCoverage": "17.4.1", + "Microsoft.TestPlatform.TestHost": "17.4.1" } }, "Minio": { @@ -155,11 +155,11 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.3, )", - "resolved": "4.18.3", - "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", + "requested": "[4.18.4, )", + "resolved": "4.18.4", + "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", "dependencies": { - "Castle.Core": "5.1.0" + "Castle.Core": "5.1.1" } }, "Polly": { @@ -264,8 +264,8 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "31UJpTHOiWq95CDOHazE3Ub/hE/PydNWsJMwnEVTqFFP4WhAugwpaVGxzOxKgNeSUUeqS2W6lxV+q7u1pAOfXg==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { "System.Diagnostics.EventLog": "6.0.0" } @@ -362,8 +362,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "2oZbSVTC2nAvQ2DnbXLlXS+c25ZyZdWeNd+znWwAxwGaPh9dwQ5NBsYyqQB7sKmJKIUdkKGmN3rzFzjVC81Dtg==" + "resolved": "17.4.1", + "contentHash": "T21KxaiFawbrrjm0uXjxAStXaBm5P9H6Nnf8BUtBTvIpd8q57lrChVBCY2dnazmSu9/kuX4z5+kAOT78Dod7vA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -372,38 +372,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", + "resolved": "6.0.13", + "contentHash": "J0tI2FyZcobMWBCWgSVFrp7fvkSPUfQzQUt16A0nMRfvq4IkozkEdx6rNpo0lGcCgUYeMimRw8H3ueqdkxGFXw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" + "resolved": "6.0.13", + "contentHash": "m0PpkBONNPOEdVXkHNfdDETMAZKqWEX6E4kzmrvC4b+5OgFCnuxJHyAJ3Relyw8jsjsCFednrFI3nINXGDX5Sg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" + "resolved": "6.0.13", + "contentHash": "JxZMC31ObhjlDF9rPp2JR5zRjYlhI/hx8cuHPE9Isg4ft7OmpFxRI2EHTOlTUwfRjN7Q41i3SWI8tv67zBP99w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", + "resolved": "6.0.13", + "contentHash": "kFMLjZPvUeg/hRdYBXSWtOaxFWTI2sf5a31Gbq6xXivOVQbOV8TBC6K7MsG91HiLpzBsWO5fvGiD9SiIAfhpNw==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore": "6.0.13", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", + "resolved": "6.0.13", + "contentHash": "Yyj1sNBHgvaTcsrWH90KWNtp0Z44Gav8/gwNwAM22Zz7top/7FF1TG75PBEk8S2I3qSGZjUHA+KOpWDJPfzQcQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.12", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", + "Microsoft.Data.Sqlite.Core": "6.0.13", + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -500,10 +500,10 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TdsjGYOHDg8656T2tWHUXNkYFUFstL/L9GEjboasuAetubH52yHkNpQV6WuqA6BpbfZHZj8xwKqN7aL7ZWO1Rg==", + "resolved": "6.0.13", + "contentHash": "uuKZ6qDgghq8uYUvZj/QuVe4+vH/N1KxbrSTnW86/u5DzrFMuiyCt80OLt/XmetwMZwZjpHC/F/9aaQ9u7kIQg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.3", "Microsoft.Extensions.Options": "6.0.0" @@ -511,17 +511,17 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "7GN8C+pcaIBMDQA6OOgBEWT+1Y/OhZTxzovNXIxxBsfU4xI7bmjez5321ya5rN2NbJXUmStNnJics78RkPQO4w==" + "resolved": "6.0.13", + "contentHash": "NVV3zsB1tGV70kNDACH3Os7Lt66hspVayN3LpNgnyfxAfq/TL4cCU4yZgwWUCvWs0Nx6o0Di5h8Q75Aehl9q0Q==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.12", - "contentHash": "TWtq9Hnjq8mTHbbe2JBLa5FR7wlxecFK/PjYQFWru+BVCWCXvRtscO/+S9/Dlz5XkgNzEfLwO9KvUqoh3EybtA==", + "resolved": "6.0.13", + "contentHash": "zm2bGsjCK42VQkVddXtvo7sI4cyX50MREIOqOhfeibV7VSqHVjbplvPd7f6U3vJBQ12n+uNg+jprqUwi00ia+w==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.12", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.12" + "Microsoft.EntityFrameworkCore.Relational": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.13", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.13" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -773,8 +773,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "oWe7A0wrZhxagTOcaxJ9r0NXTbgkiBQQuCpCXxnP06NsGV/qOoaY2oaangAJbOUrwEx0eka1do400NwNCjfytw==", + "resolved": "17.4.1", + "contentHash": "v2CwoejusooZa/DZYt7UXo+CJOvwAmqg6ZyFJeIBu+DCRDqpEtf7WYhZ/AWii0EKzANPPLU9+m148aipYQkTuA==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -782,10 +782,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.4.0", - "contentHash": "sUx48fu9wgQF1JxzXeSVtzb7KoKpJrdtIzsFamxET3ZYOKXj+Ej13HWZ0U2nuMVZtZVHBmE+KS3Vv5cIdTlycQ==", + "resolved": "17.4.1", + "contentHash": "K7QXM4P4qrDKdPs/VSEKXR08QEru7daAK8vlIbhwENM3peXJwb9QgrAbtbYyyfVnX+F1m+1hntTH6aRX+h/f8g==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.4.0", + "Microsoft.TestPlatform.ObjectModel": "17.4.1", "Newtonsoft.Json": "13.0.1" } }, @@ -856,32 +856,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==", + "resolved": "2.19.0", + "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==", + "resolved": "2.19.0", + "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Driver.Core": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0" + "MongoDB.Bson": "2.19.0", + "MongoDB.Driver.Core": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.18.0", - "contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==", + "resolved": "2.19.0", + "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.18.0", - "MongoDB.Libmongocrypt": "1.6.0", + "MongoDB.Bson": "2.19.0", + "MongoDB.Libmongocrypt": "1.7.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -890,8 +891,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg==" + "resolved": "1.7.0", + "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" }, "NETStandard.Library": { "type": "Transitive", @@ -917,25 +918,25 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" + "resolved": "5.1.1", + "contentHash": "YBfUDzipCaucs+8ieCDp8XECumiWsQbZwSUVLlt9i7FGV03nOPqoVzLtmlhbTxq4TN92BBsLacqPAE/ZyDDJ1g==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "wzVFG5p8Nwbs1Ws29T8YJg+UbJfsh61h6U4xArnDSrtVvOoccwKtoFPZWwbym3ZTiTFmHIf7Ugu1j/WnT7z3vg==", + "resolved": "5.2.1", + "contentHash": "b16cdOklZ3gfeuiyewsAmR2It/55Ar+plwsyo7CjgfwZtH1c5B2ZyYIGt1Ho+fPMOKEHkPU/trXZqAg9Oipiiw==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.0" + "NLog": "5.1.1" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "DqFgdydAWW+pshPdzh0ydk2jJrrVaZmBNz5+p9K8N9q/4BOPJ94S2fD8t9erd7ZMhnigaqOq/HqZH4nGGOYTbA==", + "resolved": "5.2.1", + "contentHash": "yusksFxJxIoXJbU/aH9IJHmNKNNk2a9hYLSzd02kr7EX3Oc2+IRpp50VUEwZpq0tWEdlqYOUCLlzLMtHDHkxSA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.0" + "NLog.Extensions.Logging": "5.2.1" } }, "NuGet.Frameworks": { @@ -1110,35 +1111,35 @@ }, "Swashbuckle.AspNetCore": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", + "resolved": "6.5.0", + "contentHash": "FK05XokgjgwlCI6wCT+D4/abtQkL1X1/B9Oas6uIwHFmYrIO9WUD5aLC9IzMs9GnHfUXOtXZ2S43gN1mhs5+aA==", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.5.0" } }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", + "resolved": "6.5.0", + "contentHash": "XWmCmqyFmoItXKFsQSwQbEAsjDKcxlNf1l+/Ki42hcb6LjKL8m5Db69OTvz5vLonMSRntYO1XLqz0OP+n3vKnA==", "dependencies": { "Microsoft.OpenApi": "1.2.3" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", + "resolved": "6.5.0", + "contentHash": "Y/qW8Qdg9OEs7V013tt+94OdPxbRdbhcEbw4NiwGvf4YBcfhL/y7qp/Mjv/cENsQ2L3NqJ2AOu94weBy/h4KvA==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.4.0" + "Swashbuckle.AspNetCore.Swagger": "6.5.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" + "resolved": "6.5.0", + "contentHash": "OvbvxX+wL8skxTBttcBsVxdh73Fag4xwqEU2edh4JMn7Ws/xJHnY/JB1e9RoCb6XpDxUF3hD9A0Z1lEUx40Pfw==" }, "System.Buffers": { "type": "Transitive", @@ -1795,10 +1796,10 @@ "DotNext.Threading": "[4.7.4, )", "HL7-dotnetcore": "[2.29.0, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.12, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.13, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1813,10 +1814,10 @@ "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.13, )", "Monai.Deploy.Storage.MinIO": "[0.2.13, )", - "NLog": "[5.1.0, )", - "NLog.Web.AspNetCore": "[5.2.0, )", + "NLog": "[5.1.1, )", + "NLog.Web.AspNetCore": "[5.2.1, )", "Polly": "[7.2.3, )", - "Swashbuckle.AspNetCore": "[6.4.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )", "fo-dicom": "[5.0.3, )", "fo-dicom.NLog": "[5.0.3, )" } @@ -1825,7 +1826,7 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", "Monai.Deploy.Messaging": "[0.1.19, )", "Monai.Deploy.Storage": "[0.2.13, )" @@ -1872,11 +1873,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.13, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1888,7 +1889,7 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", "Polly": "[7.2.3, )" @@ -1897,8 +1898,8 @@ "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.12, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Microsoft.EntityFrameworkCore": "[6.0.13, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.13, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -1911,8 +1912,8 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.18.0, )", - "MongoDB.Driver.Core": "[2.18.0, )" + "MongoDB.Driver": "[2.19.0, )", + "MongoDB.Driver.Core": "[2.19.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": {