Merge pull request #7 from msx752/development

Development

Author: msx752

src/SampleDotnet.RepositoryFactory/Interfaces/IRepository.cs

@@ -17,8 +17,6 @@ public interface IRepository : IDisposable
     void Update(object entity);
 
     void UpdateRange(params object[] entities);
-
-    DbContext RefreshDbContext();
 }
 
 public interface IRepository<TDbContext> : IRepository

src/SampleDotnet.RepositoryFactory/Repository.cs

@@ -28,7 +28,7 @@ public IQueryable<T> AsQueryable<T>() where T : class
 
     private DbSet<T> CachedContextSet<T>() where T : class
     {
-        return (DbSet<T>)_cachedDbSets.GetOrAdd(typeof(T).FullName, CurrentDbContext.Set<T>());
+        return (DbSet<T>)_cachedDbSets.GetOrAdd(typeof(T).FullName, DbContext.Set<T>());
     }
 
     public void Delete<T>(T entity) where T : class

src/SampleDotnet.RepositoryFactory/RepositoryBase.cs

@@ -21,7 +21,7 @@ protected RepositoryBase(DbContext context)
         this._context = context;
     }
 
-    public DbContext CurrentDbContext => _context;
+    public DbContext DbContext => _context;
 
     public virtual void Delete(object entity)
     {

src/SampleDotnet.RepositoryFactory/SampleDotnet.RepositoryFactory.csproj

@@ -31,8 +31,8 @@
 		<ContinuousIntegrationBuild>True</ContinuousIntegrationBuild>
 		<EmbedUntrackedSources>True</EmbedUntrackedSources>
 		<Copyright>Copyright 2023</Copyright>
-		<AssemblyVersion>3.0.0.3</AssemblyVersion>
-		<Version>3.0.0.3-alpha</Version>
+		<AssemblyVersion>3.0.0.4</AssemblyVersion>
+		<Version>3.0.0.4-alpha</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

src/SampleDotnet.RepositoryFactory/UnitOfWork.cs

@@ -72,10 +72,7 @@ public async Task<bool> SaveChangesAsync(CancellationToken cancellationToken = d
 
             for (int i = 0; i < cached.Length; i++)
             {
-                if (_dbContextPool.TryDequeue(out var dbContext) && dbContext != null)
-                {
-                    dbContext.ChangeTracker.AcceptAllChanges();
-                }
+                cached[i].ChangeTracker.AcceptAllChanges();
             }
         }
         catch (Exception e)

test/SampleDotnet.RepositoryFactory.Tests/Cases/DbContextDisposeTests.cs

@@ -81,36 +81,49 @@ public async Task Case_Repository_Should_Not_Throw_ObjectDisposedException()
             });
 
             using (IHost build = host.Build())
-            //request scope
-            using (IServiceScope requestScope = build.Services.CreateScope())
-            using (var unitOfWork = requestScope.ServiceProvider.GetRequiredService<IUnitOfWork>())
-            using (var cancellationTokenSource = new CancellationTokenSource())
             {
-                using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
+                //request scope 1
+                using (IServiceScope requestScope = build.Services.CreateScope())
+                using (var unitOfWork = requestScope.ServiceProvider.GetRequiredService<IUnitOfWork>())
+                using (var cancellationTokenSource = new CancellationTokenSource())
                 {
-                    var user1 = new TestUserEntity()
+                    using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
                     {
-                        Name = "Name",
-                        Surname = "Surname",
-                    };
+                        var user1 = new TestUserEntity()
+                        {
+                            Name = "Name",
+                            Surname = "Surname",
+                        };
 
-                    user1.CreatedAt.ShouldBeNull();
-                    await repository.InsertAsync(user1);
+                        user1.CreatedAt.ShouldBeNull();
+                        await repository.InsertAsync(user1);
 
-                    await unitOfWork.SaveChangesAsync();
+                        await unitOfWork.SaveChangesAsync();
+                        await unitOfWork.SaveChangesAsync();
+                    }
                 }
 
