merge in develop

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

Author: neildsouth

src/InformaticsGateway/Logging/Log.5000.DataPlugins.cs

@@ -48,5 +48,7 @@ public static partial class Log
         [LoggerMessage(EventId = 5008, Level = LogLevel.Trace, Message = "InputDataPlugInEngine: {pluginName} executed. fileMetadata now: {fileMetadata}")]
         public static partial void ExecutedInputDataPlugIn(this ILogger logger, string pluginName, string fileMetadata);
 
+        [LoggerMessage(EventId = 5009, Level = LogLevel.Trace, Message = "Import plugin executed: {pluginName}. now: {fileMetadata}")]
+        public static partial void InputDataPlugInEngineexecuted(this ILogger logger, string pluginName, string fileMetadata);
     }
 }

src/InformaticsGateway/Services/Common/InputDataPluginEngine.cs

@@ -50,7 +50,7 @@ public async Task<Tuple<DicomFile, FileStorageMetadata>> ExecutePlugInsAsync(Dic
                 _logger.ExecutingInputDataPlugIn(plugin.Name);
                 (dicomFile, fileMetadata) = await plugin.ExecuteAsync(dicomFile, fileMetadata).ConfigureAwait(false);
 
-                _logger.ExecutedInputDataPlugIn(plugin.Name, JsonSerializer.Serialize(fileMetadata));
+                _logger.InputDataPlugInEngineexecuted(plugin.Name, JsonSerializer.Serialize(fileMetadata));
             }
 
             return new Tuple<DicomFile, FileStorageMetadata>(dicomFile, fileMetadata);

src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs

@@ -16,7 +16,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -54,8 +53,8 @@ public MllpClient(ITcpClientAdapter client, Hl7Configuration configurations, ILo
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
             ClientId = Guid.NewGuid();
-            _exceptions = new List<Exception>();
-            _messages = new List<Message>();
+            _exceptions = [];
+            _messages = [];
 
             _loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Endpoint", _client.RemoteEndPoint }, { "CorrelationId", ClientId } })!;
         }
@@ -159,10 +158,23 @@ private async Task SendAcknowledgment(INetworkStream clientStream, Message messa
 
             if (ShouldSendAcknowledgment(message))
             {
-                var ackMessage = message.GetACK(true);
+                Message ackMessage;
+                try
+                {
+                    ackMessage = message.GetACK(true);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorGeneratingHl7Acknowledgment(ex, message.HL7Message);
+                    _exceptions.Add(ex);
+                    return;
+                }
+
                 if (ackMessage is null)
                 {
-                    _logger.ErrorGeneratingHl7Acknowledgment(new Exception(), message.HL7Message);
+                    var ex = new Exception("Error generating HL7 acknowledgment.");
+                    _logger.ErrorGeneratingHl7Acknowledgment(ex, message.HL7Message);
+                    _exceptions.Add(ex);
                     return;
                 }
                 var ackData = new ReadOnlyMemory<byte>(ackMessage.GetMLLP());
@@ -196,8 +208,8 @@ private bool ShouldSendAcknowledgment(Message message)
                 return value.Value switch
                 {
                     Resources.AcknowledgmentTypeNever => false,
-                    Resources.AcknowledgmentTypeError => _exceptions.Any(),
-                    Resources.AcknowledgmentTypeSuccessful => !_exceptions.Any(),
+                    Resources.AcknowledgmentTypeError => _exceptions.Count is not 0,
+                    Resources.AcknowledgmentTypeSuccessful => _exceptions.Count is 0,
                     _ => true,
                 };
             }

src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs

@@ -30,19 +30,11 @@
 
 namespace Monai.Deploy.InformaticsGateway.Api.Mllp
 {
-    public sealed class MllpExtract : IMllpExtract
+    public sealed class MllpExtract(IHl7ApplicationConfigRepository hl7ApplicationConfigRepository, IExternalAppDetailsRepository externalAppDetailsRepository, ILogger<MllpExtract> logger) : IMllpExtract
     {
-        private readonly ILogger<MllpExtract> _logger;
-        private readonly IHl7ApplicationConfigRepository _hl7ApplicationConfigRepository;
-        private readonly IExternalAppDetailsRepository _externalAppDetailsRepository;
-
-        public MllpExtract(IHl7ApplicationConfigRepository hl7ApplicationConfigRepository, IExternalAppDetailsRepository externalAppDetailsRepository, ILogger<MllpExtract> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _hl7ApplicationConfigRepository = hl7ApplicationConfigRepository ?? throw new ArgumentNullException(nameof(hl7ApplicationConfigRepository));
-            _externalAppDetailsRepository = externalAppDetailsRepository ?? throw new ArgumentNullException(nameof(externalAppDetailsRepository));
-        }
-
+        private readonly ILogger<MllpExtract> _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        private readonly IHl7ApplicationConfigRepository _hl7ApplicationConfigRepository = hl7ApplicationConfigRepository ?? throw new ArgumentNullException(nameof(hl7ApplicationConfigRepository));
+        private readonly IExternalAppDetailsRepository _externalAppDetailsRepository = externalAppDetailsRepository ?? throw new ArgumentNullException(nameof(externalAppDetailsRepository));
 
         public async Task<Message> ExtractInfo(Hl7FileStorageMetadata meta, Message message, Hl7ApplicationConfigEntity configItem)
         {

src/InformaticsGateway/Services/HealthLevel7/MllpService.cs

@@ -76,8 +76,7 @@ public int ActiveConnections
 
         public string ServiceName => "HL7 Service";
 
-        public MllpService(IServiceScopeFactory serviceScopeFactory,
-                           IOptions<InformaticsGatewayConfiguration> configuration)
+        public MllpService(IServiceScopeFactory serviceScopeFactory, IOptions<InformaticsGatewayConfiguration> configuration)
         {
             ArgumentNullException.ThrowIfNull(serviceScopeFactory, nameof(serviceScopeFactory));
 
@@ -281,7 +280,7 @@ public async Task SendMllp(IPAddress address, int port, string hl7Message, Cance
             catch (Exception ex)
             {
                 _logger.Hl7SendException(ex);
-                throw new Hl7SendException("Send exception");
+                throw new Hl7SendException($"Send exception: {ex.Message}");
             }
         }
 

src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs

@@ -134,10 +134,8 @@ public async Task ReceiveData_InvalidMessage()
             {
                 await Task.Run(() =>
                 {
-                    Assert.Empty(results.Messages);
                     Assert.NotNull(results.AggregateException);
-                    Assert.Single(results.AggregateException.InnerExceptions);
-                    Assert.Contains("Failed to validate the message with error", results.AggregateException.InnerExceptions.First().Message);
+                    Assert.Equal(1, results.AggregateException.InnerExceptions.Count);
                 });
             });
             await client.Start(action, _cancellationTokenSource.Token);