Merge pull request #21 from koenbeuk/trigger-priority-logic

Fixed broken recursion

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Internal/ITriggerContextDiscoveryStrategy.cs

@@ -10,6 +10,6 @@ namespace EntityFrameworkCore.Triggered.Internal
 {
     public interface ITriggerContextDiscoveryStrategy
     {
-        IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger);
+        IEnumerable<IEnumerable<ITriggerContextDescriptor>> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger);
     }
 }

src/EntityFrameworkCore.Triggered/Internal/NonRecursiveTriggerContextDiscoveryStrategy.cs

@@ -22,13 +22,13 @@ public NonRecursiveTriggerContextDiscoveryStrategy(string name)
             _name = name ?? throw new ArgumentNullException(nameof(name));
         }
 
-        public IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger)
+        public IEnumerable<IEnumerable<ITriggerContextDescriptor>> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger)
         {
             var changes = tracker.DiscoveredChanges ?? throw new InvalidOperationException("Trigger discovery process has not yet started. Please ensure that TriggerSession.DiscoverChanges() or TriggerSession.RaiseBeforeSaveTriggers() has been called");
 
             _changesDetected(logger, changes.Count(), _name, null);
 
-            return changes;
+            return Enumerable.Repeat(changes, 1);
         }
     }
 }

src/EntityFrameworkCore.Triggered/Internal/RecursiveTriggerContextDiscoveryStrategy.cs

@@ -31,7 +31,7 @@ public RecursiveTriggerContextDiscoveryStrategy(string name, bool skipDetectedCh
             _skipDetectedChanges = skipDetectedChanges;
         }
 
-        public IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger)
+        public IEnumerable<IEnumerable<ITriggerContextDescriptor>> Discover(TriggerOptions options, TriggerContextTracker tracker, ILogger logger)
         {
             var maxRecursion = options.MaxRecursion;
             _discoveryStarted(logger, _name, maxRecursion, null);
@@ -56,10 +56,7 @@ public IEnumerable<ITriggerContextDescriptor> Discover(TriggerOptions options, T
                 {
                     _changesDetected(logger, changes.Count(), _name, iteration, maxRecursion, null);
 
-                    foreach (var change in changes)
-                    {
-                        yield return change;
-                    }
+                    yield return changes;
                 }
                 else
                 {

src/EntityFrameworkCore.Triggered/TriggerSession.cs

@@ -45,32 +45,34 @@ public async Task RaiseTriggers(Type openTriggerType, ITriggerContextDiscoverySt
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var triggerContextDescriptors = triggerContextDiscoveryStrategy.Discover(_options, _tracker, _logger);
-            IEnumerable<(ITriggerContextDescriptor triggerContextDescriptor, TriggerDescriptor triggerDescriptor)> triggerInvocations = triggerContextDescriptors
-                .SelectMany(triggerContextDescriptor => 
-                    _triggerDiscoveryService
-                        .DiscoverTriggers(openTriggerType, triggerContextDescriptor.EntityType, triggerTypeDescriptorFactory)
-                        .Select(triggerDescriptor => (triggerContextDescriptor, triggerDescriptor))
-                )
-                .OrderBy(x => x.triggerDescriptor.Priority);
-            
-            if (_logger.IsEnabled(LogLevel.Debug))
+            var triggerContextDescriptorBatches = triggerContextDiscoveryStrategy.Discover(_options, _tracker, _logger);
+            foreach (var triggerContextDescriptorBatch in triggerContextDescriptorBatches)
             {
+                IEnumerable<(ITriggerContextDescriptor triggerContextDescriptor, TriggerDescriptor triggerDescriptor)> triggerInvocations = triggerContextDescriptorBatch
+                    .SelectMany(triggerContextDescriptor =>
+                        _triggerDiscoveryService
+                            .DiscoverTriggers(openTriggerType, triggerContextDescriptor.EntityType, triggerTypeDescriptorFactory)
+                            .Select(triggerDescriptor => (triggerContextDescriptor, triggerDescriptor))
+                    )
+                    .OrderBy(x => x.triggerDescriptor.Priority);
+
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    triggerInvocations = triggerInvocations.ToList();
+                    _logger.LogDebug("Discovered {triggers} triggers of type {openTriggerType}", triggerInvocations.Count(), openTriggerType);
+                }
 
-                triggerInvocations = triggerInvocations.ToList();
-                _logger.LogDebug("Discovered {triggers} triggers of type {openTriggerType}", triggerInvocations.Count(), openTriggerType);
-            }
+                foreach (var triggerInvocation in triggerInvocations)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
 
-            foreach (var triggerInvocation in triggerInvocations)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+                    if (_logger.IsEnabled(LogLevel.Information))
+                    {
+                        _logger.LogInformation("Invoking trigger: {trigger} as {triggerType}", triggerInvocation.triggerDescriptor.GetType().Name, triggerInvocation.triggerDescriptor.TypeDescriptor.TriggerType.Name);
+                    }
 
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Invoking trigger: {trigger} as {triggerType}", triggerInvocation.triggerDescriptor.GetType().Name, triggerInvocation.triggerDescriptor.TypeDescriptor.TriggerType.Name);
+                    await triggerInvocation.triggerDescriptor.Invoke(triggerInvocation.triggerContextDescriptor.GetTriggerContext(), cancellationToken).ConfigureAwait(false);
                 }
-
-                await triggerInvocation.triggerDescriptor.Invoke(triggerInvocation.triggerContextDescriptor .GetTriggerContext(), cancellationToken).ConfigureAwait(false);
             }
         }
 

test/EntityFrameworkCore.Triggered.Tests/TriggerSessionTests.cs

@@ -256,7 +256,41 @@ public void RaiseBeforeSaveTriggers_MultipleEntities_SortByPriorities()
             Assert.Equal("Early", capturedInvocations[1].Item1);
             Assert.Equal("Late", capturedInvocations[2].Item1);
             Assert.Equal("Late", capturedInvocations[3].Item1);
+        }
+
+
+        [Fact]
+        public void RaiseBeforeSaveTriggers_RecursiveAdd_RaisesSubsequentTriggers()
+        {
+            TestDbContext dbContext = null;
+
+            var trigger = new TriggerStub<TestModel> {
+                Priority = CommonTriggerPriority.Early,
+                BeforeSaveHandler = (context, _) => {
+                    if (context.Entity.Id == 1)
+                    {
+                        dbContext.TestModels.Add(new TestModel { Id = 2 });
+                    }
+                    return Task.CompletedTask;
+                }
+            };
+
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton<IBeforeSaveTrigger<TestModel>>(trigger)
+                .AddTriggeredDbContext<TestDbContext>(options => {
+                    options.UseInMemoryDatabase("Test");
+                })
+                .BuildServiceProvider();
+
+            var scope = serviceProvider.CreateScope();
+            dbContext = scope.ServiceProvider.GetRequiredService<TestDbContext>();
+            var subject = CreateSubject(dbContext);
+
+            dbContext.TestModels.Add(new TestModel { Id = 1 });
+
+            subject.RaiseBeforeSaveTriggers();
 
+            Assert.Equal(2, trigger.BeforeSaveInvocations.Count);
         }
     }
 }