parking for now

Signed-off-by: Neil South <[email protected]>

src/Api/Storage/Payload.cs

@@ -19,6 +19,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Ardalis.GuardClauses;
+using Monai.Deploy.InformaticsGateway.Common;
 using Monai.Deploy.Messaging.Events;
 
 namespace Monai.Deploy.InformaticsGateway.Api.Storage
@@ -40,7 +41,12 @@ public enum PayloadState
             /// <summary>
             /// Payload is ready to be published to the message broker.
             /// </summary>
-            Notify
+            Notify,
+
+            /// <summary>
+            /// Payload has been finished with.
+            /// </summary>
+            UploadComplete
         }
 
         public const int MAX_RETRY = 3;
@@ -86,6 +92,8 @@ public TimeSpan Elapsed
 
         public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
 
+        public PatientDetails? PatientDetails { get; set; }
+
         public Payload(string key, string correlationId, string? workflowInstanceId, string? taskId, DataOrigin dataTrigger, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key, nameof(key));
@@ -158,4 +166,4 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
     }
-}
+}

src/Common/PatientDetails.cs

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Monai.Deploy.InformaticsGateway.Common
+{
+    public class PatientDetails
+    {
+        [JsonPropertyName("patient_id")]
+        public string? PatientId { get; set; }
+
+        [JsonPropertyName("patient_name")]
+        public string? PatientName { get; set; }
+
+        [JsonPropertyName("patient_sex")]
+        public string? PatientSex { get; set; }
+
+        [JsonPropertyName("patient_dob")]
+        public DateTime? PatientDob { get; set; }
+
+        [JsonPropertyName("patient_age")]
+        public string? PatientAge { get; set; }
+
+        [JsonPropertyName("patient_hospital_id")]
+        public string? PatientHospitalId { get; set; }
+
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
+    }
+}

src/InformaticsGateway/Logging/Log.6000.DicomService.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Monai.Deploy.InformaticsGateway.Logging
+{
+    public static partial class Log
+    {
+        [LoggerMessage(EventId = 6000, Level = LogLevel.Error, Message = "Failed to get DICOM tag {dicomTag} in bucket {bucketId}. Payload: {payloadId}")]
+        public static partial void FailedToGetDicomTagFromPayload(this ILogger logger, string payloadId, string dicomTag, string bucketId, Exception ex);
+
+        [LoggerMessage(EventId = 6001, Level = LogLevel.Information, Message = "Attempted to retrieve Patient Name from DCM file, result: {name}")]
+        public static partial void GetPatientName(this ILogger logger, string name);
+
+        [LoggerMessage(EventId = 6002, Level = LogLevel.Information, Message = "Unsupported Type '{vr}' {vrFull} with value: {value} result: '{result}'")]
+        public static partial void UnsupportedType(this ILogger logger, string vr, string vrFull, string value, string result);
+
+        [LoggerMessage(EventId = 6003, Level = LogLevel.Information, Message = "Decoding supported type '{vr}' {vrFull} with value: {value} result: '{result}'")]
+        public static partial void SupportedType(this ILogger logger, string vr, string vrFull, string value, string result);
+
+        [LoggerMessage(EventId = 6004, Level = LogLevel.Error, Message = "Failed trying to cast Dicom Value to string {value}")]
+        public static partial void UnableToCastDicomValueToString(this ILogger logger, string value, Exception ex);
+
+        [LoggerMessage(EventId = 6005, Level = LogLevel.Debug, Message = "Dicom export marked as succeeded with {fileStatusCount} files marked as exported.")]
+        public static partial void DicomExportSucceeded(this ILogger logger, string fileStatusCount);
+
+        [LoggerMessage(EventId = 6006, Level = LogLevel.Debug, Message = "Dicom export marked as failed with {fileStatusCount} files marked as exported.")]
+        public static partial void DicomExportFailed(this ILogger logger, string fileStatusCount);
+    }
+}

src/InformaticsGateway/Program.cs

@@ -119,6 +119,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddScoped<IOutputDataPlugInEngine, OutputDataPlugInEngine>();
                     services.AddScoped<IDataPlugInEngineFactory<IInputDataPlugIn>, InputDataPlugInEngineFactory>();
                     services.AddScoped<IDataPlugInEngineFactory<IOutputDataPlugIn>, OutputDataPlugInEngineFactory>();
+                    services.AddScoped<IDicomService, DicomService>();
 
                     services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("InformaticsGateway:storage:serviceAssemblyName").Value, Monai.Deploy.Storage.HealthCheckOptions.ServiceHealthCheck);