refactor: moving behaviors implementation to infra

src/1-BuildingBlocks/Application/Behaviors/BehaviorExtensions.cs → src/1-BuildingBlocks/Infrastructure/Behaviors/BehaviorExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using TaskoMask.BuildingBlocks.Domain.Events;
 
-namespace TaskoMask.BuildingBlocks.Application.Behaviors;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Behaviors;
 
 public static class BehaviorExtensions
 {

src/1-BuildingBlocks/Application/Behaviors/CachingBehavior.cs → src/1-BuildingBlocks/Infrastructure/Behaviors/CachingBehavior.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using TaskoMask.BuildingBlocks.Application.Queries;
 
-namespace TaskoMask.BuildingBlocks.Application.Behaviors;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Behaviors;
 
 /// <summary>
 /// Caching response for queries that are mareked by ICacheableQuery

src/1-BuildingBlocks/Application/Behaviors/EventStoringBehavior.cs → src/1-BuildingBlocks/Infrastructure/Behaviors/EventStoringBehavior.cs

@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using TaskoMask.BuildingBlocks.Domain.Events;
 
-namespace TaskoMask.BuildingBlocks.Application.Behaviors;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Behaviors;
 
 /// <summary>
 /// Each command must have at least one event to save its changes in event store

src/1-BuildingBlocks/Application/Behaviors/ValidationBehaviour.cs → src/1-BuildingBlocks/Infrastructure/Behaviors/ValidationBehaviour.cs

@@ -8,7 +8,7 @@
 using TaskoMask.BuildingBlocks.Application.Notifications;
 using TaskoMask.BuildingBlocks.Contracts.Extensions;
 
-namespace TaskoMask.BuildingBlocks.Application.Behaviors;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Behaviors;
 
 /// <summary>
 /// Automatic validation by checking data annotation and fluent validations (if any)
@@ -49,7 +49,7 @@ public async Task<TResponse> Handle(TRequest request, CancellationToken cancella
         var isValidDataAnnotationValidation = ValidateDataAnnotationValidation(request);
 
         if (!isValidFluentValidation || !isValidDataAnnotationValidation)
-            throw new Exceptions.ValidationException();
+            throw new Application.Exceptions.ValidationException();
 
         return await next();
     }

src/1-BuildingBlocks/Application/Exceptions/ExceptionExtensions.cs → src/1-BuildingBlocks/Infrastructure/Exceptions/ExceptionExtensions.cs

@@ -1,7 +1,7 @@
 using MediatR.Pipeline;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace TaskoMask.BuildingBlocks.Application.Exceptions;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Exceptions;
 
 public static class ExceptionExtensions
 {

src/1-BuildingBlocks/Application/Exceptions/ManagedExceptionHandler.cs → src/1-BuildingBlocks/Infrastructure/Exceptions/ManagedExceptionHandler.cs

@@ -6,7 +6,7 @@
 using TaskoMask.BuildingBlocks.Application.Notifications;
 using TaskoMask.BuildingBlocks.Contracts.Exceptions;
 
-namespace TaskoMask.BuildingBlocks.Application.Exceptions;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Exceptions;
 
 /// <summary>
 /// Handle all managed exceptions (DomainException,ApplicationException,ValidationException)

src/1-BuildingBlocks/Application/Exceptions/UnmanagedExceptionHandler.cs → src/1-BuildingBlocks/Infrastructure/Exceptions/UnmanagedExceptionHandler.cs

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using TaskoMask.BuildingBlocks.Application.Notifications;
 
-namespace TaskoMask.BuildingBlocks.Application.Exceptions;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Exceptions;
 
 /// <summary>
 /// Handle all unmanaged exceptions

src/1-BuildingBlocks/Infrastructure/Extensions/InfrastructureExtensions.cs

@@ -1,8 +1,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using TaskoMask.BuildingBlocks.Infrastructure.Behaviors;
 using TaskoMask.BuildingBlocks.Infrastructure.Bus;
 using TaskoMask.BuildingBlocks.Infrastructure.EventSourcing;
+using TaskoMask.BuildingBlocks.Infrastructure.Exceptions;
+using TaskoMask.BuildingBlocks.Infrastructure.Notifications;
 
 namespace TaskoMask.BuildingBlocks.Infrastructure.Extensions;
 
@@ -15,9 +18,14 @@ public static void AddBuildingBlocksInfrastructure(
         this IServiceCollection services,
         IConfiguration configuration,
         Type consumerAssemblyMarkerType,
-        Type handlerAssemblyMarkerType
+        Type handlerAssemblyMarkerType,
+        Type validatorAssemblyMarkerType
     )
     {
+        services.AddApplicationExceptionHandlers();
+        services.AddApplicationBehaviors(validatorAssemblyMarkerType);
+        services.AddDomainNotificationHandler();
+
         services.AddInMemoryBus(handlerAssemblyMarkerType);
         services.AddMessageBus(configuration, consumerAssemblyMarkerType);
         services.AddRedisEventStoreService();

src/1-BuildingBlocks/Application/Notifications/NotificationHandler.cs → src/1-BuildingBlocks/Infrastructure/Notifications/NotificationHandler.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using TaskoMask.BuildingBlocks.Application.Notifications;
 
-namespace TaskoMask.BuildingBlocks.Application.Notifications;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Notifications;
 
 /// <summary>
 ///

src/1-BuildingBlocks/Application/Notifications/NotificationsExtensions.cs → src/1-BuildingBlocks/Infrastructure/Notifications/NotificationsExtensions.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
+using TaskoMask.BuildingBlocks.Application.Notifications;
 
-namespace TaskoMask.BuildingBlocks.Application.Notifications;
+namespace TaskoMask.BuildingBlocks.Infrastructure.Notifications;
 
 public static class NotificationsExtensions
 {

src/2-Services/Boards/Api/Boards.Read.Api/Infrastructure/DI/ModuleExtensions.cs

@@ -1,10 +1,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using TaskoMask.BuildingBlocks.Application.Services;
 using TaskoMask.BuildingBlocks.Infrastructure.Extensions;
 using TaskoMask.BuildingBlocks.Infrastructure.Mapping;
 using TaskoMask.BuildingBlocks.Infrastructure.MongoDB;
-using TaskoMask.Services.Boards.Read.Api.Features.Boards.GetBoardById;
 using TaskoMask.Services.Boards.Read.Api.Infrastructure.DbContext;
 using TaskoMask.Services.Boards.Read.Api.Infrastructure.Mapper;
 
@@ -23,11 +21,10 @@ public static void AddModules(this IServiceCollection services, IConfiguration c
         services.AddBuildingBlocksInfrastructure(
             configuration,
             consumerAssemblyMarkerType: typeof(Program),
-            handlerAssemblyMarkerType: typeof(GetBoardByIdHandler)
+            handlerAssemblyMarkerType: typeof(Program),
+            validatorAssemblyMarkerType: typeof(Program)
         );
 
-        services.AddBuildingBlocksApplication(validatorAssemblyMarkerType: typeof(Program));
-
         services.AddMapper(typeof(MappingProfile));
 
         services.AddMongoDbContext(configuration);

src/2-Services/Boards/Api/Boards.Write.Api/Configuration/HostingExtensions.cs

@@ -17,7 +17,7 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
     {
         builder.AddCustomSerilog();
 
-        builder.Services.AddModules(builder.Configuration, consumerAssemblyMarkerType: typeof(Program));
+        builder.Services.AddModules(builder.Configuration);
 
         builder.Services.AddWebApiPreConfigured(builder.Configuration);
 

src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs

@@ -1,14 +1,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 using TaskoMask.BuildingBlocks.Infrastructure.Extensions;
 using TaskoMask.BuildingBlocks.Infrastructure.MongoDB;
 using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data;
 using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Repositories;
 using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Services;
-using TaskoMask.Services.Boards.Write.Api.Resources;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.CrossCutting.DI;
 
@@ -20,9 +18,14 @@ public static class InfrastructureModule
     /// <summary>
     ///
     /// </summary>
-    public static void AddInfrastructureModule(this IServiceCollection services, IConfiguration configuration, Type consumerAssemblyMarkerType)
+    public static void AddInfrastructureModule(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddBuildingBlocksInfrastructure(configuration, consumerAssemblyMarkerType, handlerAssemblyMarkerType: typeof(ApplicationMessages));
+        services.AddBuildingBlocksInfrastructure(
+            configuration,
+            consumerAssemblyMarkerType: typeof(Program),
+            validatorAssemblyMarkerType: typeof(Program),
+            handlerAssemblyMarkerType: typeof(Program)
+        );
 
         services.AddMongoDbContext(configuration);
 

src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/ModuleExtensions.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.CrossCutting.DI;
 
@@ -12,10 +11,8 @@ public static class ModuleExtensions
     /// <summary>
     ///
     /// </summary>
-    public static void AddModules(this IServiceCollection services, IConfiguration configuration, Type consumerAssemblyMarkerType)
+    public static void AddModules(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddInfrastructureModule(configuration, consumerAssemblyMarkerType);
-
-        services.AddApplicationModule();
+        services.AddInfrastructureModule(configuration);
     }
 }

src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs

@@ -79,7 +79,7 @@ public override IServiceProvider GetServiceProvider(string dbNameSuffix)
             return configuration;
         });
 
-        services.AddModules(configuration, typeof(TestsBaseFixture));
+        services.AddModules(configuration);
 
         var serviceProvider = services.BuildServiceProvider();
 

src/2-Services/Identity/Api/Identity.Api/Configuration/HostingExtensions.cs

@@ -5,7 +5,6 @@
 using TaskoMask.BuildingBlocks.Web.MVC.Configuration.Captcha;
 using TaskoMask.BuildingBlocks.Web.MVC.Configuration.MVC;
 using TaskoMask.BuildingBlocks.Web.MVC.Configuration.Serilog;
-using TaskoMask.Services.Identity.Api.Consumers;
 using TaskoMask.Services.Identity.Api.Infrastructure.CrossCutting.DI;
 
 namespace TaskoMask.Services.Identity.Api.Configuration;
@@ -21,7 +20,7 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
         builder.Services.AddRazorPagesPreConfigured(builder.Configuration);
 
-        builder.Services.AddModules(builder.Configuration, consumerAssemblyMarkerType: typeof(OwnerRegisteredConsumer));
+        builder.Services.AddModules(builder.Configuration);
 
         builder.Services.AddIdentityServer();
 

src/2-Services/Identity/Api/Identity.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs

@@ -6,7 +6,6 @@
 using TaskoMask.Services.Identity.Api.Infrastructure.CrossCutting.AspNetIdentity;
 using TaskoMask.Services.Identity.Api.Infrastructure.CrossCutting.Mapper;
 using TaskoMask.Services.Identity.Api.Infrastructure.Data.DbContext;
-using TaskoMask.Services.Identity.Api.UseCases.RegisterUser;
 
 namespace TaskoMask.Services.Identity.Api.Infrastructure.CrossCutting.DI;
 
@@ -18,9 +17,14 @@ public static class InfrastructureModule
     /// <summary>
     ///
     /// </summary>
-    public static void AddInfrastructureModule(this IServiceCollection services, IConfiguration configuration, Type consumerAssemblyMarkerType)
+    public static void AddInfrastructureModule(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddBuildingBlocksInfrastructure(configuration, consumerAssemblyMarkerType, handlerAssemblyMarkerType: typeof(RegisterUserUseCase));
+        services.AddBuildingBlocksInfrastructure(
+            configuration,
+            consumerAssemblyMarkerType: typeof(Program),
+            handlerAssemblyMarkerType: typeof(Program),
+            validatorAssemblyMarkerType: typeof(Program)
+        );
 
         services.AddMapper(typeof(MappingProfile));
 

src/2-Services/Identity/Api/Identity.Api/Infrastructure/CrossCutting/DI/ModuleExtensions.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace TaskoMask.Services.Identity.Api.Infrastructure.CrossCutting.DI;
 
@@ -12,10 +11,8 @@ public static class ModuleExtensions
     /// <summary>
     ///
     /// </summary>
-    public static void AddModules(this IServiceCollection services, IConfiguration configuration, Type consumerAssemblyMarkerType)
+    public static void AddModules(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddInfrastructureModule(configuration, consumerAssemblyMarkerType);
-
-        services.AddApplicationModule();
+        services.AddInfrastructureModule(configuration);
     }
 }

src/2-Services/Identity/Tests/Identity.Tests.Integration/Fixtures/TestsBaseFixture.cs

@@ -50,7 +50,7 @@ public override IServiceProvider GetServiceProvider(string dbNameSuffix)
 
         services.AddLogging();
 
-        services.AddModules(configuration, typeof(TestsBaseFixture));
+        services.AddModules(configuration);
 
         var serviceProvider = services.BuildServiceProvider();