fix: Resolve SonarQube warnings (#36)

Author: ianfnelson

src/ServiceLayer.Mesh/FileTypes/NbssAppointmentEvents/Validation/IRecordValidator.cs

@@ -2,7 +2,6 @@
 
 namespace ServiceLayer.Mesh.FileTypes.NbssAppointmentEvents.Validation;
 
-// TODO - create a whole bunch of implementations of this to perform the validation against NBSS Appointment events records
 public interface IRecordValidator
 {
     IEnumerable<ValidationError> Validate(FileDataRecord fileDataRecord);

src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs

@@ -34,14 +34,14 @@ private async Task RetryStaleExtractions(DateTime staleDateTimeUtc)
                 && f.LastUpdatedUtc <= staleDateTimeUtc)
             .ToListAsync();
 
-        logger.LogInformation($"FileRetryFunction: {staleFiles.Count} stale files found for extraction retry");
+        logger.LogInformation("FileRetryFunction: {StaleFilesCount} stale files found for extraction retry", staleFiles.Count);
 
         foreach (var file in staleFiles)
         {
             await fileExtractQueueClient.EnqueueFileExtractAsync(file);
             file.LastUpdatedUtc = DateTime.UtcNow;
             await serviceLayerDbContext.SaveChangesAsync();
-            logger.LogInformation($"FileRetryFunction: File {file.FileId} enqueued to Extract queue");
+            logger.LogInformation("FileRetryFunction: File {FileFileId} enqueued to Extract queue", file.FileId);
         }
     }
 
@@ -53,14 +53,14 @@ private async Task RetryStaleTransformations(DateTime staleDateTimeUtc)
                 && f.LastUpdatedUtc <= staleDateTimeUtc)
             .ToListAsync();
 
-        logger.LogInformation($"FileRetryFunction: {staleFiles.Count} stale files found for transforming retry");
+        logger.LogInformation("FileRetryFunction: {StaleFilesCount} stale files found for transforming retry", staleFiles.Count);
 
         foreach (var file in staleFiles)
         {
             await fileTransformQueueClient.EnqueueFileTransformAsync(file);
             file.LastUpdatedUtc = DateTime.UtcNow;
             await serviceLayerDbContext.SaveChangesAsync();
-            logger.LogInformation($"FileRetryFunction: File {file.FileId} enqueued to Transform queue");
+            logger.LogInformation("FileRetryFunction: File {FileFileId} enqueued to Transform queue", file.FileId);
         }
     }
 }

src/ServiceLayer.Mesh/Messaging/FileExtractQueueClient.cs

@@ -1,15 +1,13 @@
 using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
 using ServiceLayer.Data.Models;
 using ServiceLayer.Mesh.Configuration;
 
 namespace ServiceLayer.Mesh.Messaging;
 
 public class FileExtractQueueClient(
-    ILogger<FileExtractQueueClient> logger,
     IFileExtractQueueClientConfiguration configuration,
     QueueServiceClient queueServiceClient)
