Merge branch 'master' of https://github.com/koenbeuk/EntityFrameworkCore.Triggered

Author: koenbeuk

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

@@ -134,7 +134,7 @@ public DbContextOptionsExtensionInfo Info
 
         public void ApplyServices(IServiceCollection services)
         {
-            services.AddScoped(serviceProvider => new ApplicationTriggerServiceProviderAccessor(serviceProvider, _serviceProviderTransform, serviceProvider.GetService<ILogger<ApplicationTriggerServiceProviderAccessor>>()));
+            services.AddScoped(serviceProvider => new ApplicationTriggerServiceProviderAccessor(serviceProvider, _serviceProviderTransform));
             services.AddScoped<IResettableService>(serviceProvider => serviceProvider.GetRequiredService<ApplicationTriggerServiceProviderAccessor>());
             services.TryAddScoped<ITriggerServiceProviderAccessor>(serviceProvider => serviceProvider.GetRequiredService<ApplicationTriggerServiceProviderAccessor>());
 

src/EntityFrameworkCore.Triggered/Internal/ApplicationTriggerServiceProviderAccessor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,12 +14,11 @@ public sealed class ApplicationTriggerServiceProviderAccessor : ITriggerServiceP
         readonly IServiceProvider _internalServiceProvider;
         readonly IServiceProvider? _fallbackApplicationServiceProvider;
         readonly Func<IServiceProvider, IServiceProvider>? _scopedServiceProviderTransform;
-        readonly ILogger? _logger;
 
         IServiceScope? _serviceScope;
         IServiceProvider? _applicationScopedServiceProvider;
 
-        public ApplicationTriggerServiceProviderAccessor(IServiceProvider internalServiceProvider, Func<IServiceProvider, IServiceProvider>? scopedServiceProviderTransform, ILogger? logger)
+        public ApplicationTriggerServiceProviderAccessor(IServiceProvider internalServiceProvider, Func<IServiceProvider, IServiceProvider>? scopedServiceProviderTransform)
         {
             if (internalServiceProvider is null)
             {
@@ -35,7 +35,6 @@ public ApplicationTriggerServiceProviderAccessor(IServiceProvider internalServic
             }
 
             _scopedServiceProviderTransform = scopedServiceProviderTransform;
-            _logger = logger;
         }
 
         public void SetTriggerServiceProvider(IServiceProvider serviceProvider)
@@ -67,11 +66,6 @@ public IServiceProvider GetTriggerServiceProvider()
                 }
                 else
                 {
-                    if (_logger != null && _logger.IsEnabled(LogLevel.Warning))
-                    {
-                        _logger.LogWarning("No ServiceProvider is provided to resolve triggers from.");
-                    }
-
                     _serviceScope = _internalServiceProvider.CreateScope();
                     _applicationScopedServiceProvider = _serviceScope.ServiceProvider;
                 }

src/EntityFrameworkCore.Triggered/Internal/TriggerFactory.cs

@@ -31,9 +31,14 @@ public IEnumerable<object> Resolve(IServiceProvider serviceProvider, Type trigge
 
             // Alternatively, triggers may be registered with the extension configuration
             var triggerServiceFactories = _internalServiceProvider.GetServices(typeof(ITriggerInstanceFactory<>).MakeGenericType(triggerType)).Cast<ITriggerInstanceFactory>();
-            foreach (var triggerServiceFactory in triggerServiceFactories)
+            if (triggerServiceFactories.Any())
             {
-                yield return triggerServiceFactory.Create(serviceProvider);
+                var dbContext = _internalServiceProvider.GetService<Microsoft.EntityFrameworkCore.Infrastructure.ICurrentDbContext>()?.Context;
+
+                foreach (var triggerServiceFactory in triggerServiceFactories)
+                {
+                    yield return triggerServiceFactory.Create(dbContext, serviceProvider);
+                }
             }
         }
     }

src/EntityFrameworkCore.Triggered/Internal/TriggerInstanceFactory.cs

