chore: Fixing some low priority sonarqube issues (#1668)

Joseph2910 · MWClayson-NHS · web-flow · commit 634023e211ad · 2026-04-16T14:16:21.000Z
* chore: some fixes

* chore: More sonarqube fixes

* chore: remove whitespace

* chore: Address comments

* chore: Add import

* fix: Revert add

---------

Co-authored-by: Michael Clayson &lt;michael.clayson1@nhs.net&gt;
diff --git a/application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/RetrieveMeshFile.cs b/application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/RetrieveMeshFile.cs
@@ -42,7 +42,7 @@ public RetrieveMeshFile(ILogger<RetrieveMeshFile> logger, IMeshToBlobTransferHan
     [Function("RetrieveMeshFile")]
     public async Task RunAsync([TimerTrigger("0 */5 * * * *")] TimerInfo myTimer)
     {
-        _logger.LogInformation("C# Timer trigger function executed at: ,{datetime}", DateTime.UtcNow);
+        _logger.LogInformation("C# Timer trigger function executed at: ,{DateTime}", DateTime.UtcNow);
 
         static bool messageFilter(MessageMetaData i) => true; // No current filter defined there might be business rules here
 
@@ -65,7 +65,7 @@ public async Task RunAsync([TimerTrigger("0 */5 * * * *")] TimerInfo myTimer)
 
         if (myTimer.ScheduleStatus is not null)
         {
-            _logger.LogInformation("Next timer schedule at: {scheduleStatus}", myTimer.ScheduleStatus.Next);
+            _logger.LogInformation("Next timer schedule at: {ScheduleStatus}", myTimer.ScheduleStatus.Next);
         }
     }
 
@@ -127,7 +127,7 @@ private async Task<bool> ShouldExecuteHandShake()
             return true;
 
         }
-        _logger.LogInformation("Next handshake scheduled for {nextHandShakeDateTime}", nextHandShakeDateTime);
+        _logger.LogInformation("Next handshake scheduled for {NextHandShakeDateTime}", nextHandShakeDateTime);
         return false;
     }
 
diff --git a/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/ProcessFileClasses/CallDurableDemographicFunc.cs b/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/ProcessFileClasses/CallDurableDemographicFunc.cs
@@ -1,10 +1,8 @@
 namespace NHS.Screening.ReceiveCaasFile;
 
 
-using System.Net.Http.Headers;
 using System.Text.Json;
 using Common;