-    : QueueClientBase(logger, queueServiceClient), IFileExtractQueueClient
+    : QueueClientBase(queueServiceClient), IFileExtractQueueClient
 {
     public async Task EnqueueFileExtractAsync(MeshFile file)
     {

src/ServiceLayer.Mesh/Messaging/FileTransformQueueClient.cs

@@ -1,15 +1,13 @@
 using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
 using ServiceLayer.Data.Models;
 using ServiceLayer.Mesh.Configuration;
 
 namespace ServiceLayer.Mesh.Messaging;
 
 public class FileTransformQueueClient(
-    ILogger<FileTransformQueueClient> logger,
     IFileTransformQueueClientConfiguration configuration,
     QueueServiceClient queueServiceClient)
-    : QueueClientBase(logger, queueServiceClient), IFileTransformQueueClient
+    : QueueClientBase(queueServiceClient), IFileTransformQueueClient
 {
     public async Task EnqueueFileTransformAsync(MeshFile file)
     {

src/ServiceLayer.Mesh/Messaging/QueueClientBase.cs

@@ -1,10 +1,9 @@
 using System.Text.Json;
 using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
 
 namespace ServiceLayer.Mesh.Messaging;
 
-public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueServiceClient)
+public abstract class QueueClientBase(QueueServiceClient queueServiceClient)
 {
     private QueueClient? _queueClient;
     private QueueClient? _poisonQueueClient;
@@ -37,30 +36,13 @@ private QueueClient CreatePoisonClient()
 
     protected async Task SendJsonMessageAsync<T>(T message)
     {
-        try
-        {
-            var json = JsonSerializer.Serialize(message, QueueJsonOptions);
-            await Client.SendMessageAsync(json);
-        }
-        catch (Exception e)
-        {
-            // TODO - consider including file ID or correlation ID in error logs
-            logger.LogError(e, "Error sending message to queue {QueueName}", QueueName);
-            throw;
-        }
+        var json = JsonSerializer.Serialize(message, QueueJsonOptions);
+        await Client.SendMessageAsync(json);
     }
 
     protected async Task SendToPoisonQueueAsync<T>(T message)
     {
-        try
-        {
-            var json = JsonSerializer.Serialize(message, QueueJsonOptions);
-            await PoisonClient.SendMessageAsync(json);
-        }
-        catch (Exception e)
-        {
-            logger.LogError(e, "Error sending message to poison queue {PoisonQueueName}", $"{QueueName}-poison");
-            throw;
-        }
+        var json = JsonSerializer.Serialize(message, QueueJsonOptions);
+        await PoisonClient.SendMessageAsync(json);
     }
 }

src/ServiceLayer.Mesh/Program.cs

@@ -26,12 +26,6 @@
         services.AddNbssAppointmentEventServices();
     });
 
-
-// Application Insights isn't enabled by default. See https://aka.ms/AAt8mw4.
-// builder.Services
-//     .AddApplicationInsightsTelemetryWorkerService()
-//     .ConfigureFunctionsApplicationInsights();
-
 var app = host.Build();
 await app.RunAsync();
 return;

src/ServiceLayer.Mesh/Storage/IMeshFilesBlobStore.cs

@@ -4,9 +4,8 @@ namespace ServiceLayer.Mesh.Storage;
 
 public interface IMeshFilesBlobStore
 {
-    // TODO - return a Stream or a byte array?
     public Task<Stream> DownloadAsync(MeshFile file);
 
-    // Mesh client gives us a byte array, hence this not taking a stream.
+    // Mesh client gives us a byte array, hence this is not taking a stream.
     public Task<string> UploadAsync(MeshFile file, byte[] data);
 }

src/ServiceLayer.Mesh/Storage/MeshFilesBlobStore.cs

@@ -5,7 +5,7 @@ namespace ServiceLayer.Mesh.Storage;
 
 public class MeshFilesBlobStore : IMeshFilesBlobStore
 {
-    private BlobContainerClient _blobContainerClient;
+    private readonly BlobContainerClient _blobContainerClient;
 
     public MeshFilesBlobStore(BlobContainerClient blobContainerClient)
     {

tests/ServiceLayer.Mesh.Tests/FileTypes/NbssAppointmentEvents/Validation/RegexValidatorTests.cs

@@ -4,12 +4,12 @@
 
 namespace ServiceLayer.Mesh.Tests.FileTypes.NbssAppointmentEvents.Validation;
 
-public class RegexValidatorTests
+public partial class RegexValidatorTests
 {
     private const string FieldName = "TestField";
     private const string MissingCode = "ERR001";
     private const string InvalidFormatCode = "ERR002";
-    private readonly Regex _pattern = new(@"^[A-Z]{2}\d{2}$", RegexOptions.Compiled);
+    private readonly Regex _pattern = TestRegex();
 
     [Fact]
     public void Validate_NullValue_ShouldReturnMissingError()
@@ -68,4 +68,7 @@ public void Validate_ValueMatchingPattern_ShouldReturnNoErrors(string validValue
 
         Assert.Empty(errors);
     }
+
+    [GeneratedRegex(@"^[A-Z]{2}\d{2}$", RegexOptions.Compiled)]
+    private static partial Regex TestRegex();
 }

tests/ServiceLayer.Mesh.Tests/Functions/FileDiscoveryFunctionTests.cs

@@ -1,4 +1,5 @@
-using Moq;
+using Microsoft.Azure.Functions.Worker;
+using Moq;
 using NHS.MESH.Client.Contracts.Services;
 using NHS.MESH.Client.Models;
 using ServiceLayer.Data.Models;
@@ -44,7 +45,7 @@ public async Task Run_AddsNewMessageToDbAndQueue()
             });
 
         // Act
-        await _function.Run(null);
+        await _function.Run(new TimerInfo());
 
         // Assert
         var meshFile = AssertFileUpdated(testMessageId, MeshFileStatus.Discovered);
@@ -67,7 +68,7 @@ public async Task Run_DoesNotAddDuplicateMessageOrQueueIt()
             });
 
         // Act
-        await _function.Run(null);
+        await _function.Run(new TimerInfo());
 
         // Assert
         var count = DbContext.MeshFiles.Count(f => f.FileId == existingFile.FileId);
@@ -87,7 +88,7 @@ public async Task Run_NoMessagesInInbox_DoesNothing()
             });
 
         // Act
-        await _function.Run(null);
+        await _function.Run(new TimerInfo());
 
         // Assert
         Assert.Empty(DbContext.MeshFiles);
@@ -107,7 +108,7 @@ public async Task Run_MultipleMessagesInInbox_AllAreProcessed()
             });
 
         // Act
-        await _function.Run(null);
+        await _function.Run(new TimerInfo());
 
         // Assert
         foreach (var id in messageIds)