fixing around message ack

Signed-off-by: Neil South <neil.south@answerdigital.com>
Project-MONAI · Jan 9, 2024 · fecb72f · fecb72f
1 parent 6b47b7f
commit fecb72f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs b/src/InformaticsGateway/Logging/Log.800.Hl7Service.cs
@@ -111,5 +111,8 @@ public static partial class Log
         [LoggerMessage(EventId = 829, Level = LogLevel.Trace, Message = "HL7 config Not matching message Id {senderId}  configId {configID}")]
         public static partial void Hl7NotMatchingConfig(this ILogger logger, string senderId, string configID);
 
+        [LoggerMessage(EventId = 830, Level = LogLevel.Error, Message = "Error generating HL7 acknowledgment. for message {message}")]
+        public static partial void ErrorGeneratingHl7Acknowledgment(this ILogger logger, Exception ex, string message);
+
     }
 }
diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs
@@ -159,7 +159,12 @@ private async Task SendAcknowledgment(INetworkStream clientStream, Message messa
 
             if (ShouldSendAcknowledgment(message))
             {
-                var ackMessage = message.GetACK();
+                var ackMessage = message.GetACK(true);
+                if (ackMessage is null)
+                {
+                    _logger.ErrorGeneratingHl7Acknowledgment(new Exception(), message.HL7Message);
+                    return;
+                }
                 var ackData = new ReadOnlyMemory<byte>(ackMessage.GetMLLP());
                 try
                 {

diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs
@@ -150,7 +150,7 @@ private Message RepopulateMessage(Hl7ApplicationConfigEntity config, ExternalApp
                     {
                         var newMess = message.HL7Message.Replace(oldvalue, details.PatientId);
                         message = new Message(newMess);
-                        message.ParseMessage(false);
+                        message.ParseMessage(true);
                     }
                 }
                 else if (tag == DicomTag.StudyInstanceUID)
@@ -162,7 +162,7 @@ private Message RepopulateMessage(Hl7ApplicationConfigEntity config, ExternalApp
                     {
                         var newMess = message.HL7Message.Replace(oldvalue, details.StudyInstanceUid);
                         message = new Message(newMess);
-                        message.ParseMessage(false);
+                        message.ParseMessage(true);
                     }
                 }
             }

diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs
@@ -340,7 +340,7 @@ private async Task EnsureAck(NetworkStream networkStream)
             foreach (var message in _rawHl7Messages)
             {
                 var hl7Message = new Message(message);
-                hl7Message.ParseMessage(false);
+                hl7Message.ParseMessage(true);
                 if (hl7Message.MessageStructure == "ACK")
                 {
                     return;

diff --git a/src/InformaticsGateway/Test/Services/Common/InputHL7DataPlugInEngineTest.cs b/src/InformaticsGateway/Test/Services/Common/InputHL7DataPlugInEngineTest.cs
@@ -115,7 +115,7 @@ public async Task GivenAnInputHL7DataPlugInEngine_WhenExecutePlugInsIsCalledWith
                 "called");
 
             var message = new HL7.Dotnetcore.Message(SampleMessage);
-            message.ParseMessage(false);
+            message.ParseMessage(true);
 
             await Assert.ThrowsAsync<PlugInInitializationException>(async () => await pluginEngine.ExecutePlugInsAsync(message, dicomInfo, config));
         }
@@ -152,7 +152,7 @@ public async Task GivenAnInputHL7DataPlugInEngine_WhenExecutePlugInsIsCalled_Exp
                 "called");
 
             var message = new HL7.Dotnetcore.Message(SampleMessage);
-            message.ParseMessage(false);
+            message.ParseMessage(true);
 
             var (Hl7Message, resultDicomInfo) = await pluginEngine.ExecutePlugInsAsync(message, dicomInfo, config);
 

diff --git a/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs b/src/InformaticsGateway/Test/Services/HealthLevel7/MllpClientTest.cs
@@ -33,7 +33,7 @@ namespace Monai.Deploy.InformaticsGateway.Test.Services.HealthLevel7
 {
     public class MllpClientTest
     {
-        private const string SampleMessage = "MSH|^~\\&|MD|MD HOSPITAL|MD Test|MONAI Deploy|202207130000|SECURITY|MD^A01^ADT_A01|MSG00001|P|2.8|||<ACK>|\r\n";
+        private const string SampleMessage = "MSH|^~\\&|MD|MD HOSPITAL|MD Test|MONAI Deploy|202207130000|SECURITY|MD^A01^ADT_A01|MSG00001|P|2.8|||<ACK>|\r";
 
         private readonly Mock<ITcpClientAdapter> _tcpClient;
         private readonly Hl7Configuration _config;

diff --git a/tests/Integration.Test/StepDefinitions/Hl7StepDefinitions.cs b/tests/Integration.Test/StepDefinitions/Hl7StepDefinitions.cs
@@ -219,7 +219,7 @@ public async Task ThenEnsureThatExportcompleteMessagesAreSentWithSuscess(string
         private async Task SendAcknowledgment(NetworkStream networkStream, HL7.Dotnetcore.Message message, CancellationToken cancellationToken)
         {
             if (message == null) { return; }
-            var ackMessage = message.GetACK();
+            var ackMessage = message.GetACK(true);
             var ackData = new ReadOnlyMemory<byte>(ackMessage.GetMLLP());
             {
                 try