minor tweaks to multi-tenancy EF Core transaction usage

jeremydmiller · jeremydmiller · commit a0ffc3e74022 · 2026-01-19T06:53:45.000-06:00
diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Codegen/EFCorePersistenceFrameProvider.cs b/src/Persistence/Wolverine.EntityFrameworkCore/Codegen/EFCorePersistenceFrameProvider.cs
@@ -133,7 +133,7 @@ public void ApplyTransactionSupport(IChain chain, IServiceContainer container)
             var createContext = typeof(CreateTenantedDbContext<>).CloseAndBuildAs<Frame>(dbContextType);
 
             chain.Middleware.Insert(0, createContext);
-            chain.Middleware.Insert(0, new EnrollTenantedDbContextInTransaction(dbContextType, chain.Idempotency));
+            chain.Middleware.Insert(0, new StartDatabaseTransactionForDbContext(dbContextType, chain.Idempotency));
         }
         else
         {
@@ -173,7 +173,7 @@ public void ApplyTransactionSupport(IChain chain, IServiceContainer container, T
         {
             var createContext = typeof(CreateTenantedDbContext<>).CloseAndBuildAs<Frame>(dbType);
             chain.Middleware.Insert(0, createContext);
-            chain.Middleware.Insert(0, new EnrollTenantedDbContextInTransaction(dbType, chain.Idempotency));
+            chain.Middleware.Insert(0, new StartDatabaseTransactionForDbContext(dbType, chain.Idempotency));
         }
         else
         {
diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Codegen/StartDatabaseTransactionForDbContext.cs b/src/Persistence/Wolverine.EntityFrameworkCore/Codegen/StartDatabaseTransactionForDbContext.cs
@@ -9,7 +9,7 @@
 
 namespace Wolverine.EntityFrameworkCore.Codegen;
 
-internal class EnrollTenantedDbContextInTransaction : AsyncFrame
+internal class StartDatabaseTransactionForDbContext : AsyncFrame
 {
     private readonly Type _dbContextType;
     private readonly IdempotencyStyle _idempotencyStyle;
@@ -18,7 +18,7 @@ internal class EnrollTenantedDbContextInTransaction : AsyncFrame
     private Variable _cancellation;
     private Variable? _context;
 
-    public EnrollTenantedDbContextInTransaction(Type dbContextType, IdempotencyStyle idempotencyStyle)
+    public StartDatabaseTransactionForDbContext(Type dbContextType, IdempotencyStyle idempotencyStyle)
     {
         _dbContextType = dbContextType;
         _idempotencyStyle = idempotencyStyle;
@@ -31,19 +31,25 @@ public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
         // EF Core can only do eager idempotent checks
         if (_idempotencyStyle == IdempotencyStyle.Eager || _idempotencyStyle == IdempotencyStyle.Optimistic)
         {
-            writer.Write($"await {_context.Usage}.{nameof(MessageContext.AssertEagerIdempotencyAsync)}({_cancellation.Usage});");
+            writer.Write($"await {_context.Usage}.{nameof(MessageContext.AssertEagerIdempotencyAsync)}({_cancellation.Usage}).ConfigureAwait(false);");
         }
 
         writer.Write($"BLOCK:if ({_dbContext.Usage}.Database.CurrentTransaction == null)");
-        writer.Write($"await {_dbContext.Usage}.Database.BeginTransactionAsync({_cancellation.Usage});");
+        writer.Write($"await {_dbContext.Usage}.Database.BeginTransactionAsync({_cancellation.Usage}).ConfigureAwait(false);");
         writer.FinishBlock();
+        
+        // EF Core can only do eager idempotent checks
+        if (_idempotencyStyle == IdempotencyStyle.Eager || _idempotencyStyle == IdempotencyStyle.Optimistic)
+        {
+            writer.Write($"await {_context.Usage}.{nameof(MessageContext.AssertEagerIdempotencyAsync)}({_cancellation.Usage}).ConfigureAwait(false);");
+        }
 
         Next?.GenerateCode(method, writer);
 
-        writer.Write($"await {_dbContext.Usage}.Database.CommitTransactionAsync({_cancellation.Usage});");
+        writer.Write($"await {_dbContext.Usage}.Database.CommitTransactionAsync({_cancellation.Usage}).ConfigureAwait(false);");
         writer.FinishBlock();
         writer.Write($"BLOCK:catch ({typeof(Exception).FullNameInCode()})");
-        writer.Write($"await {_dbContext.Usage}.Database.RollbackTransactionAsync({_cancellation.Usage});");
+        writer.Write($"await {_dbContext.Usage}.Database.RollbackTransactionAsync({_cancellation.Usage}).ConfigureAwait(false);");
         writer.Write("throw;");
         writer.FinishBlock();
     }
diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Internals/TenantedDbContextBuilderByConnectionString.cs b/src/Persistence/Wolverine.EntityFrameworkCore/Internals/TenantedDbContextBuilderByConnectionString.cs
@@ -24,13 +24,16 @@ public class TenantedDbContextBuilderByConnectionString<T> : IDbContextBuilder<T
     private readonly IServiceProvider _serviceProvider;
     private readonly MultiTenantedMessageStore _store;
     private ImHashMap<string, string> _connectionStrings = ImHashMap<string, string>.Empty;
+    private readonly IDomainEventScraper[] _domainScrapers;
 
     // Going to assume that it's wolverine enabled here!
     public TenantedDbContextBuilderByConnectionString(IServiceProvider serviceProvider, MultiTenantedMessageStore store,
-        Action<DbContextOptionsBuilder<T>, ConnectionString, TenantId> configuration)
+        Action<DbContextOptionsBuilder<T>, ConnectionString, TenantId> configuration,
+        IEnumerable<IDomainEventScraper> domainScrapers)
     {
         _serviceProvider = serviceProvider;
         _store = store;
+        _domainScrapers = domainScrapers.ToArray();
 
         _configuration = configuration;
         var optionsType = typeof(DbContextOptions<T>);
@@ -64,7 +67,7 @@ public async ValueTask<T> BuildAndEnrollAsync(MessageContext messaging, Cancella
         _configuration(builder, new ConnectionString(connectionString), new TenantId(messaging.TenantId));
         var dbContext = _constructor(builder.Options);
 
-        var transaction = new EfCoreEnvelopeTransaction(dbContext, messaging);
+        var transaction = new EfCoreEnvelopeTransaction(dbContext, messaging, _domainScrapers);
 
         await messaging.EnlistInOutboxAsync(transaction);
 
diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Internals/TenantedDbContextBuilderByDbDataSource.cs b/src/Persistence/Wolverine.EntityFrameworkCore/Internals/TenantedDbContextBuilderByDbDataSource.cs
@@ -18,6 +18,7 @@ namespace Wolverine.EntityFrameworkCore.Internals;
 public class TenantedDbContextBuilderByDbDataSource<T> : IDbContextBuilder<T> where T : DbContext
 {
     private readonly Action<DbContextOptionsBuilder<T>, DbDataSource, TenantId> _configuration;
+    private readonly IDomainEventScraper[] _domainScrapers;
 
     private readonly Func<DbContextOptions<T>, T> _constructor;
 
@@ -27,12 +28,14 @@ public class TenantedDbContextBuilderByDbDataSource<T> : IDbContextBuilder<T> wh
 
     // Going to assume that it's wolverine enabled here!
     public TenantedDbContextBuilderByDbDataSource(IServiceProvider serviceProvider, MultiTenantedMessageStore store,
-        Action<DbContextOptionsBuilder<T>, DbDataSource, TenantId> configuration)
+        Action<DbContextOptionsBuilder<T>, DbDataSource, TenantId> configuration,
+        IEnumerable<IDomainEventScraper> domainScrapers)
     {
         _serviceProvider = serviceProvider;
         _store = store;
         
         _configuration = configuration;
+        _domainScrapers = domainScrapers.ToArray();
         var optionsType = typeof(DbContextOptions<T>);
         var ctor = typeof(T).GetConstructors().FirstOrDefault(x =>
             x.GetParameters().Length == 1 && x.GetParameters()[0].ParameterType == optionsType);
@@ -66,7 +69,7 @@ public async ValueTask<T> BuildAndEnrollAsync(MessageContext messaging, Cancella
         
         var dbContext = _constructor(builder.Options);
 
-        var transaction = new EfCoreEnvelopeTransaction(dbContext, messaging);
+        var transaction = new EfCoreEnvelopeTransaction(dbContext, messaging, _domainScrapers);
         await messaging.EnlistInOutboxAsync(transaction);
 
         return dbContext;
diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/WolverineEntityCoreExtensions.cs b/src/Persistence/Wolverine.EntityFrameworkCore/WolverineEntityCoreExtensions.cs
@@ -82,7 +82,7 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancy<T>
                     $"Configured multi-tenanted usage of {typeof(T).FullNameInCode()} requires multi-tenanted Wolverine database storage");
             }
 
-            return new TenantedDbContextBuilderByConnectionString<T>(s, tenanted, dbContextConfiguration);
+            return new TenantedDbContextBuilderByConnectionString<T>(s, tenanted, dbContextConfiguration, s.GetServices<IDomainEventScraper>());
         });
 
         services.AddSingleton<IDbContextBuilder>(s => s.GetRequiredService<IDbContextBuilder<T>>());
@@ -92,10 +92,6 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancy<T>
             services.AddSingleton<IResourceCreator, TenantedDbContextInitializer<T>>();
         }
 
-        // TODO -- need a multi-tenanted version of this
-        // services.TryAddScoped(typeof(IDbContextOutbox<>), typeof(DbContextOutbox<>));
-        // services.TryAddScoped<IDbContextOutbox, DbContextOutbox>();
-
         return services;
     }
     
@@ -140,7 +136,7 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancyByD
                     $"Configured multi-tenanted usage of {typeof(T).FullNameInCode()} requires multi-tenanted Wolverine database storage");
             }
 
