fix(EntityFramework): Fix the problem that Creator and Modifier cannot be assigned values

Author: zhenlei520

src/Data/Masa.Contrib.Data.Contracts.EF/DataFiltering/SoftDeleteSaveChangesFilter.cs

@@ -7,6 +7,7 @@ public class SoftDeleteSaveChangesFilter<TDbContext, TUserId> : ISaveChangesFilt
     where TDbContext : DbContext
     where TUserId : IComparable
 {
+    private readonly Type _userIdType;
     private readonly IUserContext? _userContext;
     private readonly TDbContext _context;
     private readonly MasaDbContextOptions<TDbContext> _masaDbContextOptions;
@@ -16,6 +17,7 @@ public SoftDeleteSaveChangesFilter(
         TDbContext dbContext,
         IUserContext? userContext = null)
     {
+        _userIdType = typeof(TUserId);
         _masaDbContextOptions = masaDbContextOptions;
         _context = dbContext;
         _userContext = userContext;
@@ -38,7 +40,7 @@ public void OnExecuting(ChangeTracker changeTracker)
             if (_userContext != null && entity.Entity is IAuditEntity<TUserId> &&
                 entity.CurrentValues[nameof(IAuditEntity<TUserId>.Modifier)] != default)
             {
-                var userId = _userContext.UserId;
+                var userId = GetUserId(_userContext.UserId);
                 if (userId != null) entity.CurrentValues[nameof(IAuditEntity<TUserId>.Modifier)] = userId;
 
                 entity.CurrentValues[nameof(IAuditEntity<TUserId>.ModificationTime)] =
@@ -77,4 +79,16 @@ protected virtual void HandleDependent(object dependentEntry)
         if (entityEntry.Entity is ISoftDelete)
             entityEntry.CurrentValues[nameof(ISoftDelete.IsDeleted)] = true;
     }
+
+    private object? GetUserId(string? userId)
+    {
+        if (userId == null)
+            return null;
+
+        if (_userIdType == typeof(Guid))
+        {
+            return Guid.Parse(userId);
+        }
+        return Convert.ChangeType(userId, _userIdType);
+    }
 }

src/Data/Masa.Contrib.Data.EntityFrameworkCore/Filters/SaveChangeFilter.cs

@@ -6,10 +6,12 @@ namespace Masa.Contrib.Data.EntityFrameworkCore.Filters;
 public class SaveChangeFilter<TDbContext, TUserId> : ISaveChangesFilter
     where TDbContext : DbContext
 {
+    private readonly Type _userIdType;
     private readonly IUserContext? _userContext;
 
     public SaveChangeFilter(IUserContext? userContext = null)
     {
+        _userIdType = typeof(TUserId);
         _userContext = userContext;
     }
 
@@ -21,7 +23,7 @@ public void OnExecuting(ChangeTracker changeTracker)
                      .Where(entry => entry.Entity is IAuditEntity<TUserId> &&
                          (entry.State == EntityState.Added || entry.State == EntityState.Modified)))
         {
-            var userId = _userContext?.UserId;
+            var userId = GetUserId(_userContext?.UserId);
             if (entity.State == EntityState.Added)
             {
                 if (userId != null)
@@ -40,4 +42,16 @@ public void OnExecuting(ChangeTracker changeTracker)
                 DateTime.UtcNow; //The current time to change to localization after waiting for localization
         }
     }
+
+    private object? GetUserId(string? userId)
+    {
+        if (userId == null)
+            return null;
+
+        if (_userIdType == typeof(Guid))
+        {
+            return Guid.Parse(userId);
+        }
+        return Convert.ChangeType(userId, _userIdType);
+    }
 }

src/Data/Masa.Contrib.Data.EntityFrameworkCore/ServiceCollectionExtensions.cs

@@ -67,7 +67,7 @@ private static IServiceCollection AddCoreServices<TDbContextImplementation, TUse
                 serviceProvider => serviceProvider.GetRequiredService<MasaDbContextOptions<TDbContextImplementation>>(),
                 optionsLifetime));
 
-        services.TryAdd(new ServiceDescriptor(typeof(ISaveChangesFilter), typeof(SaveChangeFilter<TDbContextImplementation, TUserId>), ServiceLifetime.Scoped));
+        services.TryAddEnumerable(new ServiceDescriptor(typeof(ISaveChangesFilter), typeof(SaveChangeFilter<TDbContextImplementation, TUserId>), ServiceLifetime.Scoped));
         return services;
     }
 

test/Masa.Contrib.Data.EntityFrameworkCore.Tests/DbContextTest.cs

@@ -138,6 +138,32 @@ public async Task TestDisabledSoftDelete()
         }
     }
 
+    [TestMethod]
+    public void TestAddMultiMasaDbContextReturnSaveChangeFilterEqual1()
+    {
+        var services = new ServiceCollection();
+        services.AddMasaDbContext<CustomizeDbContext>()
+            .AddMasaDbContext<CustomizeDbContext>();
+
+        var serviceProvider = services.BuildServiceProvider();
+        Assert.IsTrue(serviceProvider.GetServices<ISaveChangesFilter>().Count() == 1);
+    }
+
+    [TestMethod]
+    public void TestAddMasaDbContextReturnSaveChangeFilterEqual2()
+    {
+        var services = new ServiceCollection();
+        services.AddMasaDbContext<CustomizeDbContext>(opt =>
+        {
+            opt.UseSqlite(Guid.NewGuid().ToString()).UseFilter();
+        });
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var filters = serviceProvider.GetServices<ISaveChangesFilter>();
+        Assert.IsTrue(filters.Count() == 2);
+    }
+
     [TestMethod]
     public async Task TestGetPaginatedListAsyncReturnCountEqualResultCount()
     {

test/Masa.Contrib.Data.EntityFrameworkCore.Tests/_Imports.cs

@@ -5,10 +5,11 @@
 global using Masa.BuildingBlocks.Data.Contracts.DataFiltering;
 global using Masa.BuildingBlocks.Data.Contracts.Paginated;
 global using Masa.Contrib.Data.Contracts.EF;
+global using Masa.Contrib.Data.EntityFrameworkCore.Filters;
+global using Masa.Contrib.Data.EntityFrameworkCore.Sqlite;
 global using Masa.Contrib.Data.EntityFrameworkCore.Tests.Internal;
 global using Masa.Contrib.Data.EntityFrameworkCore.Tests.Models;
 global using Microsoft.EntityFrameworkCore;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Options;
 global using Microsoft.VisualStudio.TestTools.UnitTesting;
-global using Masa.Contrib.Data.EntityFrameworkCore.Sqlite;