SPDBT-3022: refactored component configuration

docker-compose.yml

@@ -9,6 +9,7 @@ services:
     environment:
       OTEL_SERVICE_NAME: "Spd.Presentation.Screening"
       SECRETS_FILE: /config/secrets.json
+      BASE_PATH: /screening
     volumes:
       - ${SECRETS_BASE_PATH}/5050035b-d63a-4c6e-a973-fe8e5d35829b/secrets.json:/config/secrets.json
       - ./tmp:/dp:rw
@@ -38,6 +39,7 @@ services:
     environment:
       OTEL_SERVICE_NAME: "Spd.Presentation.Licensing"
       SECRETS_FILE: /config/secrets.json
+      BASE_PATH: /licensing
     volumes:
       - ${SECRETS_BASE_PATH}/168d0646-71ea-405b-8f2f-d47cdf5a0759/secrets.json:/config/secrets.json
       - ./tmp:/dp:rw

src/Spd.Engine.Search/ServiceExtensions.cs → src/Spd.Engine.Search/Configurer.cs

@@ -2,10 +2,11 @@
 using Spd.Utilities.Hosting;
 
 namespace Spd.Engine.Search;
-public class ServiceExtension : IConfigureComponentServices
+
+public class Configurer : IConfigureComponents
 {
-    public void ConfigureServices(ConfigurationServices configurationServices)
+    public void Configure(ConfigurationContext configurationServices)
     {
         configurationServices.Services.AddTransient<ISearchEngine, SearchEngine>();
     }
-}
+}

src/Spd.Engine.Validation/ServiceExtensions.cs → src/Spd.Engine.Validation/Configurer.cs

@@ -2,10 +2,11 @@
 using Spd.Utilities.Hosting;
 
 namespace Spd.Engine.Validation;
-public class ServiceExtension : IConfigureComponentServices
+
+public class Configurer : IConfigureComponents
 {
-    public void ConfigureServices(ConfigurationServices configurationServices)
+    public void Configure(ConfigurationContext configurationServices)
     {
         configurationServices.Services.AddTransient<IDuplicateCheckEngine, DuplicateCheckEngine>();
     }
-}
+}

src/Spd.Manager.Common/ServiceExtensions.cs → src/Spd.Manager.Common/Configurer.cs

@@ -1,14 +1,14 @@
-using Microsoft.Extensions.DependencyInjection;
-using Spd.Manager.Common.Admin;
-using Spd.Utilities.Hosting;
-
-namespace Spd.Manager.Common
-{
-    public class ServiceExtension : IConfigureComponentServices
-    {
-        public void ConfigureServices(ConfigurationServices configurationServices)
-        {
-            configurationServices.Services.AddTransient<IAdminManager, AdminManager>();
-        }
-    }
-}
+using Microsoft.Extensions.DependencyInjection;
+using Spd.Manager.Common.Admin;
+using Spd.Utilities.Hosting;
+
+namespace Spd.Manager.Common
+{
+    public class Configurer : IConfigureComponents
+    {
+        public void Configure(ConfigurationContext configurationServices)
+        {
+            configurationServices.Services.AddTransient<IAdminManager, AdminManager>();
+        }
+    }
+}

src/Spd.Manager.Licence/ServiceExtensions.cs → src/Spd.Manager.Licence/Configurer.cs

@@ -2,14 +2,15 @@
 using Spd.Utilities.Hosting;
 
 namespace Spd.Manager.Licence;
-public class ServiceExtension : IConfigureComponentServices
+
+public class Configurer : IConfigureComponents
 {
-    public void ConfigureServices(ConfigurationServices configurationServices)
+    public void Configure(ConfigurationContext configurationServices)
     {
         configurationServices.Services.AddTransient<ISecurityWorkerAppManager, SecurityWorkerAppManager>();
         configurationServices.Services.AddTransient<IFeeManager, FeeManager>();
         configurationServices.Services.AddTransient<ILicenceManager, LicenceManager>();
         configurationServices.Services.AddTransient<IPermitAppManager, PermitAppManager>();
         configurationServices.Services.AddTransient<IBizLicAppManager, BizLicAppManager>();
     }
-}
+}

