Merge branch 'main' into Add-Config-Receive-Cass-File

Author: SamAinsworth-NHS

application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/Program.cs

@@ -25,10 +25,10 @@
 
     host.AddConfiguration<RetrieveMeshFileConfig>(out RetrieveMeshFileConfig config);
 
-    if (!string.IsNullOrEmpty(KeyVaultConnectionString))
+    if (!string.IsNullOrEmpty(config.KeyVaultConnectionString))
     {
         logger.LogInformation("Pulling Mesh Certificate from KeyVault");
-        var client = new CertificateClient(vaultUri: new Uri(KeyVaultConnectionString), credential: new DefaultAzureCredential());
+        var client = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
         var certificate = await client.DownloadCertificateAsync(config.MeshKeyName);
         cert = certificate.Value;
     }

application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/RetrieveMeshFile.cs

@@ -22,6 +22,7 @@ public class RetrieveMeshFile
     private readonly string _mailboxId;
     private readonly string _blobConnectionString;
     private readonly IBlobStorageHelper _blobStorageHelper;
+    private readonly RetrieveMeshFileConfig _config;
     private const string NextHandShakeTimeConfigKey = "NextHandShakeTime";
     private const string ConfigFileName = "MeshState.json";
 
@@ -31,7 +32,8 @@ public RetrieveMeshFile(ILogger<RetrieveMeshFile> logger, IMeshToBlobTransferHan
         _meshToBlobTransferHandler = meshToBlobTransferHandler;
         _blobStorageHelper = blobStorageHelper;
         _mailboxId = options.Value.BSSMailBox;
-        _blobConnectionString = Environment.GetEnvironmentVariable("caasfolder_STORAGE");
+        _config = options.Value;
+        _blobConnectionString = _config.caasfolder_STORAGE;
     }
     /// <summary>
     /// This function polls the MESH Mailbox every 5 minutes, if there is a file posted to the mailbox.

application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/RetrieveMeshFileConfig.cs

@@ -10,10 +10,11 @@ public class RetrieveMeshFileConfig
     [Required]
     public string MeshPassword { get; set; }
     [Required]
-    public string MeshSharedKey { get; set; }
-    public string MeshKeyPassphrase { get; set; }
-    public string MeshKeyName { get; set; }
-
+    public string MeshSharedKey {get; set;}
+    public string MeshKeyPassphrase {get; set;}
+    public string MeshKeyName {get; set;}
+    public string KeyVaultConnectionString {get; set;}
+    [Required]
+    public string caasfolder_STORAGE {get; set;}
     public string ServerSideCerts { get; set; }
-
 }

application/CohortManager/src/Functions/CohortDistributionServices/AddCohortDistributionData/AddCohortDistributionDataConfig.cs

@@ -0,0 +1,9 @@
+namespace NHS.Screening.AddCohortDistribution;
+
+using System.ComponentModel.DataAnnotations;
+
+public class AddCohortDistributionDataConfig
+{
+    [Required]
+    public string CohortDistributionDataServiceURL {get; set;}
+}

application/CohortManager/src/Functions/CohortDistributionServices/AddCohortDistributionData/Program.cs

@@ -7,11 +7,13 @@
 using Microsoft.Extensions.Hosting;
 using Model;
 using HealthChecks.Extensions;
+using NHS.Screening.AddCohortDistribution;
 
 var host = new HostBuilder()
