added test: CRUD aggregate store now correctly deletes aggregates whe…

…n the action also triggers the removal of other related entities
revoframework · Oct 12, 2022 · 9e5b2b6 · 9e5b2b6
1 parent b8e08ff
commit 9e5b2b6
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/Common.props b/Common.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>1.30.1</VersionPrefix>
+    <VersionPrefix>1.30.2</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # RELEASE NOTES
 
+## [1.30.2] - 2022-10-12
+
+### Fixed
+- CRUD aggregate store now correctly deletes aggregates when the action also triggers the removal of other related entities
+
 ## [1.30.1] - 2022-06-16
 
 ### Added

diff --git a/Revo.Infrastructure/Repositories/CrudAggregateStore.cs b/Revo.Infrastructure/Repositories/CrudAggregateStore.cs
@@ -153,8 +153,7 @@ protected void InjectClassIds()
 
         protected void RemoveDeletedEntities()
         {
-            var aggregates = GetAttachedAggregates().ToList();
-            foreach (var aggregate in aggregates)
+            foreach (var aggregate in GetAttachedAggregates().ToArray())
             {
                 if (aggregate.IsDeleted)
                 {

diff --git a/Tests/Revo.Infrastructure.Tests/Repositories/CrudAggregateStoreTests.cs b/Tests/Revo.Infrastructure.Tests/Repositories/CrudAggregateStoreTests.cs
@@ -181,6 +181,35 @@ public async Task SaveChanges_RemovesDeleted()
             crudRepository.GetEntityState(testAggregate).Should().Be(EntityState.Detached);
         }
 
+        [Fact]
+        public async Task SaveChanges_RemovesDeletedAndDependencies()
+        {
+            // some providers like EF Core might remove other related entities (e.g. owned collections) when removing an aggregate,
+            // modifying the internal collection - RemoveDeletedEntities needs to materialize the iterated collection of to-be-deleted aggregates first
+
+            var testAggregate = new TestAggregate(Guid.NewGuid());
+            crudRepository.Add(testAggregate);
+
+            var testEntity = new TestEntity(Guid.NewGuid());
+            crudRepository.Add(testEntity);
+            await crudRepository.SaveChangesAsync();
+
+            crudRepository.When(x => x.Remove(testAggregate))
+                .Do(ci =>
+                {
+                    crudRepository.Remove(testEntity);
+                    crudRepository.SaveChanges();
+                });
+
+            testAggregate = await sut.GetAsync<TestAggregate>(testAggregate.Id);
+            testAggregate.Delete();
+
+            await sut.SaveChangesAsync();
+
+            crudRepository.GetEntityState(testAggregate).Should().Be(EntityState.Detached);
+            crudRepository.GetEntityState(testEntity).Should().Be(EntityState.Detached);
+        }
+
         [Fact]
         public async Task SaveChanges_FindNull()
         {
@@ -269,6 +298,17 @@ public void Delete()
             }
         }
 
+        public class TestEntity : BasicEntity
+        {
+            public TestEntity(Guid id) : base(id)
+            {
+            }
+
+            protected TestEntity()
+            {
+            }
+        }
+
         public class Event1 : DomainAggregateEvent
         {
         }