Fixed last broken test

Author: koenbeuk

src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs

@@ -127,6 +127,7 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
 
             var serviceDescriptor = serviceCollection.FirstOrDefault(x => x.ServiceType == typeof(IDbContextFactory<TContext>));
 
+#if EFCORETRIGGERED2
             if (serviceDescriptor?.ImplementationType != null)
             {
                 var triggeredFactoryType = typeof(TriggeredDbContextFactory<,>).MakeGenericType(typeof(TContext), serviceDescriptor.ImplementationType);
@@ -143,13 +144,20 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
                     lifetime: ServiceLifetime.Scoped
                 ));
             }
-            else if (serviceDescriptor?.ImplementationFactory != null)
+#elif EFCORETRIGGERED3
+            if (serviceDescriptor?.ImplementationFactory != null)
             {
-                throw new NotImplementedException();
-            }
+                var triggeredFactoryType = typeof(TriggeredDbContextFactory<>).MakeGenericType(typeof(TContext));
 
+                serviceCollection.Replace(ServiceDescriptor.Describe(
+                    serviceType: typeof(IDbContextFactory<TContext>),
+                    implementationFactory: serviceProvider => ActivatorUtilities.CreateInstance(serviceProvider, triggeredFactoryType, serviceDescriptor.ImplementationFactory),
+                    lifetime: ServiceLifetime.Scoped
+                ));
+            }
+#endif
             return serviceCollection;
         }
-#endif
     }
 }
+#endif

src/EntityFrameworkCore.Triggered/Internal/TriggeredDbContextFactory.cs

@@ -33,5 +33,34 @@ public TContext CreateDbContext()
             return context;
         }
     }
+    
+    public sealed class TriggeredDbContextFactory<TContext> : IDbContextFactory<TContext>
+        where TContext : DbContext
+    {
+        readonly Func<IServiceProvider, IDbContextFactory<TContext>> _contextFactoryFactory;
+        readonly IServiceProvider _serviceProvider;
+
+        public TriggeredDbContextFactory(Func<IServiceProvider, IDbContextFactory<TContext>> contextFactoryFactory, IServiceProvider serviceProvider)
+        {
+            _contextFactoryFactory = contextFactoryFactory;
+            _serviceProvider = serviceProvider;
+        }
+
+        public TContext CreateDbContext()
+        {
+            var contextFactory = _contextFactoryFactory(_serviceProvider);
+            var context = contextFactory.CreateDbContext();
+            Debug.Assert(context is not null);
+
+            var applicationTriggerServiceProviderAccessor = context.GetService<ApplicationTriggerServiceProviderAccessor>();
+            if (applicationTriggerServiceProviderAccessor != null)
+            {
+                applicationTriggerServiceProviderAccessor.SetTriggerServiceProvider(new HybridServiceProvider(_serviceProvider, context));
+            }
+
+            return context;
+        }
+    }
+
 #endif
 }