refactor(di): unify Application and Infrastructure DI registrations under a central method

- Added central AddEnvelopeGenerator extension to aggregate existing DI setups
- Introduced EGConfiguration for modular service registration
- Standardized configuration pattern for Application and Infrastructure layers
- Simplified distributed cache and localization registration

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -58,6 +58,12 @@ public static class DependencyInjection
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
         });
 
+        // Add memory cache
+        services.AddMemoryCache();
+
+        // Register mail services
+        services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
+
         return services;
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -25,19 +25,23 @@
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
 		<PackageReference Include="UserManager" Version="1.1.3" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -32,7 +32,7 @@ Public Class frmFinalizePDF
 #Disable Warning BC40000 ' Type or member is obsolete
         Factory.Shared _
             .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
-            .AddEnvelopeGeneratorInfrastructureServices(
+            .AddEGInfrastructureServices(
                 Sub(opt)
                     opt.AddDbTriggerParams(
                         Sub(triggers)

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -72,7 +72,7 @@ Namespace Jobs
 #Disable Warning BC40000 ' Type or member is obsolete
                 Factory.Shared _
                 .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
-                .AddEnvelopeGeneratorInfrastructureServices(
+                .AddEGInfrastructureServices(
                 Sub(opt)
                     opt.AddDbTriggerParams(
                         Sub(triggers)

EnvelopeGenerator.DependencyInjection/DependencyInjection.cs

@@ -0,0 +1,70 @@
+using DigitalData.EmailProfilerDispatcher;
+using DigitalData.UserManager.DependencyInjection;
+using EnvelopeGenerator.Application;
+using EnvelopeGenerator.Infrastructure;
+using Microsoft.Extensions.Caching.SqlServer;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using static EnvelopeGenerator.Infrastructure.DependencyInjection;
+
+namespace EnvelopeGenerator.DependencyInjection;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config, Action<EGConfiguration> options, Action<SqlServerCacheOptions> distributedCacheOptions)
+    {
+        var egConfig = new EGConfiguration();
+        options.Invoke(egConfig);
+        egConfig.RegisterAll(services);
+
+        // Add envelope generator services
+#pragma warning disable CS0618
+        services.AddUserManager<EGDbContext>();
+#pragma warning restore CS0618
+
+        services.AddDispatcher<EGDbContext>();
+
+        return services;
+    }
+
+    public record EGConfiguration
+    {
+        internal readonly Queue<Action<IServiceCollection>> ServiceRegs = new();
+
+        internal void RegisterAll(IServiceCollection services)
+        {
+            while (ServiceRegs.Count > 0)
+                ServiceRegs.Dequeue().Invoke(services);
+        }
+
+        public EGConfiguration AddLocalization()
+        {
+            ServiceRegs.Enqueue(s => s.AddLocalization());
+            return this;
+        }
+
+        public EGConfiguration AddDistributedSqlServerCache(Action<SqlServerCacheOptions> setupAction)
+        {
+            ServiceRegs.Enqueue(s => s.AddDistributedSqlServerCache(setupAction));
+            return this;
+        }
+
+        public EGConfiguration AddInfrastructure(Action<EGInfrastructureConfiguration> options)
+        {
+#pragma warning disable CS0618
+            ServiceRegs.Enqueue(s => s.AddEGInfrastructureServices(options));
+#pragma warning restore CS0618
+            return this;
+        }
+
+        public IConfiguration Configuration
+        {
+            set
+            {
+#pragma warning disable CS0618
+                ServiceRegs.Enqueue(s => s.AddEnvelopeGeneratorServices(value));
+#pragma warning restore CS0618
+            }
+        }
+    }
+}

EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj

@@ -10,6 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Finalizer/Program.cs

@@ -2,36 +2,62 @@ using EnvelopeGenerator.Application;
 using EnvelopeGenerator.Finalizer;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.EntityFrameworkCore;
+using Serilog;
 
-var builder = Host.CreateApplicationBuilder(args);
+// Load Serilog from appsettings.json
-var config = builder.Configuration;
+Log.Logger = new LoggerConfiguration()
-builder.Services.AddHostedService<Worker>();
+    .ReadFrom.Configuration(new ConfigurationBuilder()
+        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+        .Build())
+        .CreateLogger();
 
-#region Add DB Context, EG Inf. and Services
+try
-var cnnStrName = "Default";
+{
-var connStr = config.GetConnectionString(cnnStrName)
+    var builder = Host.CreateApplicationBuilder(args);
-    ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
 
-#pragma warning disable CS0618 // Type or member is obsolete
+    // add serilog
-builder.Services.AddEnvelopeGeneratorInfrastructureServices(
+    builder.Logging.ClearProviders();
-    opt =>
+    builder.Logging.AddSerilog();
-    {
+
-        opt.AddDbTriggerParams(config);
+    var config = builder.Configuration;
-        opt.AddDbContext((provider, options) =>
+    builder.Services.AddHostedService<Worker>();
+
+    #region Add DB Context, EG Inf. and Services
+    var cnnStrName = "Default";
+    var connStr = config.GetConnectionString(cnnStrName)
+        ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
+
+    #pragma warning disable CS0618 // Type or member is obsolete
+    builder.Services.AddEGInfrastructureServices(
+        opt =>
         {
-            var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+            opt.AddDbTriggerParams(config);
-            options.UseSqlServer(connStr)
+            opt.AddDbContext((provider, options) =>
-                    .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+            {
-                    .EnableSensitiveDataLogging()
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-                    .EnableDetailedErrors();
+                options.UseSqlServer(connStr)
+                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                        .EnableSensitiveDataLogging()
+                        .EnableDetailedErrors();
+            });
         });
-    });
+    #pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning restore CS0618 // Type or member is obsolete
 
-#pragma warning disable CS0618 // Type or member is obsolete
+    #pragma warning disable CS0618 // Type or member is obsolete
-builder.Services.AddEnvelopeGeneratorServices(config);
+    builder.Services.AddEnvelopeGeneratorServices(config);
-#pragma warning restore CS0618 // Type or member is obsolete
+    #pragma warning restore CS0618 // Type or member is obsolete
-#endregion  Add DB Context, EG Inf. and Services
+    #endregion  Add DB Context, EG Inf. and Services
 
-var host = builder.Build();
+    var host = builder.Build();
-host.Run();
+    host.Run();
+
+    Log.Information("The worker was stopped.");
+}
+catch(Exception ex)
+{
+    Log.Fatal(ex, "Worker could not be started!");
+}
+finally
+{
+    Log.CloseAndFlush();
+}

EnvelopeGenerator.Finalizer/appsettings.json

@@ -4,5 +4,37 @@
       "Default": "Information",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "ConnectionStrings": {
+    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
+    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
+  },
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log-.txt",
+          "rollingInterval": "Day",
+          "retainedFileCountLimit": 7,
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
   }
-}
+}

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -185,7 +185,7 @@ try
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
-        .AddEnvelopeGeneratorInfrastructureServices(opt =>
+        .AddEGInfrastructureServices(opt =>
         {
             opt.AddDbTriggerParams(config);
             opt.AddDbContext((provider, options) =>

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

@@ -38,10 +38,10 @@ namespace EnvelopeGenerator.Infrastructure
         /// will be created per HTTP request (or per scope) within the dependency injection container.
         /// </remarks>
         [Obsolete("Use IRepository")]
-        public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services, Action<Config> options)
+        public static IServiceCollection AddEGInfrastructureServices(this IServiceCollection services, Action<EGInfrastructureConfiguration> options)
         {
             // configure custom options
-            options(new Config(services));
+            options(new EGInfrastructureConfiguration(services));
 #if NET
             services.TryAddScoped<IConfigRepository, ConfigRepository>();
             services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
@@ -160,11 +160,11 @@ namespace EnvelopeGenerator.Infrastructure
         }
 #endif
 
-        public class Config
+        public class EGInfrastructureConfiguration
         {
             private readonly IServiceCollection _services;
 
-            internal Config(IServiceCollection services)
+            internal EGInfrastructureConfiguration(IServiceCollection services)
             {
                 _services = services;
             }

EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs

@@ -525,7 +525,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                 });
             });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Config", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EGInfrastructureConfiguration", b =>
             {
                 b.Property<string>("ExportPath")
                     .HasColumnType("nvarchar(256)")

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

@@ -522,7 +522,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                 });
             });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Config", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EGInfrastructureConfiguration", b =>
             {
                 b.Property<string>("ExportPath")
                     .HasColumnType("nvarchar(256)")

EnvelopeGenerator.Web/Program.cs

@@ -1,4 +1,3 @@
-using EnvelopeGenerator.Application.Services;
 using Microsoft.EntityFrameworkCore;
 using NLog;
 using Quartz;
@@ -16,7 +15,6 @@ using EnvelopeGenerator.Web.Sanitizers;
 using EnvelopeGenerator.Web.Models.Annotation;
 using DigitalData.UserManager.DependencyInjection;
 using EnvelopeGenerator.Web.Middleware;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
@@ -103,7 +101,7 @@ try
 
     // Add envelope generator services
 #pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddEnvelopeGeneratorInfrastructureServices(
+    builder.Services.AddEGInfrastructureServices(
         opt =>
         {
             opt.AddDbTriggerParams(config);
@@ -186,15 +184,8 @@ try
     builder.Services.Configure<Cultures>(config.GetSection("Cultures"));
     builder.Services.AddSingleton(sp => sp.GetRequiredService<IOptions<Cultures>>().Value);
 
-    // Register mail services
-#pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
-#pragma warning restore CS0618 // Type or member is obsolete
-
     builder.Services.AddDispatcher<EGDbContext>();
 
-    builder.Services.AddMemoryCache();
-
     builder.ConfigureBySection<CustomImages>();
 
     builder.ConfigureBySection<AnnotationParams>();

EnvelopeGenerator.sln

@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.PdfEditor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer", "EnvelopeGenerator.Finalizer\EnvelopeGenerator.Finalizer.csproj", "{49E6A4C0-C2FC-4A34-9821-245AF050CA26}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.DependencyInjection", "EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj", "{B97DE7DD-3190-4A84-85E9-E57AD735BE61}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +99,10 @@ Global
 		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,6 +124,7 @@ Global
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{49E6A4C0-C2FC-4A34-9821-245AF050CA26} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
+		{B97DE7DD-3190-4A84-85E9-E57AD735BE61} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}