From 82d4b7ec6a4f60c47c4b50e428faa6ed65d7f924 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Wed, 1 Oct 2025 13:25:52 +0200
Subject: [PATCH] feat(infrastructure): refactor DIExtensions for DbContext
 registration

* Removed `dbContextOptions` parameter from `AddEnvelopeGeneratorInfrastructureServices`
* Moved `AddDbContext` registration into `Config` class with overloads for both `Action<DbContextOptionsBuilder>` and `Action<IServiceProvider, DbContextOptionsBuilder>`
* Simplified service registration flow and improved extensibility
---
 EnvelopeGenerator.GeneratorAPI/Program.cs     | 14 ++++++++++++-
 .../DependencyExtensions.cs                   | 21 ++++++++++---------
 EnvelopeGenerator.Web/Program.cs              | 17 ++++++++-------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs
index ecb7abf3..51953c7b 100644
--- a/EnvelopeGenerator.GeneratorAPI/Program.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Program.cs
@@ -185,7 +185,19 @@ try
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
-        .AddEnvelopeGeneratorInfrastructureServices(sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
+        .AddEnvelopeGeneratorInfrastructureServices(opt =>
+        {
+            opt.ConfigureDbTriggerParams(config);
+            opt.AddDbContext((provider, options) =>
+            {
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+                options.UseSqlServer(connStr)
+                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                        .EnableSensitiveDataLogging()
+                        .EnableDetailedErrors();
+            });
+        },
+        sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
         .AddEnvelopeGeneratorServices(config);
 #pragma warning restore CS0618 // Type or member is obsolete
 
diff --git a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
index c25bc014..66e8f9b0 100644
--- a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
+++ b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
@@ -39,12 +39,7 @@ namespace EnvelopeGenerator.Infrastructure
         /// </remarks>
         [Obsolete("Use IRepository")]
         public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services,
-            Action<Config> options,
-            Action<IServiceProvider, DbContextOptionsBuilder>
-#if NET
-            ?
-#endif
-            dbContextOptions = null
+            Action<Config> options
 #if NET
             , IConfiguration? sqlExecutorConfiguration = null,
             Action<SQLExecutorParams>? sqlExecutorConfigureOptions = null
@@ -53,10 +48,6 @@ namespace EnvelopeGenerator.Infrastructure
         {
             // configure custom options
             options(new Config(services));
-
-            if (dbContextOptions != null)
-                services.AddDbContext<EGDbContext>(dbContextOptions);
-
 #if NET
             services.TryAddScoped<IConfigRepository, ConfigRepository>();
             services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
@@ -197,6 +188,16 @@ namespace EnvelopeGenerator.Infrastructure
             {
                 _services.Configure(configureOptions);
             }
+
+            public void AddDbContext(Action<DbContextOptionsBuilder> dbContextOptions)
+            {
+                _services.AddDbContext<EGDbContext>(dbContextOptions);
+            }
+
+            public void AddDbContext(Action<IServiceProvider, DbContextOptionsBuilder> dbContextOptions)
+            {
+                _services.AddDbContext<EGDbContext>(dbContextOptions);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index 7904c7ea..1b91ea6f 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -104,14 +104,17 @@ try
     // Add envelope generator services
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services.AddEnvelopeGeneratorInfrastructureServices(
-        opt => opt.ConfigureDbTriggerParams(config),
-        (provider, options) =>
+        opt =>
         {
-            var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-            options.UseSqlServer(connStr)
-                    .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
-                    .EnableSensitiveDataLogging()
-                    .EnableDetailedErrors();
+            opt.ConfigureDbTriggerParams(config);
+            opt.AddDbContext((provider, options) =>
+            {
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+                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