diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index 173854d39..ddb2cc2c8 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -248,7 +248,7 @@ public async Task DeletePayloadFromStorageAsync(string payloadId) public Task UpdateAsyncWorkflowIds(Payload payload) { - ArgumentNullException.ThrowIfNull(payload, nameof(payload)); + ArgumentNullException.ThrowIfNull(payload); return _payloadRepository.UpdateAsyncWorkflowIds(payload); } diff --git a/src/WorkflowManager/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs index e1dd3fb52..fb78bdcd9 100755 --- a/src/WorkflowManager/Contracts/Models/Payload.cs +++ b/src/WorkflowManager/Contracts/Models/Payload.cs @@ -42,8 +42,8 @@ public class Payload : IDocument [JsonProperty(PropertyName = "workflows")] public IEnumerable Workflows { get; set; } = []; - [JsonProperty(PropertyName = "workflow_names")] - public List TriggeredWorkflowNames { get; set; } = []; + [JsonProperty(PropertyName = "triggered_workflow_names")] + public IEnumerable TriggeredWorkflowNames { get; set; } = []; [JsonProperty(PropertyName = "workflow_instance_ids")] public IEnumerable WorkflowInstanceIds { get; set; } = []; diff --git a/src/WorkflowManager/Contracts/Models/PayloadDto.cs b/src/WorkflowManager/Contracts/Models/PayloadDto.cs index c76f1bd33..6fa47934e 100644 --- a/src/WorkflowManager/Contracts/Models/PayloadDto.cs +++ b/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")] diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs index b94e79a17..eeb8ce8ba 100644 --- a/src/WorkflowManager/Storage/Services/DicomService.cs +++ b/src/WorkflowManager/Storage/Services/DicomService.cs @@ -291,7 +291,7 @@ public string GetValue(Dictionary dict, string keyId) if (dict.TryGetValue(DicomTagConstants.SeriesInstanceUIDTag, out var value)) { - return value.Value.ToString(); + return JsonConvert.SerializeObject(value.Value); } return null; } diff --git a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs index 7cec3977a..c3931e7ca 100644 --- a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs +++ b/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(() => PayloadService.UpdateAsyncWorkflowIds(payload)); +#pragma warning restore CS8604 // Possible null reference argument. } }