adding external App repo

Signed-off-by: Neil South <neil.south@answerdigital.com>
Project-MONAI · Nov 8, 2023 · f7eb708 · f7eb708
1 parent 9676541
commit f7eb708
Show file tree

Hide file tree

Showing 93 changed files with 810 additions and 85 deletions.
diff --git a/src/Api/BaseApplicationEntity.cs → src/Api/Models/BaseApplicationEntity.cs b/src/Api/BaseApplicationEntity.cs → src/Api/Models/BaseApplicationEntity.cs
@@ -17,8 +17,9 @@
 
 using System;
 using System.Security.Claims;
+using Monai.Deploy.InformaticsGateway.Api.Storage;
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Models
 {
     /// <summary>
     /// DICOM Application Entity or AE.

diff --git a/src/Api/DestinationApplicationEntity.cs → ...pi/Models/DestinationApplicationEntity.cs b/src/Api/DestinationApplicationEntity.cs → ...pi/Models/DestinationApplicationEntity.cs
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Models
 {
     /// <summary>
     /// Destination Application Entity

diff --git a/src/Api/DicomAssociationInfo.cs → src/Api/Models/DicomAssociationInfo.cs b/src/Api/DicomAssociationInfo.cs → src/Api/Models/DicomAssociationInfo.cs
@@ -16,8 +16,9 @@
 
 using System;
 using System.Collections.Generic;
+using Monai.Deploy.InformaticsGateway.Api.Storage;
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Models
 {
     public class DicomAssociationInfo : MongoDBEntityBase
     {

diff --git a/src/Api/ExportRequestDataMessage.cs → src/Api/Models/ExportRequestDataMessage.cs b/src/Api/ExportRequestDataMessage.cs → src/Api/Models/ExportRequestDataMessage.cs
@@ -20,7 +20,7 @@
 using Monai.Deploy.InformaticsGateway.Api.PlugIns;
 using Monai.Deploy.Messaging.Events;
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Models
 {
     public class ExportRequestDataMessage
     {

diff --git a/src/Api/Models/ExternalAppDetails.cs b/src/Api/Models/ExternalAppDetails.cs
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Monai.Deploy.InformaticsGateway.Api.Storage;
+
+namespace Monai.Deploy.InformaticsGateway.Api.Models
+{
+    public class ExternalAppDetails : MongoDBEntityBase
+    {
+        public string StudyInstanceUid { get; set; } = string.Empty;
+
+        public string WorkflowInstanceId { get; set; } = string.Empty;
+
+        public string ExportTaskID { get; set; } = string.Empty;
+
+        public string CorrelationId { get; set; } = string.Empty;
+    }
+}
diff --git a/src/Api/MonaiApplicationEntity.cs → src/Api/Models/MonaiApplicationEntity.cs b/src/Api/MonaiApplicationEntity.cs → src/Api/Models/MonaiApplicationEntity.cs
@@ -21,8 +21,9 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Security.Claims;
 using Monai.Deploy.InformaticsGateway.Api.PlugIns;
+using Monai.Deploy.InformaticsGateway.Api.Storage;
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Models
 {
     /// <summary>
     /// MONAI Application Entity

diff --git a/src/Api/PlugIns/IOutputDataPlugin.cs b/src/Api/PlugIns/IOutputDataPlugin.cs
@@ -16,6 +16,7 @@
 
 using System.Threading.Tasks;
 using FellowOakDicom;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Api.PlugIns
 {

diff --git a/src/Api/PlugIns/IOutputDataPluginEngine.cs b/src/Api/PlugIns/IOutputDataPluginEngine.cs
@@ -16,6 +16,7 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Api.PlugIns
 {

diff --git a/src/Api/SourceApplicationEntity.cs b/src/Api/SourceApplicationEntity.cs
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+using Monai.Deploy.InformaticsGateway.Api.Models;
+
 namespace Monai.Deploy.InformaticsGateway.Api
 {
     /// <summary>

diff --git a/src/Api/MongoDBEntityBase.cs → src/Api/Storage/MongoDBEntityBase.cs b/src/Api/MongoDBEntityBase.cs → src/Api/Storage/MongoDBEntityBase.cs
@@ -16,7 +16,7 @@
 
 using System;
 
-namespace Monai.Deploy.InformaticsGateway.Api
+namespace Monai.Deploy.InformaticsGateway.Api.Storage
 {
     public abstract class MongoDBEntityBase
     {

diff --git a/src/Api/Test/BaseApplicationEntityTest.cs b/src/Api/Test/BaseApplicationEntityTest.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Xunit;
 
 namespace Monai.Deploy.InformaticsGateway.Api.Test

diff --git a/src/Api/Test/DestinationApplicationEntityTest.cs b/src/Api/Test/DestinationApplicationEntityTest.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Xunit;
 
 namespace Monai.Deploy.InformaticsGateway.Api.Test

diff --git a/src/Api/Test/MonaiApplicationEntityTest.cs b/src/Api/Test/MonaiApplicationEntityTest.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Xunit;
 
 namespace Monai.Deploy.InformaticsGateway.Api.Test

diff --git a/src/Api/VirtualApplicationEntity.cs b/src/Api/VirtualApplicationEntity.cs
@@ -20,6 +20,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Security.Claims;
 using Monai.Deploy.InformaticsGateway.Api.PlugIns;
+using Monai.Deploy.InformaticsGateway.Api.Storage;
 
 namespace Monai.Deploy.InformaticsGateway.Api
 {

diff --git a/src/CLI/Commands/AetCommand.cs b/src/CLI/Commands/AetCommand.cs
@@ -26,7 +26,7 @@
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.CLI.Services;
 using Monai.Deploy.InformaticsGateway.Client;
 using Monai.Deploy.InformaticsGateway.Common;

diff --git a/src/CLI/Commands/DestinationCommand.cs b/src/CLI/Commands/DestinationCommand.cs
@@ -26,7 +26,7 @@
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.CLI.Services;
 using Monai.Deploy.InformaticsGateway.Client;
 using Monai.Deploy.InformaticsGateway.Common;

diff --git a/src/CLI/Test/AetCommandTest.cs b/src/CLI/Test/AetCommandTest.cs
@@ -28,7 +28,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.CLI.Services;
 using Monai.Deploy.InformaticsGateway.Client;
 using Monai.Deploy.InformaticsGateway.SharedTest;

diff --git a/src/CLI/Test/DestinationCommandTest.cs b/src/CLI/Test/DestinationCommandTest.cs
@@ -29,7 +29,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.CLI.Services;
 using Monai.Deploy.InformaticsGateway.Client;
 using Monai.Deploy.InformaticsGateway.SharedTest;

diff --git a/src/Client/IInformaticsGatewayClient.cs b/src/Client/IInformaticsGatewayClient.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Net.Http.Headers;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.Client.Services;
 
 namespace Monai.Deploy.InformaticsGateway.Client

diff --git a/src/Client/InformaticsGatewayClient.cs b/src/Client/InformaticsGatewayClient.cs
@@ -20,6 +20,7 @@
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.Logging;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.Client.Common;
 using Monai.Deploy.InformaticsGateway.Client.Services;
 

diff --git a/src/Client/Services/AeTitle{T}Service.cs b/src/Client/Services/AeTitle{T}Service.cs
@@ -23,7 +23,7 @@
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
 using Microsoft.Extensions.Logging;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Client.Services
 {

diff --git a/src/Client/Test/AeTitleServiceTest.cs b/src/Client/Test/AeTitleServiceTest.cs
@@ -24,6 +24,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Monai.Deploy.InformaticsGateway.Client.Common;
 using Monai.Deploy.InformaticsGateway.Client.Services;
 using Moq;

diff --git a/src/Configuration/Test/ValidationExtensionsTest.cs b/src/Configuration/Test/ValidationExtensionsTest.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using FellowOakDicom;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 using Xunit;
 
 namespace Monai.Deploy.InformaticsGateway.Configuration.Test

diff --git a/src/Configuration/ValidationExtensions.cs b/src/Configuration/ValidationExtensions.cs
@@ -22,6 +22,7 @@
 using Ardalis.GuardClauses;
 using FellowOakDicom;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Configuration
 {

diff --git a/src/Database/Api/Repositories/IDestinationApplicationEntityRepository.cs b/src/Database/Api/Repositories/IDestinationApplicationEntityRepository.cs
@@ -15,7 +15,7 @@
  */
 
 using System.Linq.Expressions;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
 {

diff --git a/src/Database/Api/Repositories/IDicomAssociationInfoRepository.cs b/src/Database/Api/Repositories/IDicomAssociationInfoRepository.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
 {

diff --git a/src/Database/Api/Repositories/IExternalAppDeatilsRepository.cs b/src/Database/Api/Repositories/IExternalAppDeatilsRepository.cs
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Monai.Deploy.InformaticsGateway.Api.Models;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
+{
+    public interface IExternalAppDetailsRepository
+    {
+        Task AddAsync(ExternalAppDetails details, CancellationToken cancellationToken);
+
+        Task<ExternalAppDetails> GetAsync(string studyInstanceId, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Database/Api/Repositories/IMonaiApplicationEntityRepository.cs b/src/Database/Api/Repositories/IMonaiApplicationEntityRepository.cs
@@ -15,7 +15,7 @@
  */
 
 using System.Linq.Expressions;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
 {

diff --git a/src/Database/Api/StorageMetadataWrapper.cs b/src/Database/Api/StorageMetadataWrapper.cs
@@ -17,7 +17,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Ardalis.GuardClauses;
-using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 
 namespace Monai.Deploy.InformaticsGateway.Database.Api

diff --git a/src/Database/DatabaseManager.cs b/src/Database/DatabaseManager.cs
@@ -91,6 +91,7 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi
                     services.AddScoped(typeof(IPayloadRepository), typeof(EntityFramework.Repositories.PayloadRepository));
                     services.AddScoped(typeof(IDicomAssociationInfoRepository), typeof(EntityFramework.Repositories.DicomAssociationInfoRepository));
                     services.AddScoped(typeof(IVirtualApplicationEntityRepository), typeof(EntityFramework.Repositories.VirtualApplicationEntityRepository));
+                    services.AddScoped(typeof(IExternalAppDetailsRepository), typeof(EntityFramework.Repositories.ExternalAppDetailsRepository));
 
                     services.ConfigureDatabaseFromPlugIns(DatabaseType.EntityFramework, fileSystem, connectionStringConfigurationSection, pluginsConfigurationSection, loggerFactory);
                     return services;
@@ -106,6 +107,7 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi
                     services.AddScoped(typeof(IPayloadRepository), typeof(MongoDB.Repositories.PayloadRepository));
                     services.AddScoped(typeof(IDicomAssociationInfoRepository), typeof(MongoDB.Repositories.DicomAssociationInfoRepository));
                     services.AddScoped(typeof(IVirtualApplicationEntityRepository), typeof(MongoDB.Repositories.VirtualApplicationEntityRepository));
+                    services.AddScoped(typeof(IExternalAppDetailsRepository), typeof(MongoDB.Repositories.ExternalAppDetailsRepository));
 
                     services.ConfigureDatabaseFromPlugIns(DatabaseType.MongoDb, fileSystem, connectionStringConfigurationSection, pluginsConfigurationSection, loggerFactory);
 

diff --git a/src/Database/EntityFramework/Configuration/DestinationApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/DestinationApplicationEntityConfiguration.cs
@@ -17,7 +17,7 @@
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configuration
 {

diff --git a/src/Database/EntityFramework/Configuration/DicomAssociationInfoConfiguration.cs b/src/Database/EntityFramework/Configuration/DicomAssociationInfoConfiguration.cs
@@ -20,7 +20,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configuration
 {

diff --git a/src/Database/EntityFramework/Configuration/ExternalAppDetailsConfiguration.cs b/src/Database/EntityFramework/Configuration/ExternalAppDetailsConfiguration.cs
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+using System.Text.Json.Serialization;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Monai.Deploy.InformaticsGateway.Api.Models;
+
+namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configuration
+{
+    internal class ExternalAppDetailsConfiguration : IEntityTypeConfiguration<ExternalAppDetails>
+    {
+        public void Configure(EntityTypeBuilder<ExternalAppDetails> builder)
+        {
+            var jsonSerializerSettings = new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            };
+
+            builder.HasKey(j => j.Id);
+
+            builder.Property(j => j.StudyInstanceUid).IsRequired();
+            builder.Property(j => j.WorkflowInstanceId).IsRequired();
+            builder.Property(j => j.DateTimeCreated).IsRequired();
+            builder.Property(j => j.CorrelationId).IsRequired();
+            builder.Property(j => j.ExportTaskID).IsRequired();
+        }
+    }
+}
diff --git a/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs
@@ -20,7 +20,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Api.Models;
 
 namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configuration
 {