Merge pull request #139 from koenbeuk/issue-128

Fix for internally registered triggers with a Scoped lifetime

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Infrastructure/Internal/TriggersOptionExtension.cs

@@ -239,6 +239,7 @@ public void ApplyServices(IServiceCollection services)
 
                             var triggerTypeImplementationFactoryType = typeof(ITriggerInstanceFactory<>).MakeGenericType(triggerTypeImplementation);
                             services.Add(new ServiceDescriptor(triggerTypeImplementationFactoryType, _ => triggerInstanceFactoryBuilder(triggerServiceInstance), lifetime));
+                            services.AddScoped(typeof(IResettableService), serviceProvider => serviceProvider.GetRequiredService(triggerTypeImplementationFactoryType));
                         }
                     }
                 }

src/EntityFrameworkCore.Triggered/Internal/ApplicationTriggerServiceProviderAccessor.cs

@@ -37,7 +37,7 @@ public ApplicationTriggerServiceProviderAccessor(IServiceProvider internalServic
 
         public void SetTriggerServiceProvider(IServiceProvider serviceProvider)
         {
-            if (_applicationScopedServiceProvider != null)
+            if (_applicationScopedServiceProvider is not null && _applicationScopedServiceProvider != serviceProvider)
             {
                 throw new InvalidOperationException("Can only set applicationScopedServiceProvider once");
             }

src/EntityFrameworkCore.Triggered/Internal/TriggerInstanceFactory.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EntityFrameworkCore.Triggered.Internal
@@ -9,7 +12,7 @@ public interface ITriggerInstanceFactory
         object Create(IServiceProvider serviceProvider);
     }
 
-    public interface ITriggerInstanceFactory<out TTriggerType> : ITriggerInstanceFactory
+    public interface ITriggerInstanceFactory<out TTriggerType> : ITriggerInstanceFactory, IResettableService
     {
 
     }
@@ -40,5 +43,16 @@ public object Create(IServiceProvider serviceProvider)
             _instance = _internalFactory(serviceProvider, null);
             return _instance;
         }
+
+        public void ResetState()
+        {
+            _instance = null;
+        }
+
+        public Task ResetStateAsync(CancellationToken cancellationToken = default)
+        {
+            ResetState();
+            return Task.CompletedTask;
+        }
     }
 }

test/EntityFrameworkCore.Triggered.Tests/Infrastructure/ServiceCollectionExtensionsTests.cs

@@ -124,6 +124,26 @@ public void AddTriggeredDbContextPool_ReusesScopedServiceProvider()
             Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
         }
 
+        [Fact]
+        public void AddTriggeredDbContextPool_SupportsAScopedLifetime()
+        {
+            var subject = new ServiceCollection();
+            subject.AddTriggeredDbContextPool<TestDbContext>(options => {
+                options.UseInMemoryDatabase("test");
+                options.ConfigureWarnings(warningOptions => {
+                    warningOptions.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
+                });
+            });
+
+            var serviceProvider = subject.BuildServiceProvider();
+
+            using var scope = serviceProvider.CreateScope();
+
+            var context1 = scope.ServiceProvider.GetRequiredService<TestDbContext>();
+            var context2 = scope.ServiceProvider.GetRequiredService<TestDbContext>();
+
+            Assert.Equal(context1, context1);
+        }
 
 #if EFCORETRIGGERED2 || EFCORETRIGGERED3
         [Fact]