feature：

修复报错问题

Author: KawhiWei

sample/Module.Sample/DbContexts/ModuleDbContext.cs

@@ -6,7 +6,7 @@ namespace Module.Sample.DbContexts
 {
     public class ModuleDbContext : LuckDbContextBase
     {
-        public ModuleDbContext(DbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+        public ModuleDbContext(DbContextOptions options, IServiceProvider serviceProvider) : base(options)
         {
         }
         public DbSet<Order> Orders => Set<Order>();

src/framework/Luck.EntityFrameworkCore/DbContexts/LuckDbContextBase.cs

@@ -8,12 +8,9 @@ namespace Luck.EntityFrameworkCore.DbContexts
     /// <summary>
     /// 类类上下文
     /// </summary>
-    public abstract class LuckDbContextBase(DbContextOptions options, IServiceProvider serviceProvider)
+    public abstract class LuckDbContextBase(DbContextOptions options)
         : DbContext(options),ILuckDbContext
     {
-        protected IServiceProvider ServiceProvider { get; set; } =
-            Check.NotNull(serviceProvider, nameof(serviceProvider));
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

src/framework/Luck.EntityFrameworkCore/Repositories/EFCoreAggregateRootRepository.cs

@@ -13,57 +13,53 @@ public class EfCoreAggregateRootRepository<TEntity, TKey> : AggregateRootReposit
         where TKey : IEquatable<TKey>
     {
         private readonly IDbContextFactory<LuckDbContextBase> _dbContextFactory;
-        protected LuckDbContextBase DbContext { get; }
-        private readonly IUnitOfWork _unitOfWork;
+        private readonly LuckDbContextBase _luckDbContextBase;
+        protected LuckDbContextBase DbContext => _luckDbContextBase;
 
         public EfCoreAggregateRootRepository(IUnitOfWork unitOfWork)
         {
-            _unitOfWork = unitOfWork;
-            DbContext = unitOfWork as LuckDbContextBase ?? throw new ArgumentNullException(nameof(ILuckDbContext));
+            _luckDbContextBase = unitOfWork.GetLuckDbContext() as LuckDbContextBase ??
+                                 throw new ArgumentNullException(nameof(ILuckDbContext));
         }
 
         public override void Add(TEntity entity)
         {
-            DbContext.Add(entity);
+            _luckDbContextBase.Add(entity);
         }
 
-
         public override void Attach(TEntity entity)
         {
-            DbContext.Attach(entity);
+            _luckDbContextBase.Attach(entity);
         }
 
-
         public override void Update(TEntity entity)
         {
-            DbContext.Update(entity);
+            _luckDbContextBase.Update(entity);
         }
 
-
         public override void Remove(TEntity entity)
         {
-            DbContext.Remove(entity);
+            _luckDbContextBase.Remove(entity);
         }
 
-
         public override TEntity? Find(TKey primaryKey)
         {
-            return DbContext.Find<TEntity>(primaryKey);
+            return _luckDbContextBase.Find<TEntity>(primaryKey);
         }
 
         public override ValueTask<TEntity?> FindAsync(TKey primaryKey)
         {
-            return DbContext.FindAsync<TEntity>(primaryKey);
+            return _luckDbContextBase.FindAsync<TEntity>(primaryKey);
         }
 
         public override Task<TEntity?> FindAsync(Expression<Func<TEntity, bool>> predicate)
         {
-            return DbContext.Set<TEntity>().FirstOrDefaultAsync(predicate);
+            return _luckDbContextBase.Set<TEntity>().FirstOrDefaultAsync(predicate);
         }
 
         protected override IQueryable<TEntity> FindQueryable()
         {
-            return DbContext.Set<TEntity>();
+            return _luckDbContextBase.Set<TEntity>();
         }
     }
 }

test/Luck.UnitTest/EntityFrameworkCore_Tests/EntityFrameworkCoreTests.cs

@@ -42,8 +42,13 @@ public async Task AggregateRootRepositoryAddAsync()
     {
         try
         {
-            _orderAggregateRootRepository.Add(new Order("Pual", "Los"));
+            var order = new Order("Pual", "Los");
+            _orderAggregateRootRepository.Add(order);
             await _unitOfWork.CommitAsync();
+
+            var result = await _orderAggregateRootRepository.FindAsync(x => x.Name == "Pual");
+            Assert.NotNull(result);
+            Assert.True(result.Name == order.Name);
         }
         catch (Exception e)
         {

test/Luck.UnitTest/EntityFrameworkCore_Tests/TestContext.cs

@@ -7,7 +7,7 @@ namespace Luck.UnitTest.EntityFrameworkCore_Tests;
 
 public class TestContext : LuckDbContextBase
 {
-    public TestContext(DbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+    public TestContext(DbContextOptions options) : base(options)
     {
     }