Merge pull request #265 from baoduy/dev

public savechanges with handler

Author: baoduy

src/DKNet.FW.sln.DotSettings.user

@@ -588,12 +588,17 @@
     <Project Location="/Users/steven/_CODE/DRUNK/DKNet/src" Presentation="<SlimBus>" />
   </Or>
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=741f3bef_002D9e13_002D4160_002D8efd_002D6460b3b44d61/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &amp;lt;SlimBus&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=741f3bef_002D9e13_002D4160_002D8efd_002D6460b3b44d61/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from &amp;lt;SlimBus&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Project Location="/Users/steven/_CODE/DRUNK/DKNet/src" Presentation="&amp;lt;SlimBus&amp;gt;" /&gt;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=964034e5_002Dde7d_002D4983_002D9106_002D426b33d8b8f6/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &amp;lt;SlimBus&amp;gt;\&amp;lt;SlimBus.Extensions.Tests&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Project Location="/Users/steven/_CODE/DRUNK/DKNet/src/SlimBus/SlimBus.Extensions.Tests" Presentation="&amp;lt;SlimBus&amp;gt;\&amp;lt;SlimBus.Extensions.Tests&amp;gt;" /&gt;
 &lt;/SessionState&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=d48a29df_002D0ba6_002D4810_002D9bc0_002Dd5077a354521/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="SlimBusEfCoreSetupTests" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+  &lt;TestAncestor&gt;
+    &lt;TestId&gt;xUnit::BC6A92F4-BE7F-405F-87A1-43A73D3CCD29::net10.0::SlimBus.Extensions.Tests.SlimBusEfCoreSetupTests&lt;/TestId&gt;
+  &lt;/TestAncestor&gt;
+&lt;/SessionState&gt;</s:String>
 
 
 

src/SlimBus/DKNet.SlimBus.Extensions/Interceptors/EfAutoSavePostInterceptor.cs

@@ -1,6 +1,7 @@
 using DKNet.EfCore.Extensions.Extensions;
 using FluentResults;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SlimMessageBus;
 using SlimMessageBus.Host.Interceptor;
@@ -47,7 +48,8 @@ request is Fluents.Queries.IWitPageResponse<TResponse> ||
             return response;
         }
 
-        var exceptionHandler = serviceProvider.GetService(typeof(IEfCoreExceptionHandler)) as IEfCoreExceptionHandler;
+        //Global exception handling.
+        var exceptionHandler = serviceProvider.GetService<IEfCoreExceptionHandler>();
         var dbContexts = EfAutoSavePostProcessorRegistration.DbContextTypes
             .Select(serviceProvider.GetService).OfType<DbContext>().ToArray();
 
@@ -56,11 +58,15 @@ request is Fluents.Queries.IWitPageResponse<TResponse> ||
 
         foreach (var db in dbContexts.Where(db => db.ChangeTracker.HasChanges()))
         {
+            //Context level exception handling
+            var contextExceptionHandler =
+                serviceProvider.GetKeyedService<IEfCoreExceptionHandler>(db.GetType().FullName);
             var dbContextTypeName = db.GetType().Name;
             logger.LogDebug("DbContext {DbContextType} has changes. Saving...", dbContextTypeName);
 
             await db.AddNewEntitiesFromNavigations(context.CancellationToken).ConfigureAwait(false);
-            await db.SaveChangesWithConcurrencyHandlingAsync(exceptionHandler, context.CancellationToken)
+            await db.SaveChangesWithConcurrencyHandlingAsync(contextExceptionHandler ?? exceptionHandler,
+                    context.CancellationToken)
                 .ConfigureAwait(false);
 
             logger.LogDebug("DbContext {DbContextType} changes saved.", dbContextTypeName);

src/SlimBus/DKNet.SlimBus.Extensions/Interceptors/EfSaveChangesExtension.cs

@@ -2,7 +2,7 @@
 
 namespace DKNet.SlimBus.Extensions.Interceptors;
 
-internal static class EfSaveChangesExtension
+public static class EfSaveChangesExtension
 {
     #region Methods
 
@@ -37,4 +37,4 @@ public static async Task<int> SaveChangesWithConcurrencyHandlingAsync(
     }
 
     #endregion
-}
+}

src/SlimBus/DKNet.SlimBus.Extensions/SlimBusEfCoreSetup.cs

@@ -36,6 +36,18 @@ public IServiceCollection AddSlimBusEventPublisher<TDbContext>()
             return serviceCollection;
         }
 
+        /// <summary>
+        ///     Registers a custom EF Core exception handler for the specified <typeparamref name="TDbContext" />.
+        /// </summary>
+        /// <typeparam name="TDbContext"></typeparam>
+        /// <typeparam name="TExceptionHandler"></typeparam>
+        /// <returns></returns>
+        public IServiceCollection AddSlimBusEfCoreExceptionHandler<TDbContext, TExceptionHandler>()
+            where TDbContext : DbContext
+            where TExceptionHandler : class, IEfCoreExceptionHandler =>
+            serviceCollection.AddKeyedTransient<IEfCoreExceptionHandler, TExceptionHandler>(typeof(TDbContext)
+                .FullName);
+
         /// <summary>
         ///     Adds SlimMessageBus and EF Core integration services required for auto-saving the DbContext after
         ///     request handlers run. Registers the <see cref="EfAutoSavePostInterceptor{TRequest,TResponse}" />

src/SlimBus/SlimBus.Extensions.Tests/SlimBusEfCoreSetupTests.cs

@@ -0,0 +1,41 @@
+// <copyright file="SlimBusEfCoreSetupTests.cs" company="https://drunkcoding.net">
+// Copyright (c) 2025 Steven Hoang. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// </copyright>
+
+using DKNet.SlimBus.Extensions.Interceptors;
+
+namespace SlimBus.Extensions.Tests
+{
+    /// <summary>
+    ///     Unit tests for SlimBusEfCoreSetup extension methods.
+    /// </summary>
+    public class SlimBusEfCoreSetupTests
+    {
+        /// <summary>
+        ///     Verifies AddSlimBusEfCoreExceptionHandler registers the correct handler keyed by DbContext type.
+        /// </summary>
+        [Fact]
+        public void AddSlimBusEfCoreExceptionHandler_RegistersKeyedHandler_CanResolveByKey()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services.AddSlimBusEfCoreExceptionHandler<TestDbContext, TestExceptionHandler>();
+            var provider = services.BuildServiceProvider();
+            var key = typeof(TestDbContext).FullName;
+
+            // Act
+            var handler = provider.GetKeyedService<IEfCoreExceptionHandler>(key!);
+
+            // Assert
+            handler.ShouldNotBeNull();
+            handler.ShouldBeOfType<TestExceptionHandler>();
+        }
+
+        private class TestExceptionHandler : IEfCoreExceptionHandler
+        {
+            public Task<EfConcurrencyResolution> HandlingAsync(DbContext context, DbUpdateConcurrencyException exception, CancellationToken cancellationToken = default)
+                => Task.FromResult(EfConcurrencyResolution.IgnoreChanges);
+        }
+    }
+}