update export request event (#31)

* update export request event

Signed-off-by: Jack Schofield <[email protected]>

Author: jackschofield23

src/Messaging/Events/ExportCompleteEvent.cs

@@ -11,11 +11,11 @@ namespace Monai.Deploy.Messaging.Events
     public class ExportCompleteEvent : EventBase
     {
         /// <summary>
-        /// Gets or sets the workflow ID generated by the Workflow Manager.
+        /// Gets or sets the workflow instanceID generated by the Workflow Manager.
         /// </summary>
-        [JsonProperty(PropertyName = "workflow_id")]
+        [JsonProperty(PropertyName = "workflow_instance_id")]
         [Required]
-        public string WorkflowId { get; set; } = default!;
+        public string WorkflowInstanceId { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the export task ID generated by the Workflow Manager.
@@ -44,26 +44,15 @@ public ExportCompleteEvent()
             Status = ExportStatus.Unknown;
         }
 
-        public ExportCompleteEvent(ExportRequestEvent exportRequest)
+        public ExportCompleteEvent(ExportRequestEvent exportRequest, ExportStatus exportStatus)
         {
             Guard.Against.Null(exportRequest, nameof(exportRequest));
+            Guard.Against.Null(exportStatus, nameof(exportStatus));
 
-            WorkflowId = exportRequest.WorkflowId;
+            WorkflowInstanceId = exportRequest.WorkflowInstanceId;
             ExportTaskId = exportRequest.ExportTaskId;
             Message = string.Join(System.Environment.NewLine, exportRequest.ErrorMessages);
-
-            if (exportRequest.FailedFiles == 0)
-            {
-                Status = ExportStatus.Success;
-            }
-            else if (exportRequest.FailedFiles == exportRequest.Files.Count())
-            {
-                Status = ExportStatus.Failure;
-            }
-            else
-            {
-                Status = ExportStatus.PartialFailure;
-            }
+            Status = exportStatus;
         }
     }
 }

src/Messaging/Events/ExportRequestEvent.cs

@@ -9,11 +9,11 @@ namespace Monai.Deploy.Messaging.Events
     public class ExportRequestEvent : EventBase
     {
         /// <summary>
-        /// Gets or sets the workflow ID generated by the Workflow Manager.
+        /// Gets or sets the workflow instance ID generated by the Workflow Manager.
         /// </summary>
-        [JsonProperty(PropertyName = "workflow_id")]
+        [JsonProperty(PropertyName = "workflow_instance_id")]
         [Required]
-        public string WorkflowId { get; set; } = default!;
+        public string WorkflowInstanceId { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the export task ID generated by the Workflow Manager.
@@ -34,9 +34,9 @@ public class ExportRequestEvent : EventBase
         /// For DIMSE, the named DICOM destination.
         /// For ACR, the Transaction ID in the original inference request.
         /// </summary>
-        [JsonProperty(PropertyName = "destination")]
+        [JsonProperty(PropertyName = "destinations")]
         [Required]
-        public string Destination { get; set; } = default!;
+        public string[] Destinations { get; set; } = default!;
 
         /// <summary>
         /// Gets or set the correlation ID.
@@ -47,16 +47,6 @@ public class ExportRequestEvent : EventBase
         [Required]
         public string CorrelationId { get; set; } = default!;
 
-        /// <summary>
-        /// Gets or set number of files exported successfully.
-        /// </summary>
-        public int SucceededFiles { get; set; } = 0;
-
-        /// <summary>
-        /// Gets or sets number of files failed to export.
-        /// </summary>
-        public int FailedFiles { get; set; } = 0;
-
         /// <summary>
         /// Gets or sets the delivery tag or acknowledge token for the task.
         /// </summary>
@@ -67,12 +57,6 @@ public class ExportRequestEvent : EventBase
         /// </summary>
         public string MessageId { get; set; } = default!;
 
-        /// <summary>
-        /// Gets whether the export task is completed or not based on file count.
-        /// </summary>
-        public bool IsCompleted
-        { get { return (SucceededFiles + FailedFiles) == Files.Count(); } }
-
         /// <summary>
         /// Gets or sets error messages related to this export task.
         /// </summary>

src/Messaging/Test/ExportCompleteEventTest.cs

@@ -11,22 +11,17 @@ namespace Monai.Deploy.Messaging.Test
 {
     public class ExportCompleteEventTest
     {
-        [Theory(DisplayName = "Shall generate ExportCompleteMessageTest from ExportRequestMessage")]
-        [InlineData(1, 0, ExportStatus.Success)]
-        [InlineData(0, 5, ExportStatus.Failure)]
-        [InlineData(3, 3, ExportStatus.PartialFailure)]
-        public void ShallGenerateExportCompleteMessageTestFromExportRequestMessage(int successded, int fialure, ExportStatus status)
+        [Fact(DisplayName = "Shall generate ExportCompleteMessageTest from ExportRequestMessage")]
+        public void ShallGenerateExportCompleteMessageTestFromExportRequestMessage()
         {
             var exportRequestMessage = new ExportRequestEvent
             {
                 CorrelationId = Guid.NewGuid().ToString(),
                 DeliveryTag = Guid.NewGuid().ToString(),
-                Destination = Guid.NewGuid().ToString(),
+                Destinations = new string[] { Guid.NewGuid().ToString() },
                 ExportTaskId = Guid.NewGuid().ToString(),
                 MessageId = Guid.NewGuid().ToString(),
-                WorkflowId = Guid.NewGuid().ToString(),
-                SucceededFiles = successded,
-                FailedFiles = fialure,
+                WorkflowInstanceId = Guid.NewGuid().ToString(),
             };
             exportRequestMessage.Files = new List<string>()
             {
@@ -48,12 +43,12 @@ public void ShallGenerateExportCompleteMessageTestFromExportRequestMessage(int s
 
             exportRequestMessage.AddErrorMessages(errors);
 
-            var exportCompleteMessage = new ExportCompleteEvent(exportRequestMessage);
+            var exportCompleteMessage = new ExportCompleteEvent(exportRequestMessage, ExportStatus.Success);
 
-            Assert.Equal(exportRequestMessage.WorkflowId, exportCompleteMessage.WorkflowId);
+            Assert.Equal(exportRequestMessage.WorkflowInstanceId, exportCompleteMessage.WorkflowInstanceId);
             Assert.Equal(exportRequestMessage.ExportTaskId, exportCompleteMessage.ExportTaskId);
             Assert.Equal(string.Join(System.Environment.NewLine, errors), exportCompleteMessage.Message);
-            Assert.Equal(status, exportCompleteMessage.Status);
+            Assert.Equal(ExportStatus.Success, exportCompleteMessage.Status);
         }
 
         [Fact(DisplayName = "Validation shall throw on error")]