feat: add db context factory

Author: avolutions

src/Audit/AuditModule.cs

@@ -3,6 +3,7 @@
 using Avolutions.Baf.Core.Audit.Services;
 using Avolutions.Baf.Core.Module.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Avolutions.Baf.Core.Audit;
 
@@ -11,6 +12,6 @@ public class AuditModule : IFeatureModule
     public void Register(IServiceCollection services)
     {
         services.AddScoped(typeof(IAuditLogService<>), typeof(AuditLogService<>));
-        services.AddScoped<AuditSaveChangesInterceptor>();
+        services.TryAddSingleton<AuditSaveChangesInterceptor>();
     }
 }

src/Entity/EntityModule.cs

@@ -3,6 +3,7 @@
 using Avolutions.Baf.Core.Entity.Services;
 using Avolutions.Baf.Core.Module.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Avolutions.Baf.Core.Entity;
 
@@ -11,7 +12,7 @@ public class EntityModule : IFeatureModule
     public void Register(IServiceCollection services)
     {
         services.AddScoped(typeof(IEntityService<>), typeof(EntityService<>));
-        services.AddScoped<TrackableSaveChangesInterceptor>();
+        services.TryAddSingleton<TrackableSaveChangesInterceptor>();
         services.AddSingleton(typeof(IEntityRouteProvider<>), typeof(EntityRouteProvider<>));
     }
 }

src/Identity/Extensions/ServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using Avolutions.Baf.Core.Identity.Models;
 using Avolutions.Baf.Core.Identity.Services;
+using Avolutions.Baf.Core.Persistence;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;

src/Jobs/Infrastructure/JobService.cs

@@ -3,6 +3,7 @@
 using Avolutions.Baf.Core.Identity.Models;
 using Avolutions.Baf.Core.Jobs.Abstractions;
 using Avolutions.Baf.Core.Jobs.Models;
+using Avolutions.Baf.Core.Persistence;
 using Microsoft.EntityFrameworkCore;
 
 namespace Avolutions.Baf.Core.Jobs.Infrastructure;

src/Jobs/Infrastructure/JobWorker.cs

@@ -2,6 +2,7 @@
 using System.Threading.Channels;
 using Avolutions.Baf.Core.Jobs.Abstractions;
 using Avolutions.Baf.Core.Jobs.Models;
+using Avolutions.Baf.Core.Persistence;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 

src/Module/Extensions/ServiceCollectionExtensions.cs

@@ -3,6 +3,7 @@
 using Avolutions.Baf.Core.Entity.Interceptors;
 using Avolutions.Baf.Core.Lookups.Interceptors;
 using Avolutions.Baf.Core.Module.Abstractions;
+using Avolutions.Baf.Core.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -33,6 +34,15 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddBafCore<TContext>(this IServiceCollection services, params Assembly[] assemblies)
         where TContext : BafDbContext
     {
+        // Register a factory alias so framework services (e.g., EntityService<T>) can depend on
+        // IDbContextFactory<BafDbContext> without knowing the concrete context type.
+        // This is the factory equivalent of the scoped DbContext alias below.
+        services.TryAddScoped<IDbContextFactory<BafDbContext>>(sp =>
+            new BafDbContextFactoryWrapper<TContext>(sp.GetRequiredService<IDbContextFactory<TContext>>()));
+
+        // Keep scoped aliases for backward compatibility.
+        // AddDbContextFactory already registers TContext as scoped, so API controllers
+        // and other non-Blazor code that injects DbContext/BafDbContext directly still works.
         services.TryAddScoped<DbContext>(sp => sp.GetRequiredService<TContext>());
         services.TryAddScoped<BafDbContext>(sp => sp.GetRequiredService<TContext>());
 
@@ -48,7 +58,7 @@ public static IServiceCollection AddBafCore<TContext>(this IServiceCollection se
         services.AddSingleton(new BafRegistry(modules, moduleAssemblies));
 
         // Add database context interceptors
-        services.AddDbContext<TContext>((sp, options) =>
+        services.AddDbContextFactory<TContext>((sp, options) =>
         {
             options.AddInterceptors(
                 sp.GetRequiredService<AuditSaveChangesInterceptor>(),

src/NumberSequences/Services/NumberSequenceService.cs

@@ -1,4 +1,5 @@
 using Avolutions.Baf.Core.NumberSequences.Models;
+using Avolutions.Baf.Core.Persistence;
 using Microsoft.EntityFrameworkCore;
 
 namespace Avolutions.Baf.Core.NumberSequences.Services;

src/BafDbContext.cs src/Persistence/BafDbContext.cssrc/BafDbContext.cs renamed to src/Persistence/BafDbContext.cs

@@ -9,7 +9,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace Avolutions.Baf.Core;
+namespace Avolutions.Baf.Core.Persistence;
 
 /// <summary>
 /// Base DbContext for the BAF framework.

src/Persistence/BafDbContextFactoryWrapper.cs

@@ -0,0 +1,19 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Avolutions.Baf.Core.Persistence;
+
+internal class BafDbContextFactoryWrapper<TContext> : IDbContextFactory<BafDbContext>
+    where TContext : BafDbContext
+{
+    private readonly IDbContextFactory<TContext> _inner;
+
+    public BafDbContextFactoryWrapper(IDbContextFactory<TContext> inner)
+    {
+        _inner = inner;
+    }
+
+    public BafDbContext CreateDbContext()
+    {
+        return _inner.CreateDbContext();
+    }
+}

src/Settings/Infrastructure/SettingsStore.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Reflection;
 using System.Text.Json;
+using Avolutions.Baf.Core.Persistence;
 using Avolutions.Baf.Core.Settings.Abstractions;
 using Avolutions.Baf.Core.Settings.Attributes;
 using Avolutions.Baf.Core.Settings.Models;