Merge branch 'dev' into clinical-reasoning-dep-update

Author: seanmcilvenna

.env

@@ -12,4 +12,6 @@ ISSUER_URI=https://oauth.nhsnlink.org/realms/NHSNLink
 
 KafkaConnection__SaslUsername=${KAFKA_SASL_CLIENT_USER}
 KafkaConnection__SaslPassword=${KAFKA_SASL_CLIENT_PASSWORD}
-Redis__Password=${REDIS_PASS}
+Redis__Password=${REDIS_PASS}
+InternalBlobStorage__BlobContainerName=${INTERNAL_BLOB_CONTAINER_NAME}
+ExternalBlobStorage__BlobContainerName=${EXTERNAL_BLOB_CONTAINER_NAME}

.github/workflows/deploy-eventcatalog.yml

@@ -7,6 +7,8 @@ on:
     branches:
       - dev
       - workflow/**
+      - release/**
+      - hotfix/**
 
 permissions:
   contents: read
@@ -197,28 +199,6 @@ jobs:
           path: ./TestResults/dotnet-unit-test-results.trx
           reporter: dotnet-trx
 
-  docs-build:
-    name: Build Documentation
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-
-      - name: Install dependencies
-        run: npm ci
-        working-directory: ./docs
-
-      - name: Build documentation
-        run: npm run build
-        working-directory: ./docs
-
   java-unit-tests:
     name: Unit Tests for Java
     runs-on: ['ubuntu-latest']

.github/workflows/tests.yaml

@@ -1,13 +1,19 @@
 {
   "profiles": {
-    "Docker": {
-      "commandName": "Docker",
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+    "http-docker": {
+      "commandName": "Project",
+      "launchBrowser": false,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Docker",
+        "KafkaConnection__BootstrapServers__0": "localhost:9094",
+        "ConnectionStrings__Redis": "localhost:6379",
+        "ConnectionStrings__DatabaseConnection": "Server=tcp:localhost,1433;Initial Catalog=link-account;Persist Security Info=False;User ID=sa;Password=${LINK_DB_PASS};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
+        "Serilog__WriteTo__0__Args__uri": "http://localhost:3100",
+        "Telemetry__OtelCollectorEndpoint": "http://localhost:4317",
+        "ServiceRegistry__TenantService__TenantServiceURL": "http://localhost:8074"
       },
-      "publishAllPorts": true,
-      "useSSL": true
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:8060"
     },
     "ConsoleApp": {
       "commandName": "Project",
@@ -18,21 +24,6 @@
       "launchBrowser": false,
       "launchUrl": "api/account/swagger",
       "applicationUrl": "http://localhost:5037;https://localhost:7224"
-    },
-    "IISExpress": {
-      "commandName": "IISExpress",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "ancmHostingModel": "OutOfProcess"
-    }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5037",
-      "sslPort": 0
     }
   }
 }

DotNet/Account/Properties/launchSettings.json

@@ -5,12 +5,11 @@
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Docker",
-        
+
         "KafkaConnection__BootstrapServers__0": "localhost:9094",
         "ConnectionStrings__Redis": "localhost:6379",
         "Serilog__WriteTo__0__Args__uri": "http://localhost:3100",
         "Telemetry__OtelCollectorEndpoint": "http://localhost:4317",
-
         "ServiceRegistry__TenantService__TenantServiceURL": "http://localhost:8074",
         "ServiceRegistry__AccountServiceUrl": "http://localhost:8060",
         "ServiceRegistry__AuditServiceUrl": "http://localhost:8062",
@@ -38,7 +37,17 @@
         "ReverseProxy__Clusters__TerminologyService__Destinations__destination1__Address": "http://localhost:8076"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:8065"
+      "applicationUrl": "http://localhost:8063"
+    },
+    "http": {
+      "commandName": "Project",
+      "launchBrowser": false,
+      "launchUrl": "api/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5218"
     }
   }
 }

DotNet/Admin.BFF/Properties/launchSettings.json

@@ -10,39 +10,19 @@
       "launchUrl": "http://localhost:7344/swagger",
       "applicationUrl": "http://localhost:7344;https://localhost:7355"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "DockerfileRunArguments": "--name=Link-Audit --network=local-link -p 7344:8080 -p 7355:8081",
-      "launchUrl": "http://localhost:7344/swagger",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "Link__Audit__KafkaConnection__BootstrapServers__0": "kafka:29092/",
-        "Link__Audit__Logging__Serilog__WriteTo__1__Args__uri": "http://loki:3100",
-        "Link__Audit__TelemetryConfig__TelemetryCollectorEndpoint": "http://collector:55690",
-        "ASPNETCORE_URLS": "http://+:8080;https://+:8081",
-        "ASPNETCORE_HTTP_PORTS": "8080",
-        "ASPNETCORE_HTTPS_PORTS": "8081",
-        "Kestrel__Endpoints__Http__Url": "http://*:8080",
-        "Kestrel__Endpoints__Https__Url": "http://*:8081"
-      },
-      "publishAllPorts": true,
-      "useSSL": true
-    },
-    "IISExpress": {
-      "commandName": "IISExpress",
+    "http-docker": {
+      "commandName": "Project",
+      "launchBrowser": false,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Docker",
+        "KafkaConnection__BootstrapServers__0": "localhost:9094",
+        "ConnectionStrings__DatabaseConnection": "Server=tcp:localhost,1433;Initial Catalog=link-audit;Persist Security Info=False;User ID=sa;Password=${LINK_DB_PASS};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
+        "Serilog__WriteTo__0__Args__uri": "http://localhost:3100",
+        "Telemetry__OtelCollectorEndpoint": "http://localhost:4317",
+        "ServiceRegistry__TenantService__TenantServiceURL": "http://localhost:8074"
       },
-      "ancmHostingModel": "OutOfProcess"
-    }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5234",
-      "sslPort": 0
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:8062"
     }
   }
 }

DotNet/Audit/Properties/launchSettings.json

@@ -1,14 +1,18 @@
 {
   "profiles": {
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+    "http-docker": {
+      "commandName": "Project",
+      "launchBrowser": false,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "DockerLocal"
+        "ASPNETCORE_ENVIRONMENT": "Docker",
+        "KafkaConnection__BootstrapServers__0": "localhost:9094",
+        "ConnectionStrings__DatabaseConnection": "Server=tcp:localhost,1433;Initial Catalog=link-census;Persist Security Info=False;User ID=sa;Password=${LINK_DB_PASS};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
+        "Serilog__WriteTo__0__Args__uri": "http://localhost:3100",
+        "Telemetry__OtelCollectorEndpoint": "http://localhost:4317",
+        "ServiceRegistry__TenantService__TenantServiceURL": "http://localhost:8074"
       },
-      "publishAllPorts": true,
-      "useSSL": true
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:8068"
     },
     "ConsoleApp": {
       "commandName": "Project",
@@ -18,38 +22,6 @@
       },
       "dotnetRunMessages": true,
       "applicationUrl": "https://localhost:7245;http://localhost:5234"
-    },
-    "ConsoleAppSecure": {
-      "commandName": "Project",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5234"
-    },
-    "IISExpress": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "ancmHostingModel": "OutOfProcess"
-    },
-    "Census": {
-      "commandName": "Project",
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:5038;https://localhost:7225"
-    }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:39776",
-      "sslPort": 44393
     }
   }
 }

DotNet/Census/Properties/launchSettings.json

@@ -61,7 +61,7 @@ protected override async Task ExecuteListenerAsync(ConsumeResult<long, ReadyToAc
         var logQueries = scope.ServiceProvider.GetRequiredService<IDataAcquisitionLogQueries>();
         var dataAcquisitionLogManager = scope.ServiceProvider.GetRequiredService<IDataAcquisitionLogManager>();
         DataAcquisitionLogModel? log = null; 
-        _logger.LogInformation("Processing ReadyToAcquire message with log id: {consumeResult.Message.Value.LogId}, and facility id: {consumeResult.Message.Value.FacilityId}", consumeResult.Message.Value.LogId, consumeResult.Message.Value.FacilityId);
+        _logger.LogInformation("Processing ReadyToAcquire message with log id: {LogId}, and facility id: {FacilityId}", consumeResult.Message.Value.LogId, consumeResult.Message.Value.FacilityId);
 
         try
         {
@@ -103,7 +103,7 @@ await dataAcquisitionLogManager.UpdateAsync(new UpdateDataAcquisitionLogModel
                 }, cancellationToken);
             }
 
-            _logger.LogError(ex, "Error processing ReadyToAcquire message with log id: {consumeResult.Message.Value.LogId}, and facility id: {consumeResult.Message.Value.FacilityId}", consumeResult.Message.Value.LogId, consumeResult.Message.Value.FacilityId);
+            _logger.LogError(ex, "Error processing ReadyToAcquire message with log id: {LogId}, and facility id: {FacilityId}", consumeResult.Message.Value.LogId, consumeResult.Message.Value.FacilityId);
             throw new DeadLetterException("Error processing ReadyToAcquire message: " + ex.Message, ex);
         }
     }

DotNet/DataAcquisition.AcquisitionWorker/Listeners/ReadyToAcquireListener.cs

@@ -1,5 +1,14 @@
 {
   "profiles": {
+    "http": {
+      "commandName": "Project",
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5059"
+    },
     "http-docker": {
       "commandName": "Project",
       "launchBrowser": false,

DotNet/DataAcquisition.AcquisitionWorker/Properties/launchSettings.json

@@ -0,0 +1,9 @@
+using LantanaGroup.Link.DataAcquisition.Domain.Application.Models.Factory.ParameterQuery;
+using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Models.QueryConfig.Parameter;
+
+namespace LantanaGroup.Link.DataAcquisition.Domain.Application.Factories.ParameterFactories;
+
+public interface ILiteralParameterFactory
+{
+    ParameterFactoryResult? Build(LiteralParameter parameter);
+}