-using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Model;
@@ -83,7 +81,7 @@ public async Task<bool> PostDemographicDataAsync(List<ParticipantDemographic> pa
 
             if (finalStatus == WorkFlowStatus.Completed)
             {
-                _logger.LogWarning("Durable function completed {finalStatus}", finalStatus);
+                _logger.LogWarning("Durable function completed {FinalStatus}", finalStatus);
                 return true;
             }
             else
diff --git a/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/receiveCaasFile.cs b/application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/receiveCaasFile.cs
@@ -10,7 +10,6 @@ namespace NHS.Screening.ReceiveCaasFile;
 using Common;
 using DataServices.Client;
 using Microsoft.Extensions.Options;
-using Azure.Messaging.ServiceBus;
 
 public class ReceiveCaasFile
 {
@@ -119,7 +118,7 @@ public async Task Run([BlobTrigger("inbound/{name}", Connection = "caasfolder_ST
     public async Task<ScreeningLkp> GetScreeningService(FileNameParser fileNameParser)
     {
         var screeningWorkflowId = fileNameParser.GetScreeningService();
-        _logger.LogInformation("Screening Acronym {screeningWorkflowId}", screeningWorkflowId);
+        _logger.LogInformation("Screening Acronym {ScreeningWorkflowId}", screeningWorkflowId);
 
         ScreeningLkp screeningService = await _screeningLkpClient.GetSingleByFilter(x => x.ScreeningWorkflowId == screeningWorkflowId)
             ?? throw new ArgumentException("Could not get screening service data for screening id: " + screeningWorkflowId);
diff --git a/application/CohortManager/src/Functions/DemographicServices/ManageCaasSubscription/ManageCaasSubscription.cs b/application/CohortManager/src/Functions/DemographicServices/ManageCaasSubscription/ManageCaasSubscription.cs
@@ -7,15 +7,11 @@ namespace NHS.CohortManager.DemographicServices;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Common;
-using System.Collections.Specialized;
 using System.Text;
 using DataServices.Core;
 using Model;
-using NHS.CohortManager.DemographicServices;
-using Common.Interfaces;
 using System.Text.Json;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 
 /// <summary>
 /// Azure Functions endpoints for managing CaaS subscriptions via MESH and data services.
@@ -30,6 +26,7 @@ public class ManageCaasSubscription
     private readonly IDataServiceAccessor<NemsSubscription> _nemsSubscriptionAccessor;
     private readonly IMeshPoller _meshPoller;
     private readonly IExceptionHandler _exceptionHandler;
+    private const string? nhsNum = "nhsNumber";
 
     public ManageCaasSubscription(
         ILogger<ManageCaasSubscription> logger,
@@ -60,9 +57,9 @@ public ManageCaasSubscription(
     [Function("Subscribe")]
     public async Task<HttpResponseData> Subscribe([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequestData req)
     {
+        string? nhsNumber = req.Query[nhsNum];
         try
         {
-            var nhsNumber = req.Query["nhsNumber"];
             if (!ValidationHelper.ValidateNHSNumber(nhsNumber!))
             {
                 return await _createResponse.CreateHttpResponseWithBodyAsync(HttpStatusCode.BadRequest, req, "NHS number is required and must be valid format.");
@@ -117,7 +114,7 @@ public async Task<HttpResponseData> Subscribe([HttpTrigger(AuthorizationLevel.An
             _logger.LogError(ex, "Error sending CAAS subscribe request");
             try
             {
-                string? rawNhs = req.Query["nhsNumber"];
+                string? rawNhs = req.Query[nhsNum];
                 var nhsForLog = ValidationHelper.ValidateNHSNumber(rawNhs!) ? rawNhs! : string.Empty;
                 await _exceptionHandler.CreateSystemExceptionLogFromNhsNumber(ex, nhsForLog, nameof(ManageCaasSubscription), "", string.Empty);
             }
@@ -242,7 +239,7 @@ public async Task<HttpResponseData> SubscribeMany([HttpTrigger(AuthorizationLeve
     [Function("Unsubscribe")]
     public async Task<HttpResponseData> Unsubscribe([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequestData req)
     {
-        var nhsNumber = req.Query["nhsNumber"];
+        var nhsNumber = req.Query[nhsNum];
         if (!ValidationHelper.ValidateNHSNumber(nhsNumber!))
         {
             return await _createResponse.CreateHttpResponseWithBodyAsync(HttpStatusCode.BadRequest, req, "NHS number is required and must be valid format.");
@@ -264,7 +261,7 @@ public async Task<HttpResponseData> CheckSubscriptionStatus([HttpTrigger(Authori
         {
             _logger.LogInformation("Received check subscription request");
 
-            string? nhsNumber = req.Query["nhsNumber"];
+            string? nhsNumber = req.Query[nhsNum];
 
             if (!ValidationHelper.ValidateNHSNumber(nhsNumber!))
             {
@@ -287,7 +284,7 @@ public async Task<HttpResponseData> CheckSubscriptionStatus([HttpTrigger(Authori
             _logger.LogError(ex, "Error checking subscription status");
             try
             {
-                string? rawNhs = req.Query["nhsNumber"];
+                string? rawNhs = req.Query[nhsNum];
                 var nhsForLog = ValidationHelper.ValidateNHSNumber(rawNhs!) ? rawNhs! : string.Empty;
                 await _exceptionHandler.CreateSystemExceptionLogFromNhsNumber(ex, nhsForLog, nameof(ManageCaasSubscription), "", string.Empty);
             }
diff --git a/application/CohortManager/src/Functions/NemsSubscriptionService/NemsMeshRetrieval/NemsMeshRetrieval.cs b/application/CohortManager/src/Functions/NemsSubscriptionService/NemsMeshRetrieval/NemsMeshRetrieval.cs
@@ -1,9 +1,7 @@
 namespace NHS.Screening.NemsMeshRetrieval;
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Common;
@@ -42,7 +40,7 @@ public NemsMeshRetrieval(ILogger<NemsMeshRetrieval> logger, IMeshToBlobTransferH
     [Function("RetrieveNemsMeshFile")]
     public async Task RunAsync([TimerTrigger("0 */5 * * * *")] TimerInfo myTimer)
     {
-        _logger.LogInformation("C# Timer trigger function executed at: ,{datetime}", DateTime.UtcNow);
+        _logger.LogInformation("C# Timer trigger function executed at: ,{Datetime}", DateTime.UtcNow);
 
         static bool messageFilter(MessageMetaData i) => true; // No current filter defined there might be business rules here
 
@@ -65,7 +63,7 @@ public async Task RunAsync([TimerTrigger("0 */5 * * * *")] TimerInfo myTimer)
 
         if (myTimer.ScheduleStatus is not null)
         {
-            _logger.LogInformation("Next timer schedule at: {scheduleStatus}", myTimer.ScheduleStatus.Next);
+            _logger.LogInformation("Next timer schedule at: {ScheduleStatus}", myTimer.ScheduleStatus.Next);
         }
     }
 
@@ -127,7 +125,7 @@ private async Task<bool> ShouldExecuteHandShake()
             return true;
 
         }
-        _logger.LogInformation("Next handshake scheduled for {nextHandShakeDateTime}", nextHandShakeDateTime);
+        _logger.LogInformation("Next handshake scheduled for {NextHandShakeDateTime}", nextHandShakeDateTime);
         return false;
     }
 
diff --git a/application/CohortManager/src/Functions/ParticipantManagementServices/UpdateBlockedFlag/BlockParticipantHandler.cs b/application/CohortManager/src/Functions/ParticipantManagementServices/UpdateBlockedFlag/BlockParticipantHandler.cs
@@ -16,6 +16,7 @@ public class BlockParticipantHandler : IBlockParticipantHandler
     private readonly IDataServiceClient<ParticipantDemographic> _participantDemographicDataService;
     private readonly IHttpClientFunction _httpClient;
     private readonly UpdateBlockedFlagConfig _config;
+    private static readonly string CultureInfo = "en-GB";
     public BlockParticipantHandler(ILogger<BlockParticipantHandler> logger,
         IDataServiceClient<ParticipantManagement> participantManagementDataService,
         IDataServiceClient<ParticipantDemographic> participantDemographicDataService,
@@ -253,12 +254,12 @@ private async Task<PdsDemographic> GetPDSParticipant(long nhsNumber)
     private static bool ValidateRecordsMatch(ParticipantDemographic participant, BlockParticipantDto dto)
     {
 
-        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))
+        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var dtoDateOfBirth))
         {
             throw new FormatException("Date of Birth not in the correct format");
         }
 
-        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
+        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var parsedDob))
         {
             return false;
         }
@@ -271,12 +272,12 @@ private static bool ValidateRecordsMatch(ParticipantDemographic participant, Blo
     private static bool ValidateRecordsMatch(PdsDemographic participant, BlockParticipantDto dto)
     {
 
-        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))
+        if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var dtoDateOfBirth))
         {
             throw new FormatException("Date of Birth not in the correct format");
         }
 
-        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))
+        if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var parsedDob))
         {
             return false;
         }
diff --git a/application/CohortManager/src/Functions/ServiceNowIntegration/ServiceNowMessageHandler/ReceiveServiceNowMessageFunction.cs b/application/CohortManager/src/Functions/ServiceNowIntegration/ServiceNowMessageHandler/ReceiveServiceNowMessageFunction.cs
@@ -125,7 +125,7 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
         }
         catch (JsonException ex)
         {
-            _logger.LogError(ex, "Failed to deserialize json request body to type {type}", nameof(ReceiveServiceNowMessageRequestBody));
+            _logger.LogError(ex, "Failed to deserialize json request body to type {Type}", nameof(ReceiveServiceNowMessageRequestBody));
             return _createResponse.CreateHttpResponse(HttpStatusCode.BadRequest, req);
         }
         catch (Exception ex)
diff --git a/application/CohortManager/src/Functions/ServiceNowIntegration/ServiceNowMessageHandler/ServiceNowClient.cs b/application/CohortManager/src/Functions/ServiceNowIntegration/ServiceNowMessageHandler/ServiceNowClient.cs
@@ -156,7 +156,7 @@ private static HttpRequestMessage CreateRequest(string url, string json, string
 
         if (!response.IsSuccessStatusCode)
         {
-            _logger.LogError("Failed to refresh ServiceNow access token. StatusCode: {statusCode}", response.StatusCode);
+            _logger.LogError("Failed to refresh ServiceNow access token. StatusCode: {StatusCode}", response.StatusCode);
             return null;
         }
 
diff --git a/application/CohortManager/src/Functions/Shared/Common/AuthorizationClientCredentials.cs b/application/CohortManager/src/Functions/Shared/Common/AuthorizationClientCredentials.cs
@@ -40,7 +40,7 @@ public AuthorizationClientCredentials(IJwtTokenService jwtTokenService, HttpClie
 
         if (response.StatusCode != HttpStatusCode.OK)
         {
-            _logger.LogError("there was an error getting the bearer token from the NHS token service. Response: {resBody}", resBody);
+            _logger.LogError("there was an error getting the bearer token from the NHS token service. Response: {ResBody}", resBody);
             return null;
         }
 
diff --git a/application/CohortManager/src/Functions/Shared/Common/AzureQueueStorageHelper.cs b/application/CohortManager/src/Functions/Shared/Common/AzureQueueStorageHelper.cs
@@ -31,7 +31,7 @@ public async Task<bool> AddAsync<T>(T message, string queueName)
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "There was an error while putting item on queue for queue: {queueName}", queueName);
+            _logger.LogError(ex, "There was an error while putting item on queue for queue: {QueueName}", queueName);
             return false;
         }
     }
diff --git a/application/CohortManager/src/Functions/Shared/Common/AzureServiceBusClient.cs b/application/CohortManager/src/Functions/Shared/Common/AzureServiceBusClient.cs
@@ -46,7 +46,7 @@ public async Task<bool> AddAsync<T>(T message, string queueName)
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "There was an error sending message to service bus queue {queueName} {errorMessage}", queueName, ex.Message);
+            _logger.LogError(ex, "There was an error sending message to service bus queue {QueueName} {ErrorMessage}", queueName, ex.Message);
             return false;
         }
     }
diff --git a/application/CohortManager/src/Functions/Shared/Common/ExceptionHandler.cs b/application/CohortManager/src/Functions/Shared/Common/ExceptionHandler.cs
@@ -295,7 +295,7 @@ public async Task<ValidationExceptionLog> CreateValidationExceptionLog(IEnumerab
             if (!string.IsNullOrEmpty(error.ExceptionMessage))
             {
                 errorMessage = error.ExceptionMessage;
-                _logger.LogError("an exception was raised while running the rules. Exception Message: {exceptionMessage}", error.ExceptionMessage);
+                _logger.LogError("an exception was raised while running the rules. Exception Message: {ExceptionMessage}", error.ExceptionMessage);
             }
 
             var exception = new ValidationException
diff --git a/application/CohortManager/src/Functions/Shared/Common/MeshToBlobTransferHandler.cs b/application/CohortManager/src/Functions/Shared/Common/MeshToBlobTransferHandler.cs
@@ -63,7 +63,7 @@ public async Task<bool> MoveFilesFromMeshToBlob(Func<MessageMetaData,bool> predi
 
             messageCount = checkForMessages.Response.Messages.Count();
 
-            _logger.LogInformation("{messageCount} Messages were found within mailbox {mailboxId}",messageCount,mailboxId);
+            _logger.LogInformation("{MessageCount} Messages were found within mailbox {MailboxId}",messageCount,mailboxId);
 
             if(messageCount == 0)
             {
@@ -72,7 +72,7 @@ public async Task<bool> MoveFilesFromMeshToBlob(Func<MessageMetaData,bool> predi
 
             var messagesMoved = await MoveAllMessagesToBlobStorage(checkForMessages.Response.Messages,predicate);
 
-            _logger.LogInformation("{messagesMoved} out of {messageCount} Messages were moved mailbox: {mailboxId} to Blob Storage",messagesMoved,messageCount,mailboxId);
+            _logger.LogInformation("{MessagesMoved} out of {MessageCount} Messages were moved mailbox: {MailboxId} to Blob Storage",messagesMoved,messageCount,mailboxId);
 
             if(messagesMoved == 0 && messageCount == 500)
             {
@@ -150,7 +150,7 @@ private async Task<bool> TransferMessageToBlobStorage(MessageMetaData messageHea
         var result = await _meshInboxService.GetChunkedMessageByIdAsync(_mailboxId,messageId);
         if(!result.IsSuccessful)
         {
-            _logger.LogError("Failed to download chunked message from MESH MessageId: {messageId}",messageId);
+            _logger.LogError("Failed to download chunked message from MESH MessageId: {MessageId}",messageId);
             return null;
         }
 
@@ -165,7 +165,7 @@ private async Task<bool> TransferMessageToBlobStorage(MessageMetaData messageHea
         var result = await _meshInboxService.GetMessageByIdAsync(_mailboxId,messageId);
         if(!result.IsSuccessful)
         {
-            _logger.LogError("Failed to download chunked message from MESH MessageId: {messageId}",messageId);
+            _logger.LogError("Failed to download chunked message from MESH MessageId: {MessageId}",messageId);
             return null;
         }
 
diff --git a/application/CohortManager/src/Functions/Shared/Common/ReadRules.cs b/application/CohortManager/src/Functions/Shared/Common/ReadRules.cs
@@ -22,12 +22,12 @@ public async Task<string> GetRulesFromDirectory(string jsonFileName)
 
             // Construct the path to the JSON file (assuming it was copied to the output directory)
             var filePath = Path.Combine(currentDirectory, jsonFileName);
-             _logger.LogInformation("file path: {filePath}", filePath);
+             _logger.LogInformation("file path: {FilePath}", filePath);
 
             // Check if the file exists
             if (!File.Exists(filePath))
             {
-                _logger.LogError("File not found: {filePath}", filePath);
+                _logger.LogError("File not found: {FilePath}", filePath);
                 return string.Empty;
             }
 
@@ -37,7 +37,7 @@ public async Task<string> GetRulesFromDirectory(string jsonFileName)
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "error while getting rules from directory: {ex} {fileName}", ex.Message, jsonFileName);
+            _logger.LogError(ex, "error while getting rules from directory: {Ex} {FileName}", ex.Message, jsonFileName);
             return string.Empty;
         }
     }
diff --git a/application/CohortManager/src/Functions/Shared/DataServices.Client/DataServiceCacheClient.cs b/application/CohortManager/src/Functions/Shared/DataServices.Client/DataServiceCacheClient.cs
@@ -19,10 +19,10 @@ public override async Task<TEntity> GetSingle(string id)
     {
         if (_cache.TryGetValue<TEntity>(id, out TEntity entity))
         {
-            _logger.LogInformation("Cache Hit reading key {key} for entity : {entity}", id, typeof(TEntity).FullName);
+            _logger.LogInformation("Cache Hit reading key {Key} for entity : {Entity}", id, typeof(TEntity).FullName);
             return entity;
         }
-        _logger.LogInformation("Cache Miss reading key {key} for entity : {entity}", id, typeof(TEntity).FullName);
+        _logger.LogInformation("Cache Miss reading key {Key} for entity : {Entity}", id, typeof(TEntity).FullName);
         entity = await base.GetSingle(id);
         if (entity == null)
         {
diff --git a/application/CohortManager/src/Functions/Shared/Model/PdsDemographic.cs b/application/CohortManager/src/Functions/Shared/Model/PdsDemographic.cs
@@ -1,6 +1,5 @@
 namespace Model;
 
-using System.Data;
 using System.Text.Json.Serialization;
 using Model.Enums;
 using NHS.CohortManager.Shared.Utilities;
@@ -15,6 +14,7 @@ public class PdsDemographic : Demographic
     public string? RemovalEffectiveToDate { get; set; }
     [JsonPropertyOrder(903)]
     public string? ConfidentialityCode { get; set; } = "";
+    private const string DateFormat = "yyyyMMdd"; 
     public PdsDemographic() { }
 
     public ParticipantDemographic ToParticipantDemographic()
@@ -29,7 +29,7 @@ public ParticipantDemographic ToParticipantDemographic()
             OtherGivenName = OtherGivenNames,
             FamilyName = FamilyName,
             PreviousFamilyName = PreviousFamilyName,
-            DateOfBirth = MappingUtilities.ParseDates(DateOfBirth!)?.ToString("yyyyMMdd"),
+            DateOfBirth = MappingUtilities.ParseDates(DateOfBirth!)?.ToString(DateFormat),
             Gender = (short?)(Gender.HasValue ? (Gender?)Gender.Value : null),
             AddressLine1 = AddressLine1,
             AddressLine2 = AddressLine2,
@@ -38,15 +38,15 @@ public ParticipantDemographic ToParticipantDemographic()
             AddressLine5 = AddressLine5,
             PostCode = Postcode,
             PafKey = PafKey,
-            UsualAddressFromDate = MappingUtilities.ParseDates(UsualAddressEffectiveFromDate!)?.ToString("yyyyMMdd"),
+            UsualAddressFromDate = MappingUtilities.ParseDates(UsualAddressEffectiveFromDate!)?.ToString(DateFormat),
             DateOfDeath = DateOfDeath,
             DeathStatus = (short?)(DeathStatus.HasValue ? (Status?)DeathStatus.Value : null),
             TelephoneNumberHome = TelephoneNumber,
-            TelephoneNumberHomeFromDate = MappingUtilities.ParseDates(TelephoneNumberEffectiveFromDate!)?.ToString("yyyy-MM-dd"),
+            TelephoneNumberHomeFromDate = MappingUtilities.ParseDates(TelephoneNumberEffectiveFromDate!)?.ToString(DateFormat),
             TelephoneNumberMob = MobileNumber,
-            TelephoneNumberMobFromDate = MappingUtilities.ParseDates(MobileNumberEffectiveFromDate!)?.ToString("yyyyMMdd"),
+            TelephoneNumberMobFromDate = MappingUtilities.ParseDates(MobileNumberEffectiveFromDate!)?.ToString("yyyy-MM-dd"),
             EmailAddressHome = EmailAddress,
-            EmailAddressHomeFromDate = MappingUtilities.ParseDates(EmailAddressEffectiveFromDate!)?.ToString("yyyyMMdd"),
+            EmailAddressHomeFromDate = MappingUtilities.ParseDates(EmailAddressEffectiveFromDate!)?.ToString(DateFormat),
             PreferredLanguage = PreferredLanguage,
             InterpreterRequired = IsInterpreterRequired?.ToLower() switch
             {
diff --git a/application/CohortManager/src/Web/app/api/UpdateException/route.ts b/application/CohortManager/src/Web/app/api/UpdateException/route.ts
diff --git a/application/CohortManager/src/Web/app/api/UpdateExceptionServiceNowId/route.ts b/application/CohortManager/src/Web/app/api/UpdateExceptionServiceNowId/route.ts
diff --git a/application/CohortManager/src/Web/app/data/mockDataStore.ts b/application/CohortManager/src/Web/app/data/mockDataStore.ts
diff --git a/application/CohortManager/src/Web/app/lib/pagination.ts b/application/CohortManager/src/Web/app/lib/pagination.ts
diff --git a/application/CohortManager/src/Web/app/lib/utils.ts b/application/CohortManager/src/Web/app/lib/utils.ts
diff --git a/application/CohortManager/src/Web/app/reports/page.tsx b/application/CohortManager/src/Web/app/reports/page.tsx
diff --git a/application/CohortManager/src/Web/jest.config.ts b/application/CohortManager/src/Web/jest.config.ts
diff --git a/tests/playwright-tests/scripts/health-check.js b/tests/playwright-tests/scripts/health-check.js

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public RetrieveMeshFile(ILogger<RetrieveMeshFile> logger, IMeshToBlobTransferHan`
`42`	`42`	`[Function("RetrieveMeshFile")]`
`43`	`43`	`public async Task RunAsync([TimerTrigger("0 /5 * * *")] TimerInfo myTimer)`
`44`	`44`	`{`
`45`		`- _logger.LogInformation("C# Timer trigger function executed at: ,{datetime}", DateTime.UtcNow);`
	`45`	`+ _logger.LogInformation("C# Timer trigger function executed at: ,{DateTime}", DateTime.UtcNow);`
`46`	`46`
`47`	`47`	`static bool messageFilter(MessageMetaData i) => true; // No current filter defined there might be business rules here`
`48`	`48`
`@@ -65,7 +65,7 @@ public async Task RunAsync([TimerTrigger("0 /5 * * *")] TimerInfo myTimer)`
`65`	`65`
`66`	`66`	`if (myTimer.ScheduleStatus is not null)`
`67`	`67`	`{`
`68`		`- _logger.LogInformation("Next timer schedule at: {scheduleStatus}", myTimer.ScheduleStatus.Next);`
	`68`	`+ _logger.LogInformation("Next timer schedule at: {ScheduleStatus}", myTimer.ScheduleStatus.Next);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`@@ -127,7 +127,7 @@ private async Task<bool> ShouldExecuteHandShake()`
`127`	`127`	`return true;`
`128`	`128`
`129`	`129`	`}`
`130`		`- _logger.LogInformation("Next handshake scheduled for {nextHandShakeDateTime}", nextHandShakeDateTime);`
	`130`	`+ _logger.LogInformation("Next handshake scheduled for {NextHandShakeDateTime}", nextHandShakeDateTime);`
`131`	`131`	`return false;`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace NHS.Screening.ReceiveCaasFile;`
`10`	`10`	`using Common;`
`11`	`11`	`using DataServices.Client;`
`12`	`12`	`using Microsoft.Extensions.Options;`
`13`		`-using Azure.Messaging.ServiceBus;`
`14`	`13`
`15`	`14`	`public class ReceiveCaasFile`
`16`	`15`	`{`
`@@ -119,7 +118,7 @@ public async Task Run([BlobTrigger("inbound/{name}", Connection = "caasfolder_ST`
`119`	`118`	`public async Task<ScreeningLkp> GetScreeningService(FileNameParser fileNameParser)`
`120`	`119`	`{`
`121`	`120`	`var screeningWorkflowId = fileNameParser.GetScreeningService();`
`122`		`- _logger.LogInformation("Screening Acronym {screeningWorkflowId}", screeningWorkflowId);`
	`121`	`+ _logger.LogInformation("Screening Acronym {ScreeningWorkflowId}", screeningWorkflowId);`
`123`	`122`
`124`	`123`	`ScreeningLkp screeningService = await _screeningLkpClient.GetSingleByFilter(x => x.ScreeningWorkflowId == screeningWorkflowId)`
`125`	`124`	`?? throw new ArgumentException("Could not get screening service data for screening id: " + screeningWorkflowId);`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`namespace NHS.Screening.NemsMeshRetrieval;`
`2`	`2`
`3`	`3`	`using System;`
`4`		`-using System.Diagnostics.CodeAnalysis;`
`5`	`4`	`using System.Globalization;`
`6`		`-using System.Text;`
`7`	`5`	`using System.Text.Json;`
`8`	`6`	`using System.Threading.Tasks;`
`9`	`7`	`using Common;`
`@@ -42,7 +40,7 @@ public NemsMeshRetrieval(ILogger<NemsMeshRetrieval> logger, IMeshToBlobTransferH`
`42`	`40`	`[Function("RetrieveNemsMeshFile")]`
`43`	`41`	`public async Task RunAsync([TimerTrigger("0 /5 * * *")] TimerInfo myTimer)`
`44`	`42`	`{`
`45`		`- _logger.LogInformation("C# Timer trigger function executed at: ,{datetime}", DateTime.UtcNow);`
	`43`	`+ _logger.LogInformation("C# Timer trigger function executed at: ,{Datetime}", DateTime.UtcNow);`
`46`	`44`
`47`	`45`	`static bool messageFilter(MessageMetaData i) => true; // No current filter defined there might be business rules here`
`48`	`46`
`@@ -65,7 +63,7 @@ public async Task RunAsync([TimerTrigger("0 /5 * * *")] TimerInfo myTimer)`
`65`	`63`
`66`	`64`	`if (myTimer.ScheduleStatus is not null)`
`67`	`65`	`{`
`68`		`- _logger.LogInformation("Next timer schedule at: {scheduleStatus}", myTimer.ScheduleStatus.Next);`
	`66`	`+ _logger.LogInformation("Next timer schedule at: {ScheduleStatus}", myTimer.ScheduleStatus.Next);`
`69`	`67`	`}`
`70`	`68`	`}`
`71`	`69`
`@@ -127,7 +125,7 @@ private async Task<bool> ShouldExecuteHandShake()`
`127`	`125`	`return true;`
`128`	`126`
`129`	`127`	`}`
`130`		`- _logger.LogInformation("Next handshake scheduled for {nextHandShakeDateTime}", nextHandShakeDateTime);`
	`128`	`+ _logger.LogInformation("Next handshake scheduled for {NextHandShakeDateTime}", nextHandShakeDateTime);`
`131`	`129`	`return false;`
`132`	`130`	`}`
`133`	`131`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public class BlockParticipantHandler : IBlockParticipantHandler`
`16`	`16`	`private readonly IDataServiceClient<ParticipantDemographic> _participantDemographicDataService;`
`17`	`17`	`private readonly IHttpClientFunction _httpClient;`
`18`	`18`	`private readonly UpdateBlockedFlagConfig _config;`
	`19`	`+ private static readonly string CultureInfo = "en-GB";`
`19`	`20`	`public BlockParticipantHandler(ILogger<BlockParticipantHandler> logger,`
`20`	`21`	`IDataServiceClient<ParticipantManagement> participantManagementDataService,`
`21`	`22`	`IDataServiceClient<ParticipantDemographic> participantDemographicDataService,`
`@@ -253,12 +254,12 @@ private async Task<PdsDemographic> GetPDSParticipant(long nhsNumber)`
`253`	`254`	`private static bool ValidateRecordsMatch(ParticipantDemographic participant, BlockParticipantDto dto)`
`254`	`255`	`{`
`255`	`256`
`256`		`- if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))`
	`257`	`+ if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var dtoDateOfBirth))`
`257`	`258`	`{`
`258`	`259`	`throw new FormatException("Date of Birth not in the correct format");`
`259`	`260`	`}`
`260`	`261`
`261`		`- if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))`
	`262`	`+ if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyyMMdd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var parsedDob))`
`262`	`263`	`{`
`263`	`264`	`return false;`
`264`	`265`	`}`
`@@ -271,12 +272,12 @@ private static bool ValidateRecordsMatch(ParticipantDemographic participant, Blo`
`271`	`272`	`private static bool ValidateRecordsMatch(PdsDemographic participant, BlockParticipantDto dto)`
`272`	`273`	`{`
`273`	`274`
`274`		`- if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var dtoDateOfBirth))`
	`275`	`+ if (!DateOnly.TryParseExact(dto.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var dtoDateOfBirth))`
`275`	`276`	`{`
`276`	`277`	`throw new FormatException("Date of Birth not in the correct format");`
`277`	`278`	`}`
`278`	`279`
`279`		`- if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyy-MM-dd", new CultureInfo("en-GB"), DateTimeStyles.None, out var parsedDob))`
	`280`	`+ if (!DateOnly.TryParseExact(participant.DateOfBirth, "yyyy-MM-dd", new CultureInfo(CultureInfo), DateTimeStyles.None, out var parsedDob))`
`280`	`281`	`{`
`281`	`282`	`return false;`
`282`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou`
`125`	`125`	`}`
`126`	`126`	`catch (JsonException ex)`
`127`	`127`	`{`
`128`		`- _logger.LogError(ex, "Failed to deserialize json request body to type {type}", nameof(ReceiveServiceNowMessageRequestBody));`
	`128`	`+ _logger.LogError(ex, "Failed to deserialize json request body to type {Type}", nameof(ReceiveServiceNowMessageRequestBody));`
`129`	`129`	`return _createResponse.CreateHttpResponse(HttpStatusCode.BadRequest, req);`
`130`	`130`	`}`
`131`	`131`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private static HttpRequestMessage CreateRequest(string url, string json, string`
`156`	`156`
`157`	`157`	`if (!response.IsSuccessStatusCode)`
`158`	`158`	`{`
`159`		`- _logger.LogError("Failed to refresh ServiceNow access token. StatusCode: {statusCode}", response.StatusCode);`
	`159`	`+ _logger.LogError("Failed to refresh ServiceNow access token. StatusCode: {StatusCode}", response.StatusCode);`
`160`	`160`	`return null;`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public AuthorizationClientCredentials(IJwtTokenService jwtTokenService, HttpClie`
`40`	`40`
`41`	`41`	`if (response.StatusCode != HttpStatusCode.OK)`
`42`	`42`	`{`
`43`		`- _logger.LogError("there was an error getting the bearer token from the NHS token service. Response: {resBody}", resBody);`
	`43`	`+ _logger.LogError("there was an error getting the bearer token from the NHS token service. Response: {ResBody}", resBody);`
`44`	`44`	`return null;`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public async Task<bool> AddAsync<T>(T message, string queueName)`
`31`	`31`	`}`
`32`	`32`	`catch (Exception ex)`
`33`	`33`	`{`
`34`		`- _logger.LogError(ex, "There was an error while putting item on queue for queue: {queueName}", queueName);`
	`34`	`+ _logger.LogError(ex, "There was an error while putting item on queue for queue: {QueueName}", queueName);`
`35`	`35`	`return false;`
`36`	`36`	`}`
`37`	`37`	`}`