Have to register the Command Processor as scoped #14

BrighterCommand · Dec 19, 2018 · 5adc6b2 · 5adc6b2
1 parent aa0dba3
commit 5adc6b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Tests/AssemblyResolutionHandlerLifetimeScopedAndMapperLifetimeSingletonTests.cs b/Tests/AssemblyResolutionHandlerLifetimeScopedAndMapperLifetimeSingletonTests.cs
@@ -41,7 +41,7 @@ public void ShouldHaveRegistered12Correctly()
         [Fact]
         public void ShouldHaveCommandProcessorRegisteredCorrectly()
         {
-            TestRegistration(typeof(IAmACommandProcessor), ServiceLifetime.Singleton);
+            TestRegistration(typeof(IAmACommandProcessor), ServiceLifetime.Scoped);
         }
 
         [Fact]

diff --git a/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs b/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs
@@ -17,7 +17,10 @@ public static IBrighterHandlerBuilder AddBrighter(this IServiceCollection servic
             var subscriberRegistry = new ServiceCollectionSubscriberRegistry(services, options.HandlerLifetime);
             services.AddSingleton<ServiceCollectionSubscriberRegistry>(subscriberRegistry);
 
-            services.AddSingleton<IAmACommandProcessor>(BuildCommandProcessor);
+            if (options.HandlerLifetime == ServiceLifetime.Scoped)
+                services.AddScoped<IAmACommandProcessor>(BuildCommandProcessor);
+            else
+                services.AddSingleton<IAmACommandProcessor>(BuildCommandProcessor);
 
             return new ServiceCollectionBrighterBuilder(services, subscriberRegistry);
         }

diff --git a/...e.Brighter.ServiceActivator.Extensions.DependencyInjection/ServiceCollectionExtensions.cs b/...e.Brighter.ServiceActivator.Extensions.DependencyInjection/ServiceCollectionExtensions.cs
@@ -20,7 +20,10 @@ public static IServiceActivatorBuilder AddServiceActivator(
             var subscriberRegistry = new ServiceCollectionSubscriberRegistry(services, options.HandlerLifetime);
             services.AddSingleton<ServiceCollectionSubscriberRegistry>(subscriberRegistry);
 
-            services.AddSingleton<IAmACommandProcessor>(BuildCommandProcessor);
+            if (options.HandlerLifetime == ServiceLifetime.Scoped)
+                services.AddScoped<IAmACommandProcessor>(BuildCommandProcessor);
+            else
+                services.AddSingleton<IAmACommandProcessor>(BuildCommandProcessor);
 
             var mapperRegistry = new ServiceCollectionMessageMapperRegistry(services, options.MapperLifetime);
             services.AddSingleton<ServiceCollectionMessageMapperRegistry>(mapperRegistry);
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ public void ShouldHaveRegistered12Correctly() @@
             [Fact]
             public void ShouldHaveCommandProcessorRegisteredCorrectly()
             {
-                TestRegistration(typeof(IAmACommandProcessor), ServiceLifetime.Singleton);
+                TestRegistration(typeof(IAmACommandProcessor), ServiceLifetime.Scoped);
             }
             [Fact]
@@ Expand Down @@