src/Spd.Manager.Payment/ServiceExtensions.cs → src/Spd.Manager.Payment/Configurer.cs

@@ -3,11 +3,11 @@
 
 namespace Spd.Manager.Payment
 {
-    public class ServiceExtension : IConfigureComponentServices
+    public class Configurer : IConfigureComponents
     {
-        public void ConfigureServices(ConfigurationServices configurationServices)
+        public void Configure(ConfigurationContext configurationServices)
         {
             configurationServices.Services.AddTransient<IPaymentManager, PaymentManager>();
         }
     }
-}
+}

src/Spd.Manager.Printing/ServiceExtensions.cs → src/Spd.Manager.Printing/Configurer.cs

@@ -1,19 +1,19 @@
-using Microsoft.Extensions.DependencyInjection;
-using Spd.Manager.Printing.Documents;
-using Spd.Manager.Printing.Documents.TransformationStrategies;
-using Spd.Utilities.Hosting;
-
-namespace Spd.Manager.Printing
-{
-    public class ServiceExtension : IConfigureComponentServices
-    {
-        public void ConfigureServices(ConfigurationServices configurationServices)
-        {
-            configurationServices.Services.AddTransient<IPrintingManager, PrintingManager>();
-            configurationServices.Services.AddScoped<IDocumentTransformationEngine, DocumentTransformationEngine>();
-            configurationServices.Services.AddScoped<IDocumentTransformStrategy, FingerprintLetterTransformStrategy>();
-            configurationServices.Services.AddScoped<IDocumentTransformStrategy, PersonalLicencePreviewTransformStrategy>();
-            configurationServices.Services.AddScoped<IDocumentTransformStrategy, PersonalLicencePrintingTransformStrategy>();
-        }
-    }
-}
+using Microsoft.Extensions.DependencyInjection;
+using Spd.Manager.Printing.Documents;
+using Spd.Manager.Printing.Documents.TransformationStrategies;
+using Spd.Utilities.Hosting;
+
+namespace Spd.Manager.Printing
+{
+    public class Configurer : IConfigureComponents
+    {
+        public void Configure(ConfigurationContext configurationServices)
+        {
+            configurationServices.Services.AddTransient<IPrintingManager, PrintingManager>();
+            configurationServices.Services.AddScoped<IDocumentTransformationEngine, DocumentTransformationEngine>();
+            configurationServices.Services.AddScoped<IDocumentTransformStrategy, FingerprintLetterTransformStrategy>();
+            configurationServices.Services.AddScoped<IDocumentTransformStrategy, PersonalLicencePreviewTransformStrategy>();
+            configurationServices.Services.AddScoped<IDocumentTransformStrategy, PersonalLicencePrintingTransformStrategy>();
+        }
+    }
+}

src/Spd.Manager.Screening/ServiceExtensions.cs → src/Spd.Manager.Screening/Configurer.cs

@@ -3,9 +3,9 @@
 
 namespace Spd.Manager.Screening;
 