-            return new TenantedDbContextBuilderByDbDataSource<T>(s, tenanted, dbContextConfiguration);
+            return new TenantedDbContextBuilderByDbDataSource<T>(s, tenanted, dbContextConfiguration, s.GetServices<IDomainEventScraper>());
         });
 
         services.AddSingleton<IDbContextBuilder>(s => s.GetRequiredService<IDbContextBuilder<T>>());

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void ApplyTransactionSupport(IChain chain, IServiceContainer container)`
`133`	`133`	`var createContext = typeof(CreateTenantedDbContext<>).CloseAndBuildAs<Frame>(dbContextType);`
`134`	`134`
`135`	`135`	`chain.Middleware.Insert(0, createContext);`
`136`		`- chain.Middleware.Insert(0, new EnrollTenantedDbContextInTransaction(dbContextType, chain.Idempotency));`
	`136`	`+ chain.Middleware.Insert(0, new StartDatabaseTransactionForDbContext(dbContextType, chain.Idempotency));`
`137`	`137`	`}`
`138`	`138`	`else`
`139`	`139`	`{`
`@@ -173,7 +173,7 @@ public void ApplyTransactionSupport(IChain chain, IServiceContainer container, T`
`173`	`173`	`{`
`174`	`174`	`var createContext = typeof(CreateTenantedDbContext<>).CloseAndBuildAs<Frame>(dbType);`
`175`	`175`	`chain.Middleware.Insert(0, createContext);`
`176`		`- chain.Middleware.Insert(0, new EnrollTenantedDbContextInTransaction(dbType, chain.Idempotency));`
	`176`	`+ chain.Middleware.Insert(0, new StartDatabaseTransactionForDbContext(dbType, chain.Idempotency));`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancy<T>`
`82`	`82`	`$"Configured multi-tenanted usage of {typeof(T).FullNameInCode()} requires multi-tenanted Wolverine database storage");`
`83`	`83`	`}`
`84`	`84`
`85`		`- return new TenantedDbContextBuilderByConnectionString<T>(s, tenanted, dbContextConfiguration);`
	`85`	`+ return new TenantedDbContextBuilderByConnectionString<T>(s, tenanted, dbContextConfiguration, s.GetServices<IDomainEventScraper>());`
`86`	`86`	`});`
`87`	`87`
`88`	`88`	`services.AddSingleton<IDbContextBuilder>(s => s.GetRequiredService<IDbContextBuilder<T>>());`
`@@ -92,10 +92,6 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancy<T>`
`92`	`92`	`services.AddSingleton<IResourceCreator, TenantedDbContextInitializer<T>>();`
`93`	`93`	`}`
`94`	`94`
`95`		`- // TODO -- need a multi-tenanted version of this`
`96`		`- // services.TryAddScoped(typeof(IDbContextOutbox<>), typeof(DbContextOutbox<>));`
`97`		`- // services.TryAddScoped<IDbContextOutbox, DbContextOutbox>();`
`98`		`-`
`99`	`95`	`return services;`
`100`	`96`	`}`
`101`	`97`
`@@ -140,7 +136,7 @@ public static IServiceCollection AddDbContextWithWolverineManagedMultiTenancyByD`
`140`	`136`	`$"Configured multi-tenanted usage of {typeof(T).FullNameInCode()} requires multi-tenanted Wolverine database storage");`
`141`	`137`	`}`
`142`	`138`
`143`		`- return new TenantedDbContextBuilderByDbDataSource<T>(s, tenanted, dbContextConfiguration);`
	`139`	`+ return new TenantedDbContextBuilderByDbDataSource<T>(s, tenanted, dbContextConfiguration, s.GetServices<IDomainEventScraper>());`
`144`	`140`	`});`
`145`	`141`
`146`	`142`	`services.AddSingleton<IDbContextBuilder>(s => s.GetRequiredService<IDbContextBuilder<T>>());`