-                Parallel.For(1, 100, new ParallelOptions() { MaxDegreeOfParallelism = 5 }, async (i) =>
+                //request scope 2
+                using (IServiceScope requestScope = build.Services.CreateScope())
+                using (var unitOfWork = requestScope.ServiceProvider.GetRequiredService<IUnitOfWork>())
+                using (var cancellationTokenSource = new CancellationTokenSource())
                 {
-                    using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
+                    Parallel.For(0, 25, new ParallelOptions() { MaxDegreeOfParallelism = 3 }, async (i) =>
                     {
-                        var user1 = await repository.FirstOrDefaultAsync<TestUserEntity>(f => f.Surname == "Surname");
+                        using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
+                        {
+                            var user1 = await repository.FirstOrDefaultAsync<TestUserEntity>(f => f.Surname == "Surname");
 
-                        user1.Name = "Name" + i.ToString("00");
+                            user1.Name = "Name" + i.ToString("00");
 
-                        await unitOfWork.SaveChangesAsync();
-                    }
-                });
+                            await unitOfWork.SaveChangesAsync();
+
+                            repository.Update(user1);
+
+                            await unitOfWork.SaveChangesAsync();
+                        }
+                    });
+                }
             }
         }
     }

test/SampleDotnet.RepositoryFactory.Tests/Cases/UnitOfWorkTests.cs

@@ -429,6 +429,71 @@ await Assert.ThrowsAsync<DbUpdateException>(async () =>
         }
     }
 
+    [Fact]
+    public async Task Case_UnitOfWork_Do_Not_Skip_DetectChanges()
+    {
+        IHostBuilder host = Host.CreateDefaultBuilder().ConfigureServices((services) =>
+        {
+            services.AddDbContextFactoryWithUnitOfWork<TestApplicationDbContext>(options =>
+            {
+                //var cnnBuilder = new SqlConnectionStringBuilder();
+                //cnnBuilder.DataSource = "localhost,1433";
+                //cnnBuilder.InitialCatalog = "TestApplicationDb";
+                //cnnBuilder.TrustServerCertificate = true;
+                //cnnBuilder.UserID = "sa";
+                //cnnBuilder.Password = "Admin123!";
+                //cnnBuilder.MultipleActiveResultSets = true;
+                //cnnBuilder.ConnectRetryCount = 5;
+                //cnnBuilder.ConnectTimeout = TimeSpan.FromMinutes(5).Seconds;
+                //options.UseSqlServer(cnnBuilder.ToString());
+
+                options.UseInMemoryDatabase("Case_UnitOfWork_Do_Not_Skip_DetectChanges");
+                options.EnableSensitiveDataLogging();
+                options.EnableDetailedErrors();
+            });
+        });
+
+        using (IHost build = host.Build())
+        //request scope
+        using (IServiceScope requestScope = build.Services.CreateScope())
+        using (var unitOfWork = requestScope.ServiceProvider.GetRequiredService<IUnitOfWork>())
+        using (var cancellationTokenSource = new CancellationTokenSource())
+        {
+            using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
+            {
+                var user1 = new TestUserEntity()
+                {
+                    Name = "Name",
+                    Surname = "Surname",
+                };
+
+                user1.CreatedAt.ShouldBeNull();
+                await repository.InsertAsync(user1);
+
+                await unitOfWork.SaveChangesAsync();
+            }
+
+            using (var repository = unitOfWork.CreateRepository<TestApplicationDbContext>())
+            {
+                var user1 = await repository.FirstOrDefaultAsync<TestUserEntity>(f => f.Surname == "Surname");
+
+                user1.ShouldNotBeNull();
+                user1.CreatedAt.ShouldNotBeNull();
+
+                await unitOfWork.SaveChangesAsync();
+
+                user1.Name = "NameUpdated2";
+
+                await unitOfWork.SaveChangesAsync();
+
+                user1.CreatedAt.ShouldNotBeNull();
+
+                var user2 = await repository.FirstOrDefaultAsync<TestUserEntity>(f => f.Name == "NameUpdated2");
+                user2.ShouldNotBeNull();
+            }
+        }
+    }
+
     #region DbContext 1
 
     internal class FirstDbContext : DbContext