Merge pull request #983 from Project-MONAI/nds-payload-add-workflownames

fix for GetSeriesInstanceUID in payload table

Author: neildsouth

src/WorkflowManager/Common/Services/PayloadService.cs

@@ -248,7 +248,7 @@ public async Task<bool> DeletePayloadFromStorageAsync(string payloadId)
 
         public Task<bool> UpdateAsyncWorkflowIds(Payload payload)
         {
-            ArgumentNullException.ThrowIfNull(payload, nameof(payload));
+            ArgumentNullException.ThrowIfNull(payload);
 
             return _payloadRepository.UpdateAsyncWorkflowIds(payload);
         }

src/WorkflowManager/Contracts/Models/Payload.cs

@@ -42,8 +42,8 @@ public class Payload : IDocument
         [JsonProperty(PropertyName = "workflows")]
         public IEnumerable<string> Workflows { get; set; } = [];
 
-        [JsonProperty(PropertyName = "workflow_names")]
-        public List<string> TriggeredWorkflowNames { get; set; } = [];
+        [JsonProperty(PropertyName = "triggered_workflow_names")]
+        public IEnumerable<string> TriggeredWorkflowNames { get; set; } = [];
 
         [JsonProperty(PropertyName = "workflow_instance_ids")]
         public IEnumerable<string> WorkflowInstanceIds { get; set; } = [];

src/WorkflowManager/Contracts/Models/PayloadDto.cs

@@ -37,6 +37,7 @@ public PayloadDto(Payload payload)
             PatientDetails = payload.PatientDetails;
             PayloadDeleted = payload.PayloadDeleted;
             SeriesInstanceUid = payload.SeriesInstanceUid;
+            TriggeredWorkflowNames = payload.TriggeredWorkflowNames;
         }
 
         [JsonProperty(PropertyName = "payload_status")]

src/WorkflowManager/Storage/Services/DicomService.cs

@@ -291,7 +291,7 @@ public string GetValue(Dictionary<string, DicomValue> dict, string keyId)
 
             if (dict.TryGetValue(DicomTagConstants.SeriesInstanceUIDTag, out var value))
             {
-                return value.Value.ToString();
+                return JsonConvert.SerializeObject(value.Value);
             }
             return null;
         }

tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs

@@ -492,11 +492,15 @@ public async Task PayloadServiceCreate_Should_Call_GetExpiry()
         [Fact]
         public async Task UpdateAsync_NullPayload_ThrowsArgumentNullException()
         {
+
+#pragma warning disable CS8604 // Possible null reference argument.
             // Arrange
             Payload payload = null;
 
             // Act & Assert
+
             await Assert.ThrowsAsync<ArgumentNullException>(() => PayloadService.UpdateAsyncWorkflowIds(payload));
+#pragma warning restore CS8604 // Possible null reference argument.
         }
 
     }