Merge pull request #86 from koenbeuk/cleanup-sp-registration

Removed unneeded complexities

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs

@@ -11,22 +11,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
-        private static object CreateContextFactory(IServiceProvider serviceProvider, Type contextType)
-        {
-            var instance = ActivatorUtilities.CreateInstance(serviceProvider, contextType);
-
-            if (instance is DbContext dbContextInstance)
-            {
-                var applicationTriggerServiceProviderAccessor = dbContextInstance.GetService<ApplicationTriggerServiceProviderAccessor>();
-                if (applicationTriggerServiceProviderAccessor != null)
-                {
-                    applicationTriggerServiceProviderAccessor.SetTriggerServiceProvider(serviceProvider);
-                }
-            }
-
-            return instance;
-        }
-
         private static object SetApplicationTriggerServiceProviderAccessor(object instance, IServiceProvider serviceProvider)
         {
             if (instance is DbContext dbContext)
@@ -44,11 +28,6 @@ private static object SetApplicationTriggerServiceProviderAccessor(object instan
         public static IServiceCollection AddTriggeredDbContext<TContext>(this IServiceCollection serviceCollection, Action<DbContextOptionsBuilder>? optionsAction = null, ServiceLifetime contextLifetime = ServiceLifetime.Scoped, ServiceLifetime optionsLifetime = ServiceLifetime.Scoped) 
             where TContext : DbContext
         {
-            serviceCollection.TryAdd(ServiceDescriptor.Describe(
-                serviceType: typeof(TContext),
-                implementationFactory: serviceProvider => CreateContextFactory(serviceProvider, typeof(TContext)),
-                lifetime: contextLifetime));
-
             serviceCollection.AddDbContext<TContext>(options => {
                 optionsAction?.Invoke(options);
                 options.UseTriggers();
@@ -88,7 +67,6 @@ public static IServiceCollection AddTriggeredDbContextFactory<TContext>(this ISe
             }, lifetime);
 
             var serviceDescriptor = serviceCollection.FirstOrDefault(x => x.ServiceType == typeof(IDbContextFactory<TContext>));
-
 
             if (serviceDescriptor?.ImplementationType != null)
             {

src/EntityFrameworkCore.Triggered/Internal/ApplicationTriggerServiceProviderAccessor.cs

@@ -10,9 +10,11 @@ namespace EntityFrameworkCore.Triggered.Internal
 {
     public sealed class ApplicationTriggerServiceProviderAccessor : ITriggerServiceProviderAccessor, IDisposable, IResettableService
     {
-        readonly IServiceProvider _rootServiceProvider;
+        readonly IServiceProvider _internalServiceProvider;
+        readonly IServiceProvider? _fallbackApplicationServiceProvider;
         readonly Func<IServiceProvider, IServiceProvider>? _scopedServiceProviderTransform;
         readonly ILogger? _logger;
+
         IServiceScope? _serviceScope;
         IServiceProvider? _applicationScopedServiceProvider;
 
@@ -26,7 +28,12 @@ public ApplicationTriggerServiceProviderAccessor(IServiceProvider internalServic
             var dbContextOptions = internalServiceProvider.GetRequiredService<IDbContextOptions>();
             var coreOptionsExtension = dbContextOptions.FindExtension<CoreOptionsExtension>();
 
-            _rootServiceProvider = coreOptionsExtension.ApplicationServiceProvider ?? internalServiceProvider;
+            _internalServiceProvider = internalServiceProvider;
+            if (scopedServiceProviderTransform == null)
+            {
+                _fallbackApplicationServiceProvider = coreOptionsExtension.ApplicationServiceProvider;
+            }
+            
             _scopedServiceProviderTransform = scopedServiceProviderTransform;
             _logger = logger;
         }
@@ -45,20 +52,30 @@ public IServiceProvider GetTriggerServiceProvider()
         {
             if (_applicationScopedServiceProvider == null)
             {
-                if (_scopedServiceProviderTransform == null)
+                if (_fallbackApplicationServiceProvider != null)
+                {
+                    _applicationScopedServiceProvider = _fallbackApplicationServiceProvider;
+                }
+                else if (_scopedServiceProviderTransform != null)
+                {
+
+                    var dbContextOptions = _internalServiceProvider.GetRequiredService<IDbContextOptions>();
+                    var coreOptionsExtension = dbContextOptions.FindExtension<CoreOptionsExtension>();
+                    var serviceProvider = coreOptionsExtension.ApplicationServiceProvider ?? _internalServiceProvider;
+
+                    _applicationScopedServiceProvider = _scopedServiceProviderTransform(serviceProvider);
+                }
+                else
                 {
                     if (_logger != null && _logger.IsEnabled(LogLevel.Warning))
                     {
                         _logger.LogWarning("No ServiceProvider is provided to resolve triggers from.");
                     }
 
-                    _serviceScope = _rootServiceProvider.CreateScope();
+                    _serviceScope = _internalServiceProvider.CreateScope();
                     _applicationScopedServiceProvider = _serviceScope.ServiceProvider;
                 }
-                else
-                {
-                    _applicationScopedServiceProvider = _scopedServiceProviderTransform(_rootServiceProvider);
-                }
+
             }
 
             return _applicationScopedServiceProvider;

test/EntityFrameworkCore.Triggered.Tests/Internal/ApplicationTriggerServiceProviderAccessorTests.cs

@@ -51,32 +51,6 @@ public void GetTriggerServiceProvider_NoApplicationDi_ReturnsScopedInternal()
             Assert.NotEqual(scopedObject1, scopedObject2);
         }
 
-        [Fact]
-        public void GetTriggerServiceProvider_WithApplicationDi_ReturnsScopedApplication()
-        {
-            var applicationServiceProvider = new ServiceCollection()
-                .AddDbContext<TestDbContext>(options => {
-                    options.UseInMemoryDatabase("Test")
-                           .UseTriggers();
-                    
-                    options.EnableServiceProviderCaching(false);
-                })
-                .AddScoped<object>()
-                .BuildServiceProvider();
-
-            var dbContext = applicationServiceProvider.GetRequiredService<TestDbContext>();
-
-            var subject = new ApplicationTriggerServiceProviderAccessor(dbContext.GetInfrastructure(), null, new NullLogger<ApplicationTriggerServiceProviderAccessor>());
-            var triggerServiceProvider = subject.GetTriggerServiceProvider();
-
-            var scopedObject = triggerServiceProvider.GetService<object>();
-            Assert.NotNull(scopedObject);
-
-            var applicationScopedObject = applicationServiceProvider.GetService<object>();
-            Assert.NotNull(applicationScopedObject);
-            Assert.NotEqual(applicationScopedObject, scopedObject);
-        }
-
         [Fact]
         public void GetTriggerServiceProvider_WithApplicationDiAndTransform_ReturnsCustomServiceProvider()
         {

test/EntityFrameworkCore.Triggered.Tests/TriggerServiceApplicationDependenciesTests.cs

@@ -35,15 +35,19 @@ public void ScopedTriggers_NoScopedApplicationServiceProvider_ForDbContext_DoesN
                 .AddScoped<IBeforeSaveTrigger<TestModel>, Stubs.TriggerStub<TestModel>>()
                 .BuildServiceProvider();
 
-            using var serviceScope = applicationServiceProvider.CreateScope();
-            var dbContext = serviceScope.ServiceProvider.GetRequiredService<TestDbContext>();
-
-            dbContext.Add(new TestModel { });
-            dbContext.SaveChanges();
-
-            var triggerStub = serviceScope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
+            void SimulateRequest()
+            {
+                using var serviceScope = applicationServiceProvider.CreateScope();
+                var dbContext = serviceScope.ServiceProvider.GetRequiredService<TestDbContext>();
+                var triggerStub = serviceScope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
+                Assert.Equal(0, triggerStub.BeforeSaveInvocations.Count);
+                
+                dbContext.Add(new TestModel { });
+                dbContext.SaveChanges();
+            }
 
-            Assert.Equal(0, triggerStub.BeforeSaveInvocations.Count);
+            SimulateRequest();
+            SimulateRequest();
         }
 
         [Fact]