@@ -3,14 +3,15 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EntityFrameworkCore.Triggered.Internal
 {
 
     public interface ITriggerInstanceFactory
     {
-        object Create(IServiceProvider serviceProvider);
+        object Create(DbContext? dbContext, IServiceProvider serviceProvider);
     }
 
     public interface ITriggerInstanceFactory<out TTriggerType> : ITriggerInstanceFactory
@@ -27,14 +28,16 @@ public TriggerInstanceFactory(object? serviceInstance)
             _serviceInstance = serviceInstance;
         }
 
-        public object Create(IServiceProvider serviceProvider)
+        public object Create(DbContext? dbContext, IServiceProvider serviceProvider)
         {
             if (_serviceInstance is not null)
             {
                 return _serviceInstance;
             }
 
-            return ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider, typeof(TTriggerType));
+            var arguments = dbContext is not null ? new object[] { dbContext } : Array.Empty<object>();
+
+            return ActivatorUtilities.CreateInstance(serviceProvider, typeof(TTriggerType), arguments);
         }
     }
 }

test/EntityFrameworkCore.Triggered.Extensions.Tests/EntityFrameworkCore.Triggered.Extensions.Tests.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Linker.ScenarioTests.XUnit" Version="0.2.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCorePackageVersion)" />
   </ItemGroup>
 

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

@@ -57,7 +57,7 @@ public void GetTriggerServiceProvider_WithApplicationDiAndTransform_ReturnsCusto
 
             var dbContext = applicationServiceProvider.GetRequiredService<TestDbContext>();
 
-            var subject = new ApplicationTriggerServiceProviderAccessor(dbContext.GetInfrastructure(), _ => applicationServiceProvider, new NullLogger<ApplicationTriggerServiceProviderAccessor>());
+            var subject = new ApplicationTriggerServiceProviderAccessor(dbContext.GetInfrastructure(), _ => applicationServiceProvider);
             var triggerServiceProvider = subject.GetTriggerServiceProvider();
 
             Assert.Equal(applicationServiceProvider, triggerServiceProvider);

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

@@ -6,7 +6,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using EntityFrameworkCore.Triggered.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 using Xunit.Sdk;
@@ -32,6 +35,31 @@ public SampleTrigger2(TriggerFactory triggerFactory)
             public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => throw new NotImplementedException();
         }
 
+        class SampleTrigger3 : IBeforeSaveTrigger<object>
+        {
+            public SampleTrigger3(SampleDbContext3 dbContext)
+            {
+                DbContext = dbContext;
+            }
+
+            public SampleDbContext3 DbContext { get; }
+
+            public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => throw new NotImplementedException();
+        }
+
+        public class SampleDbContext3 : DbContext
+        {
+            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+            {
+                optionsBuilder
+                    .UseInMemoryDatabase(nameof(SampleDbContext3))
+                    .UseTriggers(triggerOptions => triggerOptions.AddTrigger<SampleTrigger3>());
+                optionsBuilder.ConfigureWarnings(warningOptions => {
+                    warningOptions.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning);
+                });
+            }
+        }
+
         [Fact]
         public void Resolve_FromExternalServiceProvider_FindsType()
         {
@@ -83,5 +111,17 @@ public void Resolve_FromInternalServices_GetsConstructedUsingExternalServiceProv
             Assert.NotNull(trigger);
             Assert.Equal(subject, trigger.TriggerFactory);
         }
+
+        [Fact]
+        public void Resolve_FromInternalServices_AcceptsTheDbContextAsAnArugmnet()
+        {
+            using var dbContext = new SampleDbContext3();
+            var subject = dbContext.GetService<TriggerFactory>();
+
+            var trigger = subject.Resolve(dbContext.GetInfrastructure(), typeof(IBeforeSaveTrigger<object>)).FirstOrDefault() as SampleTrigger3;
+
+            Assert.NotNull(trigger);
+            Assert.Equal(dbContext, trigger.DbContext);
+        }
     }
 }