gh-33 Update DB migration

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/CLI/Commands/AetCommand.cs

@@ -219,12 +219,12 @@ private async Task<int> AddAeTitlehandlerAsync(MonaiApplicationEntity entity, IH
                 if (result.IgnoredSopClasses.Any())
                 {
                     logger.MonaiAeIgnoredSops(string.Join(',', result.IgnoredSopClasses));
-                    logger.IgnoreSopClassesWarning();
+                    logger.IgnoredSopClassesWarning();
                 }
                 if (result.AllowedSopClasses.Any())
                 {
                     logger.MonaiAeAllowedSops(string.Join(',', result.AllowedSopClasses));
-                    logger.IgnoreSopClassesWarning();
+                    logger.AcceptedSopClassesWarning();
                 }
             }
             catch (ConfigurationException ex)

src/CLI/Logging/Log.cs

@@ -34,7 +34,7 @@ public static partial class Log
         public static partial void MonaiAeIgnoredSops(this ILogger logger, string ignoredSopClasses);
 
         [LoggerMessage(EventId = 30014, Level = LogLevel.Warning, Message = "Instances with matching SOP class UIDs are accepted but dropped.")]
-        public static partial void IgnoreSopClassesWarning(this ILogger logger);
+        public static partial void IgnoredSopClassesWarning(this ILogger logger);
 
         [LoggerMessage(EventId = 30015, Level = LogLevel.Critical, Message = "Error creating MONAI SCP AE Title {aeTitle}: {message}.")]
         public static partial void MonaiAeCreateCritical(this ILogger logger, string aeTitle, string message);
@@ -144,6 +144,9 @@ public static partial class Log
         [LoggerMessage(EventId = 30051, Level = LogLevel.Warning, Message = "Instances without matching SOP class UIDs are accepted but dropped.")]
         public static partial void AllowedSopClassesWarning(this ILogger logger);
 
+        [LoggerMessage(EventId = 30052, Level = LogLevel.Warning, Message = "Only instances with matching SOP class UIDs are accepted and stored.")]
+        public static partial void AcceptedSopClassesWarning(this ILogger logger);
+
         // Docker Runner
         [LoggerMessage(EventId = 31000, Level = LogLevel.Debug, Message = "Checking for existing {applicationName} ({version}) containers...")]
         public static partial void CheckingExistingAppContainer(this ILogger logger, string applicationName, string version);

src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj

@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache License 2.0
     <SelfContained>true</SelfContained>
     <PublishTrimmed>false</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <AssemblyName>mig-cli</AssemblyName>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

src/Database/Migrations/20220322185946_R2_0.2.0.Designer.cs renamed to src/Database/Migrations/20220613235333_R2_0.2.0.Designer.cs

@@ -25,10 +25,20 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 oldClrType: typeof(string),
                 oldType: "TEXT",
                 oldNullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "AllowedSopClasses",
+                table: "MonaiApplicationEntities",
+                type: "TEXT",
+                nullable: true);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropColumn(
+                name: "AllowedSopClasses",
+                table: "MonaiApplicationEntities");
+
             migrationBuilder.AlterColumn<string>(
                 name: "CorrelationId",
                 table: "Payload",

src/Database/Migrations/20220322185946_R2_0.2.0.cs renamed to src/Database/Migrations/20220613235333_R2_0.2.0.cs

@@ -48,6 +48,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("AllowedSopClasses")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Grouping")
                         .IsRequired()
                         .HasColumnType("TEXT");

src/Database/Migrations/InformaticsGatewayContextModelSnapshot.cs

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium
+// SPDX-FileCopyrightText: � 2021-2022 MONAI Consortium
 // SPDX-License-Identifier: Apache License 2.0
 
 using System;
@@ -153,7 +153,7 @@ private void Validate(MonaiApplicationEntity item)
             }
             if (item.IgnoredSopClasses.Any() && item.AllowedSopClasses.Any())
             {
-                throw new ConfigurationException($"Cannot specify both allowed ignored SOP classes at the same time, they are mutually exclusive.");
+                throw new ConfigurationException($"Cannot specify both allowed and ignored SOP classes at the same time, they are mutually exclusive.");
             }
             if (!item.IsValid(out var validationErrors))
             {

src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs

@@ -233,7 +233,7 @@ public async Task Create_ShallReturnBadRequestWhenBothAllowedAndIgnoredSopsAreDe
             var problem = objectResult.Value as ProblemDetails;
             Assert.NotNull(problem);
             Assert.Equal("Validation error.", problem.Title);
-            Assert.Equal("Cannot specify both allowed ignored SOP classes at the same time, they are mutually exclusive.", problem.Detail);
+            Assert.Equal("Cannot specify both allowed and ignored SOP classes at the same time, they are mutually exclusive.", problem.Detail);
             Assert.Equal((int)HttpStatusCode.BadRequest, problem.Status);
         }