Merge pull request #59 from clintirving/add-transaction-scope-to-casc…

…ade-delete Add transaction scope to cascade delete
clintirving · Jan 22, 2025 · 631624a · 631624a
2 parents 12a852a + bec2aa8
commit 631624a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 9 deletions.
diff --git a/EfYou/EfYou.csproj b/EfYou/EfYou.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.27</Version>
+    <Version>1.0.28</Version>
     <AssemblyVersion>1.0.19.0</AssemblyVersion>
     <FileVersion>1.0.19.0</FileVersion>
   </PropertyGroup>

diff --git a/EfYou/EntityServices/EntityServiceOfT.cs b/EfYou/EntityServices/EntityServiceOfT.cs
@@ -11,6 +11,7 @@
 using System.Data.Entity;
 using System.Data.Entity.Validation;
 using System.Linq;
+using System.Transactions;
 using EfYou.CascadeDelete;
 using EfYou.DatabaseContext;
 using EfYou.Extensions;
@@ -294,15 +295,20 @@ public virtual void Delete(List<dynamic> ids)
 
             if (entitiesToDelete.Count != 0)
             {
-                _cascadeDeletionService.CascadeDelete(entitiesToDelete.GetIdsFromEntities());
-
-                if (UseBulkDelete)
-                {
-                    DeleteUsingBulkDelete(entitiesToDelete);
-                }
-                else
+                using (var transaction = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled))
                 {
-                    DeleteUsingEntityFramework(entitiesToDelete);
+                    _cascadeDeletionService.CascadeDelete(entitiesToDelete.GetIdsFromEntities());
+
+                    if (UseBulkDelete)
+                    {
+                        DeleteUsingBulkDelete(entitiesToDelete);
+                    }
+                    else
+                    {
+                        DeleteUsingEntityFramework(entitiesToDelete);
+                    }
+
+                    transaction.Complete();
                 }
             }
         }

diff --git a/EfYouTests/EntityServices/EntityServiceOfTTests.cs b/EfYouTests/EntityServices/EntityServiceOfTTests.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
+using System.Transactions;
 using EfYou.CascadeDelete;
 using EfYou.DatabaseContext;
 using EfYou.EntityServices;
@@ -727,6 +728,44 @@ public void Delete_ListOfIds_CallsCascadeDeleteWithFilteredEntities()
             _cascadeDeleteService.Verify(x => x.CascadeDelete(It.Is<List<dynamic>>(y => y.Count == 1)));
         }
 
+        /// <summary>
+        /// Helpful here: https://stackoverflow.com/a/26361464/2844982
+        /// </summary>
+        [TestMethod]
+        public void Delete_ListOfIds_EverythingIsExecutedInATransaction()
+        {
+            // Arrange
+            Transaction cascadeDeleteTransaction = null;
+            var cascadeDeleteTransactionCommitted = false;
+
+
+            var entities = new List<DummyEntity>
+            {
+                new DummyEntity {Id = 3},
+                new DummyEntity {Id = 4}
+            };
+            var accessibleIds = new List<dynamic> { 3 };
+            SetMockData(entities);
+            _filterService.Setup(x => x.FilterResultsOnGet(It.IsAny<IQueryable<DummyEntity>>(), It.IsAny<List<dynamic>>(), It.IsAny<IContext>()))
+                .Returns<IQueryable<DummyEntity>, List<dynamic>, IContext>((x, y, z) => x.Where(a => accessibleIds.Contains(a.Id)));
+
+            _cascadeDeleteService.Setup(x => x.CascadeDelete(It.IsAny<List<dynamic>>())).Callback(() =>
+            {
+                cascadeDeleteTransaction = Transaction.Current;
+                cascadeDeleteTransaction.TransactionCompleted += (sender, args) =>
+                    cascadeDeleteTransactionCommitted =
+                        args.Transaction.TransactionInformation.Status == TransactionStatus.Committed;
+            });
+
+            // Act
+            _entityService.Delete(new List<dynamic> { 3, 4 });
+
+            // Assert
+            Assert.IsNotNull(cascadeDeleteTransaction);
+            Assert.IsTrue(cascadeDeleteTransactionCommitted);
+
+        }
+
         [TestMethod]
         public void Delete_NoMatchingIds_DoesNotCallCascadeDelete()
         {