Refactored TriggerConfigurations

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Extensions/DbContextExtensions.cs

@@ -32,23 +32,43 @@ public static ITriggerSession CreateTriggerSession(this DbContext dbContext, ISe
         }
 
         /// <summary>
-        /// Calls dbContext.SaveChanges without invoking triggers
+        /// Creates a <c>ITriggerSession</c> that can be used to manually invoke triggers
         /// </summary>
-        public static int SaveChangesWithoutTriggers(this DbContext dbContext, bool acceptAllChangesOnSuccess = true)
+        public static ITriggerSession CreateTriggerSession(this DbContext dbContext, Func<TriggerConfiguration, TriggerConfiguration> configurator, IServiceProvider? serviceProvider = null)
         {
             var triggerService = GetTriggerService(dbContext);
-            var initialConfiguration = triggerService.Configuration;
+            var configuration = configurator(triggerService.Configuration);
 
-            try
-            {
-                triggerService.Configuration = initialConfiguration with { Disabled = true };
+            return triggerService.CreateSession(dbContext, configuration, serviceProvider);
+        }
 
-                return dbContext.SaveChanges(acceptAllChangesOnSuccess);
-            }
-            finally
+
+        /// <summary>
+        /// Creates a new <c>ITriggerSession</c> that can be used to manually invoke triggers. Throws if a TriggerSession is already active
+        /// </summary>
+        public static ITriggerSession CreateNewTriggerSession(this DbContext dbContext, Func<TriggerConfiguration, TriggerConfiguration>? configurator = null, IServiceProvider? serviceProvider = null)
+        {
+            var triggerService = GetTriggerService(dbContext);
+            if (triggerService.Current is not null)
             {
-                triggerService.Configuration = initialConfiguration;
+                throw new InvalidOperationException("A triggerSession has already been created");
             }
+
+            var configuration = configurator?.Invoke(triggerService.Configuration) ?? triggerService.Configuration;
+
+            return triggerService.CreateSession(dbContext, configuration, serviceProvider);
+        }
+
+        /// <summary>
+        /// Calls dbContext.SaveChanges without invoking triggers
+        /// </summary>
+        public static int SaveChangesWithoutTriggers(this DbContext dbContext, bool acceptAllChangesOnSuccess = true)
+        {
+            CreateNewTriggerSession(dbContext, configuration => configuration with {
+                Disabled = true
+            });
+
+            return dbContext.SaveChanges(acceptAllChangesOnSuccess);
         }
 
         /// <summary>
@@ -62,19 +82,11 @@ public static Task<int> SaveChangesWithoutTriggersAsync(this DbContext dbContext
         /// </summary>
         public static Task<int> SaveChangesWithoutTriggersAsync(this DbContext dbContext, bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = default)
         {
-            var triggerService = GetTriggerService(dbContext);
-            var initialConfiguration = triggerService.Configuration;
-
-            try
-            {
-                triggerService.Configuration = initialConfiguration with { Disabled = true };
+            CreateNewTriggerSession(dbContext, configuration => configuration with {
+                Disabled = true
+            });
 
-                return dbContext.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
-            }
-            finally
-            {
-                triggerService.Configuration = initialConfiguration;
-            }
+            return dbContext.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
         }
     }
 }

src/EntityFrameworkCore.Triggered/ITriggerService.cs

@@ -9,6 +9,8 @@ public interface ITriggerService
 
         ITriggerSession CreateSession(DbContext context, IServiceProvider? serviceProvider = null);
 
+        ITriggerSession CreateSession(DbContext context, TriggerConfiguration configuration, IServiceProvider? serviceProvider = null);
+
         ITriggerSession? Current { get; set; }
     }
 }

src/EntityFrameworkCore.Triggered/TriggerService.cs

@@ -39,6 +39,9 @@ public ITriggerSession? Current
         public TriggerConfiguration Configuration { get; set; }
 
         public ITriggerSession CreateSession(DbContext context, IServiceProvider? serviceProvider)
+            => CreateSession(context, Configuration, serviceProvider);
+
+        public ITriggerSession CreateSession(DbContext context, TriggerConfiguration configuration, IServiceProvider? serviceProvider)
         {
             if (context is null)
             {
@@ -52,7 +55,7 @@ public ITriggerSession CreateSession(DbContext context, IServiceProvider? servic
                 _triggerDiscoveryService.ServiceProvider = serviceProvider;
             }
 
-            var triggerSession = new TriggerSession(this, Configuration, _triggerDiscoveryService, triggerContextTracker, _loggerFactory.CreateLogger<TriggerSession>());
+            var triggerSession = new TriggerSession(this, configuration, _triggerDiscoveryService, triggerContextTracker, _loggerFactory.CreateLogger<TriggerSession>());
 
             _currentTriggerSession = triggerSession;
 

test/EntityFrameworkCore.Triggered.Tests/Extensions/DbContextExtensionTests.cs

@@ -135,5 +135,21 @@ public async Task SaveChangesAsyncWithoutTriggers_RestoresConfiguration()
             // assert
             Assert.Same(expectedConfiguration, context.GetTriggerService().Configuration);
         }
+
+
+        [Fact]
+        public void CreateNewTriggerSession_ExistingSession_Throws()
+        {
+            // arrange
+            using var context = new TestDbContext();
+            context.TestModels.Add(new TestModel { });
+            context.CreateNewTriggerSession();
+
+            // act
+            Assert.Throws<InvalidOperationException>(() =>
+                context.CreateNewTriggerSession());
+        }
+
+
     }
 }

test/EntityFrameworkCore.Triggered.Tests/Stubs/TriggerServiceStub.cs

@@ -21,5 +21,7 @@ public ITriggerSession CreateSession(DbContext context, IServiceProvider service
             Current = LastSession;
             return LastSession;
         }
+
+        public ITriggerSession CreateSession(DbContext context, TriggerConfiguration configuration, IServiceProvider serviceProvider = null) => throw new NotImplementedException();
     }
 }