fix bug where workflow is empty in the workflow request message

Author: mocsharp

src/Api/Storage/Payload.cs

@@ -10,6 +10,7 @@
 // limitations under the License.
 
 using Ardalis.GuardClauses;
+using Monai.Deploy.InformaticsGateway.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -61,13 +62,7 @@ public enum PayloadState
 
         public int Count { get => _fileCount; }
 
-        public IEnumerable<string> Workflows
-        {
-            get
-            {
-                return Files.SelectMany(x => x.Workflows).Distinct();
-            }
-        }
+        public ISet<string> Workflows { get; private set; }
 
         public string CorrelationId { get; init; }
 
@@ -87,6 +82,7 @@ public Payload(string key, string correlationId, uint timeout)
             State = PayloadState.Created;
             Files = new List<FileStorageInfo>();
             UploadedFiles = new List<BlockStorageInfo>();
+            Workflows = new HashSet<string>();
         }
 
         public void Add(FileStorageInfo value)
@@ -98,6 +94,15 @@ public void Add(FileStorageInfo value)
             _lastReceived.Start();
             _fileCount = Files.Count;
 
+            if (!value.Workflows.IsNullOrEmpty())
+            {
+                foreach (var workflow in value.Workflows)
+                {
+
+                    Workflows.Add(workflow);
+                }
+            }
+
             if (Files.Count == 1)
             {
                 DateTimeCreated = value.Received;

src/Database/Migrations/20220211175051_R1_Patch.Designer.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Monai.Deploy.InformaticsGateway.Database.Migrations
+{
+    public partial class R1_Patch : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Workflows",
+                table: "Payload",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Workflows",
+                table: "Payload");
+        }
+    }
+}

src/Database/Migrations/20220211175051_R1_Patch.cs

@@ -155,6 +155,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("UploadedFiles")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("Workflows")
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.ToTable("Payload");

src/Database/Migrations/InformaticsGatewayContextModelSnapshot.cs

@@ -33,6 +33,10 @@ public void Configure(EntityTypeBuilder<Payload> builder)
                 (c1, c2) => c1.SequenceEqual(c2),
                 c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
                 c => c.ToList());
+            var workflowComparer = new ValueComparer<ISet<string>>(
+                (c1, c2) => c1.SequenceEqual(c2),
+                c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+                c => c.ToHashSet());
 
             var jsonSerializerSettings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
 
@@ -52,6 +56,11 @@ public void Configure(EntityTypeBuilder<Payload> builder)
                         v => JsonConvert.SerializeObject(v, jsonSerializerSettings),
                         v => JsonConvert.DeserializeObject<IList<BlockStorageInfo>>(v, jsonSerializerSettings))
                 .Metadata.SetValueComparer(blockStorageInfoComparer);
+            builder.Property(j => j.Workflows)
+                .HasConversion(
+                        v => JsonConvert.SerializeObject(v, jsonSerializerSettings),
+                        v => JsonConvert.DeserializeObject<ISet<string>>(v, jsonSerializerSettings))
+                .Metadata.SetValueComparer(workflowComparer);
         }
     }
 }

src/Database/PayloadConfiguration.cs

@@ -115,7 +115,7 @@ await Policy
                            _configuration.Value.Export.Retries.RetryDelays,
                            (exception, timeSpan, retryCount, context) =>
                            {
-                               _logger.Log(LogLevel.Error, exception, $"Error exporting to DICOMweb destination. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.");
+                               _logger.Log(LogLevel.Error, exception, $"Error exporting to DICOM destination. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.");
                            })
                        .ExecuteAsync(async () =>
                        {
@@ -221,4 +221,4 @@ private void HandleCStoreException(Exception ex, ExportRequestDataMessage export
             exportRequestData.SetFailed(errorMessage);
         }
     }
-}
+}

src/InformaticsGateway/Services/Export/ScuExportService.cs

@@ -259,7 +259,9 @@ public void PayloadNotificationService_ShalUploadFilesAndPublish()
                 .Callback(() => _cancellationTokenSource.CancelAfter(500));
 
             var payload = new Payload("test", Guid.NewGuid().ToString(), 100) { State = Payload.PayloadState.Upload };
-            payload.Add(new DicomFileStorageInfo("correlation", "/root", "1", "source", _fileSystem.Object) { StudyInstanceUid = "study", SeriesInstanceUid = "series", SopInstanceUid = "sop" });
+            var instance = new DicomFileStorageInfo("correlation", "/root", "1", "source", _fileSystem.Object) { StudyInstanceUid = "study", SeriesInstanceUid = "series", SopInstanceUid = "sop" };
+            instance.SetWorkflows("workflow1", "workflow2");
+            payload.Add(instance);
             var filePath = payload.Files[0].FilePath;
 
             var uploadPath = Path.Combine(payload.Id.ToString(), payload.Files[0].UploadPath);
@@ -297,7 +299,11 @@ public void PayloadNotificationService_ShalUploadFilesAndPublish()
 
             _instanceCleanupQueue.Verify(p => p.Queue(It.IsAny<FileStorageInfo>()), Times.Once());
 
-            _messageBrokerPublisherService.Verify(p => p.Publish(It.Is<string>(p => p.Equals(_options.Value.Messaging.Topics.WorkflowRequest)), It.Is<Message>(p => p.ConvertTo<WorkflowRequestMessage>().Payload.Count == 1)), Times.Once());
+            _messageBrokerPublisherService.Verify(
+                p => p.Publish(
+                    It.Is<string>(p => p.Equals(_options.Value.Messaging.Topics.WorkflowRequest)),
+                    It.Is<Message>(p => p.ConvertTo<WorkflowRequestMessage>().Payload.Count == 1 && p.ConvertTo<WorkflowRequestMessage>().Workflows.Count() == 2))
+                , Times.Once());
         }
     }
 }

src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationServiceTest.cs

@@ -429,7 +429,7 @@ public async Task UnreachableServer()
         {
             _scpLogger.Invocations.Clear();
             var sopInstanceUid = DicomUIDGenerator.GenerateDerivedFromUUID().UID;
-            var destination = new DestinationApplicationEntity { AeTitle = DicomScpFixture.AETITLE, Name = DicomScpFixture.AETITLE, HostIp = "unknown", Port = _port };
+            var destination = new DestinationApplicationEntity { AeTitle = DicomScpFixture.AETITLE, Name = DicomScpFixture.AETITLE, HostIp = "UNKNOWNHOST123456789", Port = _port };
             var service = new ScuExportService(_logger.Object, _serviceScopeFactory.Object, _configuration, _storageInfoProvider.Object, _dicomToolkit.Object);
 
             _storageInfoProvider.Setup(p => p.HasSpaceAvailableForExport).Returns(true);
@@ -464,7 +464,7 @@ public async Task UnreachableServer()
 
             DicomScpFixture.DicomStatus = DicomStatus.Success;
             await service.StartAsync(_cancellationTokenSource.Token);
-            Assert.True(dataflowCompleted.WaitOne(5000));
+            Assert.True(dataflowCompleted.WaitOne(8000));
             await StopAndVerify(service);
 
             _messagePublisherService.Verify(
@@ -558,4 +558,4 @@ private async Task StopAndVerify(ScuExportService service)
             Thread.Sleep(500);
         }
     }
-}
+}