fix for where hl7Config plugin is blank

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

Author: neildsouth

src/Api/packages.lock.json

@@ -41,9 +41,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.2, )",
-        "resolved": "8.0.2",
-        "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A=="
+        "requested": "[8.0.3, )",
+        "resolved": "8.0.3",
+        "contentHash": "0kwNg0LBIvVTx9A2mo9Mnw4wLGtaeQgjSz5P13bOOwdWPPLe9HzI+XTkwiMhS7iQCM6X4LAbFR76xScaMw0MrA=="
       },
       "Monai.Deploy.Messaging": {
         "type": "Direct",

src/CLI/packages.lock.json

@@ -35,9 +35,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.2, )",
-        "resolved": "8.0.2",
-        "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A=="
+        "requested": "[8.0.3, )",
+        "resolved": "8.0.3",
+        "contentHash": "0kwNg0LBIvVTx9A2mo9Mnw4wLGtaeQgjSz5P13bOOwdWPPLe9HzI+XTkwiMhS7iQCM6X4LAbFR76xScaMw0MrA=="
       },
       "System.CommandLine.Hosting": {
         "type": "Direct",

src/Configuration/packages.lock.json

@@ -4,9 +4,9 @@
     "net8.0": {
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.2, )",
-        "resolved": "8.0.2",
-        "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A=="
+        "requested": "[8.0.3, )",
+        "resolved": "8.0.3",
+        "contentHash": "0kwNg0LBIvVTx9A2mo9Mnw4wLGtaeQgjSz5P13bOOwdWPPLe9HzI+XTkwiMhS7iQCM6X4LAbFR76xScaMw0MrA=="
       },
       "Ardalis.GuardClauses": {
         "type": "Transitive",

src/InformaticsGateway/Services/HealthLevel7/MllpService.cs

@@ -220,7 +220,7 @@ private async Task ConfigurePlugInEngine()
                 {
                     try
                     {
-                        pluginAssemblies.AddRange(config.PlugInAssemblies.Where(p => pluginAssemblies.Contains(p) is false));
+                        pluginAssemblies.AddRange(config.PlugInAssemblies.Where(p => string.IsNullOrWhiteSpace(p) is false && pluginAssemblies.Contains(p) is false));
                     }
                     catch (Exception ex)
                     {

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

@@ -366,5 +366,49 @@ public async Task GivenATcpClientWithHl7Messages_WhenDisconnected_ExpectMessageT
 
             _mIIpExtract.Verify(p => p.ExtractInfo(It.IsAny<Hl7FileStorageMetadata>(), It.IsAny<Message>(), It.IsAny<Hl7ApplicationConfigEntity>()), Times.Exactly(3));
         }
+
+        [RetryFact(10, 250)]
+        public async Task GivenATcpClientWithHl7Messages_ShouldntAdddBlankPlugin()
+        {
+            var checkEvent = new ManualResetEventSlim();
+            var client = new Mock<IMllpClient>();
+            _mIIpExtract.Setup(e => e.ExtractInfo(It.IsAny<Hl7FileStorageMetadata>(), It.IsAny<Message>(), It.IsAny<Hl7ApplicationConfigEntity>()))
+                .ReturnsAsync((Hl7FileStorageMetadata meta, Message Msg, Hl7ApplicationConfigEntity configItem) => Msg);
+
+            _hl7ApplicationConfigRepository.Setup(p => p.GetAllAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<Hl7ApplicationConfigEntity> { new Hl7ApplicationConfigEntity {
+                    PlugInAssemblies = [""]
+                } });
+
+            _mllpClientFactory.Setup(p => p.CreateClient(It.IsAny<ITcpClientAdapter>(), It.IsAny<Hl7Configuration>(), It.IsAny<ILogger<MllpClient>>()))
+                .Returns(() =>
+                {
+                    client.Setup(p => p.Start(It.IsAny<Func<IMllpClient, MllpClientResult, Task>>(), It.IsAny<CancellationToken>()))
+                        .Callback<Func<IMllpClient, MllpClientResult, Task>, CancellationToken>((action, cancellationToken) =>
+                        {
+                            var results = new MllpClientResult(
+                                 new List<HL7.Dotnetcore.Message>
+                                 {
+                                     new("")
+                                 }, null);
+                            action(client.Object, results);
+                            checkEvent.Set();
+                            _cancellationTokenSource.Cancel();
+                        });
+                    client.Setup(p => p.Dispose());
+                    client.SetupGet(p => p.ClientId).Returns(Guid.NewGuid());
+                    return client.Object;
+                });
+
+            _tcpListener.Setup(p => p.AcceptTcpClientAsync(It.IsAny<CancellationToken>()))
+                .Returns(ValueTask.FromResult((new Mock<ITcpClientAdapter>()).Object));
+
+            var service = new MllpService(_serviceScopeFactory.Object, _options);
+            _ = service.StartAsync(_cancellationTokenSource.Token);
+
+            Assert.True(checkEvent.Wait(3000));
+            await Task.Delay(500).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext);
+            _hl7DataPlugInEngine.Verify(p => p.Configure(It.IsAny<IReadOnlyList<string>>()), Times.Never());
+        }
     }
 }