Merge branch 'main' into refactor/shared-not-common

Author: ianfnelson

compose.yaml

@@ -2,7 +2,7 @@ services:
   api:
     container_name: "api"
     build:
-      context: ./Src
+      context: ./src
       dockerfile: ServiceLayer.API/Dockerfile
     platform: linux/amd64
     restart: always
@@ -33,7 +33,7 @@ services:
   mesh-ingest:
     container_name: "mesh-ingest"
     build:
-      context: ./Src
+      context: ./src
       dockerfile: ServiceLayer.MESH/Dockerfile
     platform: linux/amd64
     restart: always

src/ServiceLayer.Mesh/Configuration/ServiceCollectionExtensions.cs

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ServiceLayer.Mesh.Configuration;
+
+internal static class ServiceCollectionExtensions
+{
+    internal static IServiceCollection AddApplicationConfiguration(this IServiceCollection services)
+    {
+        services.AddTransient<IFileDiscoveryFunctionConfiguration, AppConfiguration>();
+        services.AddTransient<IFileExtractQueueClientConfiguration, AppConfiguration>();
+        services.AddTransient<IFileTransformQueueClientConfiguration, AppConfiguration>();
+        services.AddTransient<IMeshHandshakeFunctionConfiguration, AppConfiguration>();
+        services.AddTransient<IFileRetryFunctionConfiguration, AppConfiguration>();
+        services.AddTransient<IFileTransformFunctionConfiguration, AppConfiguration>();
+
+        return services;
+    }
+}

src/ServiceLayer.Mesh/FileTypes/NbssAppointmentEvents/ServiceCollectionExtensions.cs

@@ -3,20 +3,20 @@
 
 namespace ServiceLayer.Mesh.FileTypes.NbssAppointmentEvents;
 
