fix for other incomming types

Signed-off-by: Neil South <neil.south@answerdigital.com>

Author: neildsouth

src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs

@@ -201,7 +201,9 @@ private async Task NotifyNewInstance(InferenceRequest inferenceRequest, Dictiona
                 var FileMeta = retrievedFiles[key];
                 FileMeta.PayloadId = inferenceRequest.TransactionId;
                 _uploadQueue.Queue(retrievedFiles[key]);
-                await _payloadAssembler.Queue(inferenceRequest.TransactionId, retrievedFiles[key]).ConfigureAwait(false);
+
+                var payloadId = await _payloadAssembler.Queue(inferenceRequest.TransactionId, retrievedFiles[key]).ConfigureAwait(false);
+                //retrievedFiles[key].PayloadId = payloadId.ToString();
             }
         }
 

src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs

@@ -168,12 +168,14 @@ private async Task SaveInstance(Stream stream, string studyInstanceUid, string w
             {
                 dicomInfo.SetWorkflows(workflowName);
             }
+            // for DICOMweb, use correlation ID as the grouping key
+            var payloadId = await _payloadAssembler.Queue(correlationId, dicomInfo, _configuration.Value.DicomWeb.Timeout).ConfigureAwait(false);
+            dicomInfo.PayloadId = payloadId.ToString();
 
             await dicomInfo.SetDataStreams(dicomFile, dicomFile.ToJson(_configuration.Value.Dicom.WriteDicomJson, _configuration.Value.Dicom.ValidateDicomOnSerialization), _configuration.Value.Storage.TemporaryDataStorage, _fileSystem, _configuration.Value.Storage.LocalTemporaryStoragePath).ConfigureAwait(false);
             _uploadQueue.Queue(dicomInfo);
 
-            // for DICOMweb, use correlation ID as the grouping key
-            await _payloadAssembler.Queue(correlationId, dicomInfo, _configuration.Value.DicomWeb.Timeout).ConfigureAwait(false);
+
             _logger.QueuedStowInstance();
 
             AddSuccess(null, uids);

src/InformaticsGateway/Services/Fhir/FhirService.cs

@@ -87,8 +87,9 @@ public async Task<FhirStoreResult> StoreAsync(HttpRequest request, string correl
                 throw new FhirStoreException(correlationId, $"Provided resource is of type '{content.InternalResourceType}' but request targeted type '{resourceType}'.", IssueType.Invalid);
             }
 
+            var payloadId = await _payloadAssembler.Queue(correlationId, content.Metadata, Resources.PayloadAssemblerTimeout).ConfigureAwait(false);
+            content.Metadata.PayloadId = payloadId.ToString();
             _uploadQueue.Queue(content.Metadata);
-            await _payloadAssembler.Queue(correlationId, content.Metadata, Resources.PayloadAssemblerTimeout).ConfigureAwait(false);
             _logger.QueuedStowInstance();
 
             content.StatusCode = StatusCodes.Status201Created;

src/InformaticsGateway/Services/HealthLevel7/MllpService.cs

@@ -170,8 +170,9 @@ private async Task OnDisconnect(IMllpClient client, MllpClientResult result)
                 {
                     var hl7Fileetadata = new Hl7FileStorageMetadata(client.ClientId.ToString());
                     await hl7Fileetadata.SetDataStream(message.HL7Message, _configuration.Value.Storage.TemporaryDataStorage, _fileSystem, _configuration.Value.Storage.LocalTemporaryStoragePath).ConfigureAwait(false);
+                    var payloadId = await _payloadAssembler.Queue(client.ClientId.ToString(), hl7Fileetadata).ConfigureAwait(false);
+                    hl7Fileetadata.PayloadId = payloadId.ToString();
                     _uploadQueue.Queue(hl7Fileetadata);
-                    await _payloadAssembler.Queue(client.ClientId.ToString(), hl7Fileetadata).ConfigureAwait(false);
                 }
             }
             catch (Exception ex)