Project-MONAI · mocsharp · Nov 17, 2022 · Nov 11, 2022 · Nov 16, 2022 · Nov 16, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -230,14 +230,16 @@ jobs:
           verbose: true
 
   integration-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
         feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir]
+        database: [ef, mongodb]
       fail-fast: false
     env:
       TAG: ${{ needs.build.outputs.TAG }}
+      DOTNET_TEST: ${{ matrix.database }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -102,7 +102,7 @@
   - :who: mocsharp
     :why: MIT (https://github.com/GitTools/GitVersion/raw/main/LICENSE)
     :versions:
-    - 5.10.3
+    - 5.11.1
     :when: 2022-08-16 23:05:34.633372053 Z
 - - :approve
   - HL7-dotnetcore
@@ -328,63 +328,63 @@
   - :who: mocsharp
     :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
     :versions:
-    - 6.0.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :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.10
+    - 6.0.11
     :when: 2022-08-16 23:05:53.706997823 Z
 - - :approve
   - Microsoft.Extensions.ApiDescription.Server
@@ -526,20 +526,22 @@
     :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
     :versions:
     - 6.0.10
+    - 6.0.11
     :when: 2022-08-29 18:11:22.090772006 Z
 - - :approve
   - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
   - :who: mocsharp
     :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
     :versions:
     - 6.0.10
+    - 6.0.11
     :when: 2022-08-29 18:11:22.090772006 Z
 - - :approve
   - Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore
   - :who: mocsharp
     :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
     :versions:
-    - 6.0.10
+    - 6.0.11
     :when: 2022-08-29 18:11:22.090772006 Z
 - - :approve
   - Microsoft.Extensions.FileProviders.Abstractions
@@ -605,6 +607,7 @@
     - 6.0.0
     - 6.0.1
     - 6.0.2
+    - 6.0.3
     :when: 2022-08-16 23:06:06.728283354 Z
 - - :approve
   - Microsoft.Extensions.Logging.Configuration
@@ -703,6 +706,7 @@
     :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
     :versions:
     - 3.0.0
+    - 5.0.0
     :when: 2022-08-16 23:06:13.902743611 Z
 - - :approve
   - Microsoft.NETCore.Targets
@@ -791,14 +795,14 @@
   - :who: neilsouth
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.17-rc0020
+    - 0.1.16
     :when: 2022-08-16 23:06:21.051573547 Z
 - - :approve
   - Monai.Deploy.Messaging.RabbitMQ
   - :who: neilsouth
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.17-rc0020
+    - 0.1.16
     :when: 2022-08-16 23:06:21.511789690 Z
 - - :approve
   - Monai.Deploy.Storage
@@ -1543,6 +1547,7 @@
     :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
     :versions:
     - 4.5.0
+    - 5.0.0
     :when: 2022-08-16 23:07:11.063425328 Z
 - - :approve
   - System.Security.Claims
@@ -1634,6 +1639,7 @@
     :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
     :versions:
     - 4.5.0
+    - 5.0.0
     :when: 2022-08-16 23:07:17.059464936 Z
 - - :approve
   - System.Text.Encoding
@@ -1684,7 +1690,7 @@
     :versions:
     - 6.0.0
     - 6.0.5
-    - 6.0.6
+    - 6.0.7
     :when: 2022-08-16 23:07:20.787263056 Z
 - - :approve
   - System.Text.RegularExpressions
@@ -2380,3 +2386,73 @@
     :versions:
     - 5.0.3
     :when: 2022-10-12 03:14:08.789273776 Z
+- - :approve
+  - DnsClient
+  - :who: mocsharp
+    :why: Apache-2.0 (https://github.com/MichaCo/DnsClient.NET/raw/dev/LICENSE)
+    :versions:
+    - 1.6.1
+    :when: 2022-11-16 23:33:33.315560769 Z
+- - :approve
+  - Snappier
+  - :who: mocsharp
+    :why: BSD-3-Clause (https://github.com/brantburnett/Snappier/raw/main/COPYING.txt)
+    :versions:
+    - 1.0.0
+    :when: 2022-10-14 23:37:36.642306800 Z
+- - :approve
+  - ZstdSharp.Port
+  - :who: mocsharp
+    :why: MIT (https://github.com/oleg-st/ZstdSharp/raw/master/LICENSE)
+    :versions:
+    - 0.6.2
+    :when: 2022-10-14 23:38:32.685243680 Z
+- - :approve
+  - Microsoft.Win32.Registry
+  - :who: mocsharp
+    :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
+    :versions:
+    - 5.0.0
+    :when: 2022-11-16 23:38:53.540718932 Z
+- - :approve
+  - MongoDB.Bson
+  - :who: mocsharp
+    :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
+    :versions:
+    - 2.18.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
+    :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
+    :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
+    :when: 2022-11-16 23:38:54.863359236 Z
+- - :approve
+  - SharpCompress
+  - :who: mocsharp
+    :why: MIT (https://github.com/adamhathcock/sharpcompress/raw/master/LICENSE.txt)
+    :versions:
+    - 0.30.1
+    :when: 2022-11-16 23:38:55.192078193 Z
+- - :approve
+  - SharpCompress
+  - :who: mocsharp
+    :why: MIT (https://github.com/adamhathcock/sharpcompress/raw/master/LICENSE.txt)
+    :versions:
+    - 0.30.1
+    :when: 2022-11-16 23:38:55.532789254 Z
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -68,7 +68,7 @@ services:
     networks:
       - monaideploy
     healthcheck:
-      test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/productiondb --quiet
+      test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/productiondb --quiet
       interval: 10s
       timeout: 10s
       retries: 5

diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md
@@ -1072,14 +1072,14 @@ SOFTWARE.
 
 
 <details>
-<summary>GitVersion.MsBuild 5.10.3</summary>
+<summary>GitVersion.MsBuild 5.11.1</summary>
 
 ## GitVersion.MsBuild
 
-- Version: 5.10.3
+- Version: 5.11.1
 - Authors: GitTools and Contributors
 - Project URL: https://github.com/GitTools/GitVersion
-- Source: [NuGet](https://www.nuget.org/packages/GitVersion.MsBuild/5.10.3)
+- Source: [NuGet](https://www.nuget.org/packages/GitVersion.MsBuild/5.11.1)
 - License: [MIT](https://github.com/GitTools/GitVersion/raw/main/LICENSE)
 
 
@@ -3015,14 +3015,14 @@ SOFTWARE.
 
 
 <details>
-<summary>Microsoft.EntityFrameworkCore 6.0.10</summary>
+<summary>Microsoft.EntityFrameworkCore 6.0.11</summary>
 
 ## Microsoft.EntityFrameworkCore
 
-- Version: 6.0.10
+- Version: 6.0.11
 - Authors: Microsoft
 - Project URL: https://docs.microsoft.com/ef/core/
-- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore/6.0.10)
+- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore/6.0.11)
 - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
 
 
@@ -3056,14 +3056,14 @@ SOFTWARE.
 
 
 <details>
-<summary>Microsoft.EntityFrameworkCore.Abstractions 6.0.10</summary>
+<summary>Microsoft.EntityFrameworkCore.Abstractions 6.0.11</summary>
 
 ## Microsoft.EntityFrameworkCore.Abstractions
 
-- Version: 6.0.10
+- Version: 6.0.11
 - Authors: Microsoft
 - Project URL: https://docs.microsoft.com/ef/core/
-- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Abstractions/6.0.10)
+- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Abstractions/6.0.11)
 - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
 
 
@@ -4680,14 +4680,14 @@ SOFTWARE.
 
 
 <details>
-<summary>Microsoft.Extensions.Logging.Abstractions 6.0.2</summary>
+<summary>Microsoft.Extensions.Logging.Abstractions 6.0.3</summary>
 
 ## Microsoft.Extensions.Logging.Abstractions
 
-- Version: 6.0.2
+- Version: 6.0.3
 - Authors: Microsoft
 - Project URL: https://dot.net/
-- Source: [NuGet](https://www.nuget.org/packages/Microsoft.Extensions.Logging.Abstractions/6.0.2)
+- Source: [NuGet](https://www.nuget.org/packages/Microsoft.Extensions.Logging.Abstractions/6.0.3)
 - License: [MIT](https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
 
 
@@ -24897,14 +24897,14 @@ SOFTWARE.
 
 
 <details>
-<summary>System.Text.Json 6.0.6</summary>
+<summary>System.Text.Json 6.0.7</summary>
 
 ## System.Text.Json
 
-- Version: 6.0.6
+- Version: 6.0.7
 - Authors: Microsoft
 - Project URL: https://dot.net/
-- Source: [NuGet](https://www.nuget.org/packages/System.Text.Json/6.0.6)
+- Source: [NuGet](https://www.nuget.org/packages/System.Text.Json/6.0.7)
 - License: [MIT](https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
 
 

diff --git a/src/Api/BaseApplicationEntity.cs b/src/Api/BaseApplicationEntity.cs
@@ -23,7 +23,7 @@ namespace Monai.Deploy.InformaticsGateway.Api
     /// <remarks>
     /// * [Application Entity](http://www.otpedia.com/entryDetails.cfm?id=137)
     /// </remarks>
-    public class BaseApplicationEntity
+    public class BaseApplicationEntity : MongoDBEntityBase
     {
         /// <summary>
         /// Gets or sets the unique name used to identify a DICOM application entity.
@@ -51,5 +51,10 @@ public void SetDefaultValues()
             if (string.IsNullOrWhiteSpace(Name))
                 Name = AeTitle;
         }
+
+        public override string ToString()
+        {
+            return $"Name: {Name}/AET: {AeTitle}/Host: {HostIp}";
+        }
     }
 }
diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
@@ -22,15 +22,16 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <IsTrimmable>true</IsTrimmable>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.10" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.17-rc0020" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.11" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.16" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
   </ItemGroup>