-.AddDataServicesHandler()
-        .AddDataService<CohortDistribution>(Environment.GetEnvironmentVariable("CohortDistributionDataServiceURL"))
-        .Build()
+    .AddConfiguration<AddCohortDistributionDataConfig>(out AddCohortDistributionDataConfig config)
+    .AddDataServicesHandler()
+    .AddDataService<CohortDistribution>(config.CohortDistributionDataServiceURL)
+    .Build()
     .ConfigureFunctionsWorkerDefaults()
     .ConfigureServices(services =>
     {

application/CohortManager/src/Functions/CohortDistributionServices/CreateCohortDistribution/CreateCohortDistribution.cs

@@ -10,6 +10,8 @@ namespace NHS.CohortManager.CohortDistributionService;
 using Model.Enums;
 using Data.Database;
 using DataServices.Client;
+using NHS.Screening.CreateCohortDistribution;
+using Microsoft.Extensions.Options;
 
 public class CreateCohortDistribution
 {
@@ -18,18 +20,21 @@ public class CreateCohortDistribution
     private readonly ICohortDistributionHelper _CohortDistributionHelper;
     private readonly IExceptionHandler _exceptionHandler;
     private readonly IAzureQueueStorageHelper _azureQueueStorageHelper;
+    private readonly CreateCohortDistributionConfig _config;
 
     public CreateCohortDistribution(ILogger<CreateCohortDistribution> logger,
            ICallFunction callFunction,
            ICohortDistributionHelper CohortDistributionHelper,
            IExceptionHandler exceptionHandler,
-           IAzureQueueStorageHelper azureQueueStorageHelper)
+           IAzureQueueStorageHelper azureQueueStorageHelper,
+           IOptions<CreateCohortDistributionConfig> createCohortDistributionConfig)
     {
         _logger = logger;
         _callFunction = callFunction;
         _CohortDistributionHelper = CohortDistributionHelper;
         _exceptionHandler = exceptionHandler;
         _azureQueueStorageHelper = azureQueueStorageHelper;
+        _config = createCohortDistributionConfig.Value;
     }
 
     [Function(nameof(CreateCohortDistribution))]
@@ -64,7 +69,7 @@ public async Task RunAsync([QueueTrigger("%CohortQueueName%", Connection = "Azur
             }
 
             // Check if participant has exceptions
-            bool ignoreParticipantExceptions = Environment.GetEnvironmentVariable("IgnoreParticipantExceptions") == "true";
+            bool ignoreParticipantExceptions = _config.IgnoreParticipantExceptions;
             _logger.LogInformation("Environment variable IgnoreParticipantExceptions is set to {IgnoreParticipantExceptions}", ignoreParticipantExceptions);
             bool participantHasException = participantData.ExceptionFlag == 1;
 
@@ -121,14 +126,14 @@ private async Task HandleErrorResponseAsync(string errorMessage, CohortDistribut
         }
 
         await _exceptionHandler.CreateSystemExceptionLog(new Exception(errorMessage), participant, fileName);
-        await _azureQueueStorageHelper.AddItemToQueueAsync<CohortDistributionParticipant>(cohortDistributionParticipant, Environment.GetEnvironmentVariable("CohortQueueNamePoison"));
+        await _azureQueueStorageHelper.AddItemToQueueAsync<CohortDistributionParticipant>(cohortDistributionParticipant, _config.CohortQueueNamePoison);
     }
 
     private async Task<HttpWebResponse> AddCohortDistribution(CohortDistributionParticipant transformedParticipant)
     {
         transformedParticipant.Extracted = DatabaseHelper.ConvertBoolStringToBoolByType("IsExtractedToBSSelect", DataTypes.Integer).ToString();
         var json = JsonSerializer.Serialize(transformedParticipant);
-        var response = await _callFunction.SendPost(Environment.GetEnvironmentVariable("AddCohortDistributionURL"), json);
+        var response = await _callFunction.SendPost(_config.AddCohortDistributionURL, json);
 
         _logger.LogInformation("Called {AddCohortDistribution} function", nameof(AddCohortDistribution));
         return response;

application/CohortManager/src/Functions/CohortDistributionServices/CreateCohortDistribution/CreateCohortDistributionConfig.cs

@@ -0,0 +1,13 @@
+namespace NHS.Screening.CreateCohortDistribution;
+
+using System.ComponentModel.DataAnnotations;
+
+public class CreateCohortDistributionConfig
+{
+    [Required]
+    public bool IgnoreParticipantExceptions {get; set;}
+    [Required]
+    public string CohortQueueNamePoison {get; set;} 
+    [Required]
+    public string AddCohortDistributionURL {get; set;}
+}

application/CohortManager/src/Functions/CohortDistributionServices/CreateCohortDistribution/Program.cs

@@ -3,9 +3,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
+using DataServices.Client;
+using Model;
+using NHS.Screening.CreateCohortDistribution;
 using HealthChecks.Extensions;
 
 var host = new HostBuilder()
+    .AddConfiguration<CreateCohortDistributionConfig>(out CreateCohortDistributionConfig config)
     .ConfigureFunctionsWorkerDefaults()
     .ConfigureServices(services =>
     {

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveParticipantData/Program.cs

@@ -5,11 +5,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Model;
+using NHS.Screening.RetrieveParticipantData;
 
 var host = new HostBuilder()
     .ConfigureFunctionsWorkerDefaults()
+    .AddConfiguration<RetrieveParticipantDataConfig>(out RetrieveParticipantDataConfig config)
     .AddDataServicesHandler()
-        .AddDataService<ParticipantManagement>(Environment.GetEnvironmentVariable("ParticipantManagementUrl"))
+        .AddDataService<ParticipantManagement>(config.ParticipantManagementUrl)
         .Build()
     .ConfigureServices(services =>
     {

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveParticipantData/RetrieveParticipantData.cs

@@ -10,6 +10,8 @@ namespace NHS.CohortManager.CohortDistributionService;
 using System.Text;
 using System.Text.Json;
 using DataServices.Client;
+using Microsoft.Extensions.Options;
+using NHS.Screening.RetrieveParticipantData;
 
 public class RetrieveParticipantData
 {
@@ -19,18 +21,20 @@ public class RetrieveParticipantData
     private readonly ICreateParticipant _createParticipant;
     private readonly IExceptionHandler _exceptionHandler;
     private readonly IDataServiceClient<ParticipantManagement> _participantManagementClient;
+    private readonly RetrieveParticipantDataConfig _config;
 
     public RetrieveParticipantData(ICreateResponse createResponse, ILogger<RetrieveParticipantData> logger,
                                 IDataServiceClient<ParticipantManagement> participantManagementClient,
                                 ICreateParticipant createParticipant, IExceptionHandler exceptionHandler,
-                                ICallFunction callFunction)
+                                ICallFunction callFunction, IOptions<RetrieveParticipantDataConfig> retrieveParticipantDataConfig)
     {
         _createResponse = createResponse;
         _logger = logger;
         _callFunction = callFunction;
         _createParticipant = createParticipant;
         _exceptionHandler = exceptionHandler;
         _participantManagementClient = participantManagementClient;
+        _config = retrieveParticipantDataConfig.Value;
     }
 
     [Function("RetrieveParticipantData")]
@@ -68,7 +72,7 @@ public async Task<HttpResponseData> RunAsync([HttpTrigger(AuthorizationLevel.Ano
                 {"Id", requestBody.NhsNumber }
             };
 
-            var demographicDataJson = await _callFunction.SendGet(Environment.GetEnvironmentVariable("DemographicDataFunctionURL"), demographicFunctionParams);
+            var demographicDataJson = await _callFunction.SendGet(_config.DemographicDataFunctionURL, demographicFunctionParams);
 
             var demographicData = JsonSerializer.Deserialize<Demographic>(demographicDataJson);
             if (demographicData == null)