Fix #56 include files in export request message

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

Author: mocsharp

src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs

@@ -275,15 +275,19 @@ private async Task<PayloadAction> UpdatePayloadState(Payload payload)
         private Task NotifyPayloadReady(Payload payload)
         {
             _logger.Log(LogLevel.Debug, $"Generating workflow request message for payload {payload.Id}...");
+            var workflowRequest = new WorkflowRequestMessage
+            {
+                PayloadId = payload.Id,
+                Workflows = payload.Workflows,
+                FileCount = payload.Count,
+                CorrelationId = payload.CorrelationId,
+                Timestamp = payload.DateTimeCreated
+            };
+
+            workflowRequest.Payload.AddRange(payload.UploadedFiles);
+
             var message = new JsonMessage<WorkflowRequestMessage>(
-                new WorkflowRequestMessage
-                {
-                    PayloadId = payload.Id,
-                    Workflows = payload.Workflows,
-                    FileCount = payload.Count,
-                    CorrelationId = payload.CorrelationId,
-                    Timestamp = payload.DateTimeCreated
-                },
+                workflowRequest,
                 payload.CorrelationId,
                 string.Empty);
 

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

@@ -296,6 +296,8 @@ public void PayloadNotificationService_ShalUploadFilesAndPublish()
             _storageService.Verify(p => p.PutObject(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<long>(), It.IsAny<string>(), It.IsAny<Dictionary<string, string>>(), It.IsAny<CancellationToken>()), Times.Exactly(2));
 
             _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());
         }
     }
 }