uses DestinationPath if given

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

src/Api/Storage/DicomFileStorageMetadata.cs

@@ -93,6 +93,15 @@ public DicomFileStorageMetadata(string associationId, string identifier, string
             StudyInstanceUid = studyInstanceUid;
             SeriesInstanceUid = seriesInstanceUid;
             SopInstanceUid = sopInstanceUid;
+            SetupFilePaths(associationId);
+
+            DataOrigin.DataService = dataService;
+            DataOrigin.Source = callingAeTitle;
+            DataOrigin.Destination = calledAeTitle;
+        }
+
+        private void SetupFilePaths(string associationId)
+        {
             File = new StorageObjectMetadata(FileExtension)
             {
                 TemporaryPath = string.Join(PathSeparator, associationId, DataTypeDirectoryName, $"{Guid.NewGuid()}{FileExtension}"),
@@ -106,10 +115,32 @@ public DicomFileStorageMetadata(string associationId, string identifier, string
                 UploadPath = $"{File.UploadPath}{DicomJsonFileExtension}",
                 ContentType = DicomJsonContentType,
             };
+        }
 
-            DataOrigin.DataService = dataService;
-            DataOrigin.Source = callingAeTitle;
-            DataOrigin.Destination = calledAeTitle;
+        public void SetupGivenFilePaths(string? DestinationFolder)
+        {
+            if (DestinationFolder is null)
+            {
+                return;
+            }
+
+            File = new StorageObjectMetadata(FileExtension)
+            {
+                TemporaryPath = string.Join(PathSeparator, DestinationFolder, $"Temp{PathSeparator}{Guid.NewGuid()}{FileExtension}"),
+                UploadPath = string.Join(PathSeparator, DestinationFolder, $"{SopInstanceUid}{FileExtension}"),
+                ContentType = DicomContentType,
+                DestinationFolderOverride = true,
+            };
+
+            JsonFile = new StorageObjectMetadata(DicomJsonFileExtension)
+            {
+                TemporaryPath = $"{File.TemporaryPath}{DicomJsonFileExtension}",
+                UploadPath = $"{File.UploadPath}{DicomJsonFileExtension}",
+                ContentType = DicomJsonContentType,
+                DestinationFolderOverride = true,
+            };
+
+            //DestinationFolderNeil = DestinationFolder;
         }
 
         public override void SetFailed()
@@ -118,4 +149,4 @@ public override void SetFailed()
             JsonFile.SetFailed();
         }
     }
-}
+}

src/Api/Storage/FileStorageMetadata.cs

@@ -104,6 +104,9 @@ public abstract record FileStorageMetadata
         [JsonPropertyName("payloadId")]
         public string? PayloadId { get; set; }
 
+       // [JsonPropertyName("destinationFolder")]
+       //public string? DestinationFolderNeil { get; set; }
+
         /// <summary>
         /// DO NOT USE
         /// This constructor is intended for JSON serializer.
@@ -162,4 +165,4 @@ public static string IpAddress()
             return "127.0.0.1";
         }
     }
-}
+}

src/Api/Storage/Payload.cs

@@ -86,6 +86,8 @@ public TimeSpan Elapsed
 
         public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
 
+        public string DestinationFolder { get; set; } = string.Empty;
+
         public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key, nameof(key));
@@ -132,6 +134,11 @@ public void Add(FileStorageMetadata value)
                 DataOrigins.Add(value.DataOrigin);
             }
 
+            //if (string.IsNullOrWhiteSpace(value.DestinationFolderNeil) is false)
+            //{
+            //    DestinationFolder = value.DestinationFolderNeil;
+            //}
+
             _lastReceived.Reset();
             _lastReceived.Start();
         }

src/Api/Storage/StorageObjectMetadata.cs

@@ -88,6 +88,9 @@ public class StorageObjectMetadata
         [JsonPropertyName("isMoveCompleted"), JsonInclude]
         public bool IsMoveCompleted { get; private set; } = default!;
 