-public class ServiceExtension : IConfigureComponentServices
+public class Configurer : IConfigureComponents
 {
-    public void ConfigureServices(ConfigurationServices configurationServices)
+    public void Configure(ConfigurationContext configurationServices)
     {
         configurationServices.Services.AddTransient<IApplicationManager, ApplicationManager>();
         configurationServices.Services.AddTransient<IOrgRegistrationManager, OrgRegistrationManager>();

src/Spd.Presentation.Dynamics/Program.cs

@@ -1,12 +1,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Serilog;
 using Spd.Presentation.Dynamics.Swagger;
-using Spd.Utilities.BCeIDWS;
-using Spd.Utilities.Dynamics;
-using Spd.Utilities.FileStorage;
 using Spd.Utilities.Hosting;
-using Spd.Utilities.Payment;
-using Spd.Utilities.Printing;
 using System.Security.Principal;
 using System.Text.Json.Serialization;
 
@@ -49,13 +44,6 @@
         builder.Services.AddDistributedMemoryCache();
     }
 
-    builder.Services
-        .AddFileStorageProxy(builder.Configuration)
-        .AddPaymentService(builder.Configuration)
-        .AddDynamicsProxy(builder.Configuration)
-        .AddPrinting(builder.Configuration);
-
-    builder.Services.ConfigureComponentServices(builder.Configuration, builder.Environment, assemblies);
     builder.Services.AddAuthentication(options =>
     {
         options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -76,11 +64,12 @@
     });
 
     builder.Services.AddHttpContextAccessor();
-    builder.Services.AddRequestDecompression().AddResponseCompression();
+    builder.Services.AddRequestDecompression().AddResponseCompression(opts => opts.EnableForHttps = true);
     builder.Services.AddTransient<IPrincipal>(provider => provider.GetService<IHttpContextAccessor>()?.HttpContext?.User);
-    builder.Services.AddBCeIDService(builder.Configuration);
     builder.Services.AddHealthChecks(builder.Configuration, assemblies);
 
+    builder.ConfigureComponents(assemblies, logger);
+
     var app = builder.Build();
 
     if (app.Environment.IsDevelopment())

src/Spd.Presentation.Licensing/Program.cs

@@ -3,14 +3,8 @@
 using Spd.Presentation.Licensing;
 using Spd.Presentation.Licensing.Services;
 using Spd.Presentation.Licensing.Swagger;
-using Spd.Utilities.Address;
-using Spd.Utilities.BCeIDWS;
-using Spd.Utilities.Dynamics;
-using Spd.Utilities.FileStorage;
 using Spd.Utilities.Hosting;
 using Spd.Utilities.LogonUser;
-using Spd.Utilities.Payment;
-using Spd.Utilities.Recaptcha;
 using System.Reflection;
 using System.Security.Principal;
 using System.Text.Json.Serialization;
@@ -45,7 +39,7 @@
     builder.Services.ConfigureAuthentication(builder.Configuration);
     builder.Services.ConfigureAuthorization();
     builder.Services.AddHttpContextAccessor();
-    builder.Services.AddRequestDecompression().AddResponseCompression();
+    builder.Services.AddRequestDecompression().AddResponseCompression(opts => opts.EnableForHttps = true);
     builder.Services.AddValidatorsFromAssemblies(assemblies);
     builder.Services.AddTransient<IPrincipal>(provider => provider.GetService<IHttpContextAccessor>()?.HttpContext?.User);
     builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
@@ -62,18 +56,11 @@
     }
 
     builder.Services.AddAutoMapper(assemblies);
-    builder.Services.AddFileStorageProxy(builder.Configuration);
     builder.Services.AddTransient<IMultipartRequestService, MultipartRequestService>();
-    builder.Services.AddFileStorageProxy(builder.Configuration);
-    builder.Services
-      .AddBCeIDService(builder.Configuration)
-      .AddGoogleRecaptcha(builder.Configuration)
-      .AddPaymentService(builder.Configuration)
-      .AddDynamicsProxy(builder.Configuration)
-      .AddAddressAutoComplete(builder.Configuration);
-    builder.Services.ConfigureComponentServices(builder.Configuration, builder.Environment, assemblies);
     builder.Services.AddHealthChecks();
 
+    builder.ConfigureComponents(assemblies, logger);
+
     var app = builder.Build();
 
     // Configure the HTTP request pipeline.

src/Spd.Presentation.Screening/Program.cs

@@ -2,14 +2,8 @@
 using Serilog;
 using Spd.Presentation.Screening;
 using Spd.Presentation.Screening.Swagger;
-using Spd.Utilities.Address;
-using Spd.Utilities.BCeIDWS;
-using Spd.Utilities.Dynamics;
-using Spd.Utilities.FileStorage;
 using Spd.Utilities.Hosting;
 using Spd.Utilities.LogonUser;
-using Spd.Utilities.Payment;
-using Spd.Utilities.Recaptcha;
 using System.Reflection;
 using System.Security.Principal;
 using System.Text.Json.Serialization;
@@ -45,12 +39,11 @@
     //    fv.ImplicitlyValidateChildProperties = true;
     //});
 
