Simplify command and query registration

fredimachado · Sep 28, 2023 · c0d4254 · c0d4254
1 parent 007b9c6
commit c0d4254
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Admin/NCafe.Admin.Api/Program.cs b/src/Admin/NCafe.Admin.Api/Program.cs
@@ -10,9 +10,9 @@
 
 // Add services to the container.
 builder.Services.AddEventStoreRepository(builder.Configuration)
-                .AddCommandHandlers(typeof(CreateProduct).Assembly)
+                .AddCommandHandlers<CreateProduct>()
                 .AddCommandHandlerLogger()
-                .AddQueryHandlers(typeof(CreateProduct).Assembly);
+                .AddQueryHandlers<CreateProduct>();
 
 builder.Services.AddInMemoryReadModelRepository<Product>()
                 .AddEventStoreProjectionService<Product>()

diff --git a/src/Barista/NCafe.Barista.Api/Program.cs b/src/Barista/NCafe.Barista.Api/Program.cs
@@ -13,9 +13,9 @@
 
 // Add services to the container.
 builder.Services.AddEventStoreRepository(builder.Configuration)
-                .AddCommandHandlers(typeof(PlaceOrder).Assembly)
+                .AddCommandHandlers<PlaceOrder>()
                 .AddCommandHandlerLogger()
-                .AddQueryHandlers(typeof(PlaceOrder).Assembly);
+                .AddQueryHandlers<PlaceOrder>();
 
 builder.Services.AddInMemoryReadModelRepository<BaristaOrder>()
                 .AddEventStoreProjectionService<BaristaOrder>()

diff --git a/src/Cashier/NCafe.Cashier.Api/Program.cs b/src/Cashier/NCafe.Cashier.Api/Program.cs
@@ -10,9 +10,9 @@
 
 // Add services to the container.
 builder.Services.AddEventStoreRepository(builder.Configuration)
-                .AddCommandHandlers(typeof(PlaceOrder).Assembly)
+                .AddCommandHandlers<PlaceOrder>()
                 .AddCommandHandlerLogger()
-                .AddQueryHandlers(typeof(PlaceOrder).Assembly);
+                .AddQueryHandlers<PlaceOrder>();
 
 builder.Services.AddInMemoryReadModelRepository<Product>()
                 .AddEventStoreProjectionService<Product>()

diff --git a/src/Common/NCafe.Infrastructure/DependencyRegistration.cs b/src/Common/NCafe.Infrastructure/DependencyRegistration.cs
@@ -41,23 +41,23 @@ public static IServiceCollection AddEventStoreProjectionService<TModel>(this ISe
         return services;
     }
 
-    public static IServiceCollection AddCommandHandlers(this IServiceCollection services, Assembly assembly)
+    public static IServiceCollection AddCommandHandlers<T>(this IServiceCollection services)
     {
         services.AddSingleton<ICommandDispatcher, CommandDispatcher>();
 
-        services.Scan(s => s.FromAssemblies(assembly)
+        services.Scan(s => s.FromAssemblies(typeof(T).Assembly)
             .AddClasses(c => c.AssignableTo(typeof(ICommandHandler<>)))
             .AsImplementedInterfaces()
             .WithScopedLifetime());
 
         return services;
     }
 
-    public static IServiceCollection AddQueryHandlers(this IServiceCollection services, Assembly assembly)
+    public static IServiceCollection AddQueryHandlers<T>(this IServiceCollection services)
     {
         services.AddSingleton<IQueryDispatcher, QueryDispatcher>();
 
-        services.Scan(s => s.FromAssemblies(assembly)
+        services.Scan(s => s.FromAssemblies(typeof(T).Assembly)
             .AddClasses(c => c.AssignableTo(typeof(IQueryHandler<,>)))
             .AsImplementedInterfaces()
             .WithScopedLifetime());