-public static class ServiceCollectionExtensions
+internal static class ServiceCollectionExtensions
 {
-    public static IServiceCollection ConfigureNbssAppointmentEvents(this IServiceCollection services)
+    internal static IServiceCollection AddNbssAppointmentEventServices(this IServiceCollection services)
     {
         services.AddTransient<IFileTransformer, FileTransformer>();
         services.AddTransient<IFileParser, FileParser>();
         services.AddTransient<IStagingPersister, StagingPersister>();
         services.AddSingleton<IValidationRunner, ValidationRunner>();
-        services.RegisterValidators();
+        services.AddValidators();
 
         return services;
     }
 
-    private static IServiceCollection RegisterValidators(this IServiceCollection services)
+    private static IServiceCollection AddValidators(this IServiceCollection services)
     {
         foreach (var recordValidator in ValidatorRegistry.GetAllRecordValidators())
         {

src/ServiceLayer.Mesh/Messaging/ServiceCollectionExtensions.cs

@@ -0,0 +1,34 @@
+using Azure.Identity;
+using Azure.Storage.Queues;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ServiceLayer.Mesh.Messaging;
+
+internal static class ServiceCollectionExtensions
+{
+    internal static IServiceCollection AddMessagingServices(this IServiceCollection services, bool isLocalEnvironment)
+    {
+        var queueClientOptions = new QueueClientOptions
+        {
+            MessageEncoding = QueueMessageEncoding.Base64
+        };
+
+        // Register QueueClients as singletons
+        services.AddSingleton(_ =>
+        {
+            if (isLocalEnvironment)
+            {
+                var connectionString = EnvironmentVariables.GetRequired("AzureWebJobsStorage");
+                return new QueueServiceClient(connectionString, queueClientOptions);
+            }
+
+            var meshStorageAccountUrl = EnvironmentVariables.GetRequired("MeshStorageAccountUrl");
+            return new QueueServiceClient(new Uri(meshStorageAccountUrl), new ManagedIdentityCredential(), queueClientOptions);
+        });
+
+        services.AddSingleton<IFileExtractQueueClient, FileExtractQueueClient>();
+        services.AddSingleton<IFileTransformQueueClient, FileTransformQueueClient>();
+
+        return services;
+    }
+}

src/ServiceLayer.Mesh/Program.cs

@@ -1,13 +1,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Azure.Storage.Queues;
-using Azure.Identity;
-using Microsoft.EntityFrameworkCore;
 using NHS.MESH.Client;
-using Azure.Storage.Blobs;
+using ServiceLayer;
 using ServiceLayer.Mesh.Configuration;
 using ServiceLayer.Mesh.Messaging;
-using ServiceLayer.Data;
 using ServiceLayer.Mesh.Storage;
 using ServiceLayer.Mesh.FileTypes.NbssAppointmentEvents;
 
@@ -18,63 +14,15 @@
         var environment = EnvironmentVariables.GetRequired("ASPNETCORE_ENVIRONMENT");
         var isLocalEnvironment = environment == "Development";
 
-        // MESH Client config
-        services
-            .AddMeshClient(_ => _.MeshApiBaseUrl = EnvironmentVariables.GetRequired("MeshApiBaseUrl"))
-            .AddMailbox(EnvironmentVariables.GetRequired("NbssMailboxId"), new NHS.MESH.Client.Configuration.MailboxConfiguration
-            {
-                Password = EnvironmentVariables.GetRequired("MeshPassword"),
-                SharedKey = EnvironmentVariables.GetRequired("MeshSharedKey"),
-            }).Build();
+        ConfigureMeshClient(services);
 
-        // EF Core DbContext
-        services.AddDbContext<ServiceLayerDbContext>(options =>
-        {
-            var connectionString = EnvironmentVariables.GetRequired("DatabaseConnectionString");
-            if (string.IsNullOrEmpty(connectionString))
-                throw new InvalidOperationException("The connection string has not been initialized.");
-
-            options.UseSqlServer(connectionString);
-        });
-
-        var queueClientOptions = new QueueClientOptions
-        {
-            MessageEncoding = QueueMessageEncoding.Base64
-        };
-
-        // Register QueueClients as singletons
-        services.AddSingleton(provider =>
-        {
-            if (isLocalEnvironment)
-            {
-                var connectionString = EnvironmentVariables.GetRequired("AzureWebJobsStorage");
-                return new QueueServiceClient(connectionString, queueClientOptions);
-            }
-
-            var meshStorageAccountUrl = EnvironmentVariables.GetRequired("MeshStorageAccountUrl");
-            return new QueueServiceClient(new Uri(meshStorageAccountUrl), new DefaultAzureCredential(), queueClientOptions);
-        });
+        services.AddCommonServices();
 
-        services.AddSingleton<IFileExtractQueueClient, FileExtractQueueClient>();
-        services.AddSingleton<IFileTransformQueueClient, FileTransformQueueClient>();
+        services.AddMessagingServices(isLocalEnvironment);
+        services.AddStorageServices(isLocalEnvironment);
 
-        services.AddSingleton(provider =>
-        {
-            return new BlobContainerClient(
-                EnvironmentVariables.GetRequired("AzureWebJobsStorage"),
-                EnvironmentVariables.GetRequired("BlobContainerName"));
-        });
-
-        services.AddSingleton<IMeshFilesBlobStore, MeshFilesBlobStore>();
-
-        services.AddTransient<IFileDiscoveryFunctionConfiguration, AppConfiguration>();
-        services.AddTransient<IFileExtractQueueClientConfiguration, AppConfiguration>();
-        services.AddTransient<IFileTransformQueueClientConfiguration, AppConfiguration>();
-        services.AddTransient<IMeshHandshakeFunctionConfiguration, AppConfiguration>();
-        services.AddTransient<IFileRetryFunctionConfiguration, AppConfiguration>();
-        services.AddTransient<IFileTransformFunctionConfiguration, AppConfiguration>();
-
-        services.ConfigureNbssAppointmentEvents();
+        services.AddApplicationConfiguration();
+        services.AddNbssAppointmentEventServices();
     });
 
 
@@ -85,3 +33,15 @@
 
 var app = host.Build();
 await app.RunAsync();
+return;
+
+void ConfigureMeshClient(IServiceCollection services)
+{
+    services
+        .AddMeshClient(_ => _.MeshApiBaseUrl = EnvironmentVariables.GetRequired("MeshApiBaseUrl"))
+        .AddMailbox(EnvironmentVariables.GetRequired("NbssMailboxId"), new NHS.MESH.Client.Configuration.MailboxConfiguration
+        {
+            Password = EnvironmentVariables.GetRequired("MeshPassword"),
+            SharedKey = EnvironmentVariables.GetRequired("MeshSharedKey"),
+        }).Build();
+}

src/ServiceLayer.Mesh/Storage/ServiceCollectionExtensions.cs

@@ -0,0 +1,30 @@
+using Azure.Identity;
+using Azure.Storage.Blobs;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ServiceLayer.Mesh.Storage;
+
+internal static class ServiceCollectionExtensions
+{
+    internal static IServiceCollection AddStorageServices(this IServiceCollection services, bool isLocalEnvironment)
+    {
+        services.AddSingleton(_ =>
+        {
+            var containerName = EnvironmentVariables.GetRequired("BlobContainerName");
+
+            if (isLocalEnvironment)
+            {
+                return new BlobContainerClient(EnvironmentVariables.GetRequired("AzureWebJobsStorage"),containerName);
+            }
+
+            var meshStorageAccountUrl = EnvironmentVariables.GetRequired("MeshStorageAccountUrl");
+
+            var serviceClient = new BlobServiceClient(new Uri(meshStorageAccountUrl), new ManagedIdentityCredential());
+            return serviceClient.GetBlobContainerClient(containerName);
+        });
+
+        services.AddSingleton<IMeshFilesBlobStore, MeshFilesBlobStore>();
+
+        return services;
+    }
+}

src/ServiceLayer.Shared/Data/ServiceCollectionExtensions.cs

@@ -0,0 +1,19 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ServiceLayer.Data;
+
+internal static class ServiceCollectionExtensions
+{
+    internal static IServiceCollection AddDbContext(this IServiceCollection services)
+    {
+        services.AddDbContext<ServiceLayerDbContext>(options =>
+        {
+            var connectionString = EnvironmentVariables.GetRequired("DatabaseConnectionString");
+
+            options.UseSqlServer(connectionString);
+        });
+
+        return services;
+    }
+}

src/ServiceLayer.Shared/ServiceCollectionExtensions.cs

@@ -0,0 +1,12 @@
+using Microsoft.Extensions.DependencyInjection;
+using ServiceLayer.Data;
+
+namespace ServiceLayer;
+
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddCommonServices(this IServiceCollection services)
+    {
+        return services.AddDbContext();
+    }
+}