+        [JsonPropertyName("destinationFolderOverride")]
+        public bool DestinationFolderOverride { get; set; } = false;
+
         public StorageObjectMetadata(string fileExtension)
         {
             Guard.Against.NullOrWhiteSpace(fileExtension, nameof(fileExtension));
@@ -111,7 +114,11 @@ public string GetPayloadPath(Guid payloadId)
         {
             Guard.Against.Null(payloadId, nameof(payloadId));
 
-            return $"{payloadId}{FileStorageMetadata.PathSeparator}{UploadPath}";
+            if (DestinationFolderOverride is false)
+            {
+                return $"{payloadId}{FileStorageMetadata.PathSeparator}{UploadPath}";
+            }
+            return $"{UploadPath}";
         }
 
         public void SetUploaded(string bucketName)

src/InformaticsGateway/Program.cs

@@ -132,7 +132,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddSingleton<ITcpListenerFactory, TcpListenerFactory>();
                     services.AddSingleton<IMllpClientFactory, MllpClientFactory>();
                     services.AddSingleton<IApplicationEntityManager, ApplicationEntityManager>();
-                    services.AddSingleton<IObjectUploadQueue, ObjectUploadQueue>();
+                    //services.AddSingleton<IObjectUploadQueue, ObjectUploadQueue>();
                     services.AddSingleton<IScuQueue, ScuQueue>();
                     //services.AddSingleton<ScpService>();
                     //services.AddSingleton<ScuService>();

src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs

@@ -113,7 +113,24 @@ public async Task<string> HandleInstanceAsync(DicomCStoreRequest request, string
                 return string.Empty;
             }
 
+            ExternalAppDetails? storedDetails = null;
+
+            if (type == ScpInputTypeEnum.ExternalAppReturn)
+            {
+                storedDetails = await _externalAppDetailsRepository.GetAsync(uids.StudyInstanceUid, new System.Threading.CancellationToken()).ConfigureAwait(false);
+
+                if (storedDetails is null)
+                {
+                    _logger.FailedToFindStoredExtAppDetails(uids.StudyInstanceUid);
+                }
+            }
+
             var dicomInfo = new DicomFileStorageMetadata(associationId.ToString(), uids.Identifier, uids.StudyInstanceUid, uids.SeriesInstanceUid, uids.SopInstanceUid, DataService.DIMSE, callingAeTitle, calledAeTitle);
+            if (type == ScpInputTypeEnum.ExternalAppReturn)
+            {
+                RetrieveExternalAppDetails(storedDetails, dicomInfo);
+                dicomInfo.SetupGivenFilePaths(storedDetails?.DestinationFolder);
+            }
 
             if (_configuration.Workflows.Any())
             {
@@ -129,10 +146,7 @@ public async Task<string> HandleInstanceAsync(DicomCStoreRequest request, string
                 }
             }
 
-            if (type == ScpInputTypeEnum.ExternalAppReturn)
-            {
-                await RetrieveExternalAppDetails(uids.StudyInstanceUid, dicomInfo);
-            }
+
 
 
             var result = await _pluginEngine.ExecutePlugInsAsync(request.File, dicomInfo).ConfigureAwait(false);
@@ -154,18 +168,16 @@ public async Task<string> HandleInstanceAsync(DicomCStoreRequest request, string
             return dicomInfo.PayloadId;
         }
 
-        private async Task RetrieveExternalAppDetails(string studyInstanceUid, DicomFileStorageMetadata dicomInfo)
+        private void RetrieveExternalAppDetails(ExternalAppDetails? storedDetails, DicomFileStorageMetadata dicomInfo)
         {
-            var storedDetails = await _externalAppDetailsRepository.GetAsync(studyInstanceUid, new System.Threading.CancellationToken()).ConfigureAwait(false);
             if (storedDetails is null)
             {
-                _logger.FailedToFindStoredExtAppDetails(studyInstanceUid);
                 return;
             }
             dicomInfo.ChangeCorrelationId(_logger, storedDetails.CorrelationId);
             dicomInfo.WorkflowInstanceId = storedDetails.WorkflowInstanceId;
             dicomInfo.TaskId = storedDetails.ExportTaskID;
-            dicomInfo.PayloadId = storedDetails.DestinationFolder;
+            //dicomInfo.DestinationFolderNeil = storedDetails.DestinationFolder!;
         }
 
         private bool AcceptsSopClass(string sopClassUid)

tests/Integration.Test/StepDefinitions/ExteralAppStepDefinitions.cs

@@ -128,7 +128,7 @@ public async Task GivenAExternalAppStudyThatIsExportedToTheTestHost()
                 Files = _dataProvider.DicomSpecs.Files.Keys.ToList(),
                 MessageId = Guid.NewGuid().ToString(),
                 WorkflowInstanceId = _workflowInstanceId,
-                DestinationFolder = Guid.NewGuid().ToString(),
+                DestinationFolder = "ThisIs/My/Output/Folder",
             };
 
             //_exportRequestEvent.PluginAssemblies.Add(typeof(DicomDeidentifier).AssemblyQualifiedName);
@@ -198,7 +198,7 @@ await _informaticsGatewayClient.MonaiScpAeTitle.Create(new MonaiApplicationEntit
                 }
             }
 
-            var timeoutPolicy = Policy.TimeoutAsync(240, TimeoutStrategy.Pessimistic);
+            var timeoutPolicy = Policy.TimeoutAsync(140, TimeoutStrategy.Pessimistic);
             await timeoutPolicy
                 .ExecuteAsync(
                     async () => { await SendRequest(exportCount); }

tests/Integration.Test/StepDefinitions/RemoteAppExecutionPlugInsStepDefinitions.cs

@@ -210,7 +210,7 @@ public async Task AStudyThatIsExportedToTheTestHostBadPlugin()
             }
         }
 
-        [When(@"the study is received and sent back to Informatics Gateway with (.*)")]
+        [When(@"the study is received and sent back to Informatics Gateway with (.*) messages")]
         public async Task WhenTheStudyIsReceivedAndSentBackToInformaticsGatewayWith(int exportCount)
         {