AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
tekh 2025-11-03 08:44:22 +01:00
parent 209785dda5
commit 22b494a262
11 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EnvelopeGenerator.Application/DependencyInjection.cs
View File

@ -61,6 +61,9 @@ public static class DependencyInjection
// Add memory cache
services.AddMemoryCache();
// Register mail services
services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
return services;
}
}

2
EnvelopeGenerator.BBTests/frmFinalizePDF.vb
View File

@ -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)

2
EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
View File

@ -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)

63
EnvelopeGenerator.DependencyInjection/DependencyInjection.cs
View File

@ -1,11 +1,70 @@
using Microsoft.Extensions.DependencyInjection;
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)
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
}
}
}
}

7
EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj
View File

@ -7,7 +7,14 @@
</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>

2
EnvelopeGenerator.Finalizer/Program.cs
View File

@ -28,7 +28,7 @@ try
?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
#pragma warning disable CS0618 // Type or member is obsolete
builder.Services.AddEnvelopeGeneratorInfrastructureServices(
builder.Services.AddEGInfrastructureServices(
opt =>
{
opt.AddDbTriggerParams(config);

2
EnvelopeGenerator.GeneratorAPI/Program.cs
View File

@ -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) =>

8
EnvelopeGenerator.Infrastructure/DependencyInjection.cs
View File

@ -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;
}

2
EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs generated
View File

@ -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)")

2
EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs
View File

@ -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)")

9
EnvelopeGenerator.Web/Program.cs
View File

@ -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,11 +184,6 @@ 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.ConfigureBySection<CustomImages>();