-    builder.Services.AddGoogleRecaptcha(builder.Configuration);
     builder.Services.AddValidatorsFromAssemblies(assemblies);
     builder.Services.ConfigureAuthentication(builder.Configuration);
     builder.Services.ConfigureAuthorization();
     builder.Services.AddHttpContextAccessor();
-    builder.Services.AddRequestDecompression().AddResponseCompression();
+    builder.Services.AddRequestDecompression().AddResponseCompression(opts => opts.EnableForHttps = true);
     builder.Services.AddTransient<IPrincipal>(provider => provider.GetService<IHttpContextAccessor>()?.HttpContext?.User);
     builder.Services.AddAutoMapper(assemblies);
     builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
@@ -66,16 +59,10 @@
         builder.Services.AddDistributedMemoryCache();
     }
 
-    builder.Services
-        .AddFileStorageProxy(builder.Configuration)
-        .AddBCeIDService(builder.Configuration)
-        .AddPaymentService(builder.Configuration)
-        .AddDynamicsProxy(builder.Configuration)
-        .AddAddressAutoComplete(builder.Configuration);
-
-    builder.Services.ConfigureComponentServices(builder.Configuration, builder.Environment, assemblies);
     builder.Services.AddHealthChecks(builder.Configuration, assemblies);
 
+    builder.ConfigureComponents(assemblies, logger);
+
     var app = builder.Build();
 
     // Configure the HTTP request pipeline.

src/Spd.Resource.Repository.IntegrationTest/IntegrationTestSetup.cs

@@ -1,6 +1,6 @@
-using System.Reflection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Spd.Resource.Repository.Address;
 using Spd.Resource.Repository.Alias;
 using Spd.Resource.Repository.Application;
@@ -16,7 +16,7 @@
 using Spd.Resource.Repository.PersonLicApplication;
 using Spd.Resource.Repository.PortalUser;
 using Spd.Resource.Repository.Tasks;
-using Spd.Utilities.Dynamics;
+using Spd.Utilities.Hosting;
 
 namespace Spd.Resource.Repository.IntegrationTest;
 
@@ -27,15 +27,7 @@ public class IntegrationTestSetup
     public IntegrationTestSetup()
     {
         string assembliesPrefix = "Spd";
-        Assembly[] assemblies = Directory.GetFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, "*.dll", SearchOption.TopDirectoryOnly)
-         .Where(assembly =>
-         {
-             var assemblyName = Path.GetFileName(assembly);
-             return !assemblyName.StartsWith("System.") && !assemblyName.StartsWith("Microsoft.") && (string.IsNullOrEmpty(assembliesPrefix) || assemblyName.StartsWith(assembliesPrefix));
-         })
-         .Select(assembly => Assembly.LoadFrom(assembly))
-         .ToArray();
-
+        var assemblies = ReflectionExtensions.DiscoverLocalAessemblies(prefix: "Spd.");
         var serviceCollection = new ServiceCollection();
 
         var configuration = new ConfigurationBuilder()
@@ -48,8 +40,9 @@ public IntegrationTestSetup()
             .AddEnvironmentVariables()
             .Build();
 
+        var loggerFactory = LoggerFactory.Create(builder => { });
+
         serviceCollection.AddSingleton<IConfiguration>(configuration);
-        serviceCollection.AddDynamicsProxy(configuration);
         serviceCollection.AddAutoMapper(assemblies);
         serviceCollection.AddDistributedMemoryCache();
         serviceCollection.AddDataProtection();
@@ -68,6 +61,7 @@ public IntegrationTestSetup()
         serviceCollection.AddTransient<IApplicationRepository, ApplicationRepository>();
         serviceCollection.AddTransient<ITaskRepository, TaskRepository>();
         serviceCollection.AddTransient<IControllingMemberCrcRepository, ControllingMemberCrcRepository>();
+        serviceCollection.ConfigureComponents(configuration, null, assemblies, loggerFactory);
         ServiceProvider = serviceCollection.BuildServiceProvider().CreateScope().ServiceProvider;
     }