synboxdev · synboxdev · Sep 7, 2025 · Sep 7, 2025
diff --git a/Hestia.Access/Hestia.Access.csproj b/Hestia.Access/Hestia.Access.csproj
@@ -6,12 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.4.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Hestia.Domain\Hestia.Domain.csproj" />
+    <ProjectReference Include="..\Hestia.Mediator\Hestia.Mediator.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...a.Access/Requests/Authentication/Commands/CreateTokenLog/CreateOrUpdateTokenLogCommand.cs b/...a.Access/Requests/Authentication/Commands/CreateTokenLog/CreateOrUpdateTokenLogCommand.cs
@@ -1,4 +1,5 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
+using Hestia.Mediator.Infrastructure.Types;
 
 namespace Hestia.Access.Requests.Authentication.Commands.CreateTokenLog;
 

diff --git a/Hestia.Access/Requests/Product/Commands/CreateProduct/CreateProductCommand.cs b/Hestia.Access/Requests/Product/Commands/CreateProduct/CreateProductCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Commands.CreateProduct;
 

diff --git a/Hestia.Access/Requests/Product/Commands/DeleteProduct/DeleteProductCommand.cs b/Hestia.Access/Requests/Product/Commands/DeleteProduct/DeleteProductCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Commands.DeleteProduct;
 

diff --git a/Hestia.Access/Requests/Product/Commands/UpdateProduct/UpdateProductCommand.cs b/Hestia.Access/Requests/Product/Commands/UpdateProduct/UpdateProductCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Commands.UpdateProduct;
 

diff --git a/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByCompositeIdQuery.cs b/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByCompositeIdQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Queries.GetExisting;
 

diff --git a/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByExternalIdQuery.cs b/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByExternalIdQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Queries.GetExisting;
 

diff --git a/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByIdQuery.cs b/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByIdQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Queries.GetExisting;
 

diff --git a/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByUserQuery.cs b/Hestia.Access/Requests/Product/Queries/GetExisting/GetExistingProductByUserQuery.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.Product.Queries.GetExisting;
 

diff --git a/Hestia.Access/Requests/Shared/ExecuteSaveChangesAsync.cs b/Hestia.Access/Requests/Shared/ExecuteSaveChangesAsync.cs
@@ -1,4 +1,5 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
+using Hestia.Mediator.Infrastructure.Types;
 
 namespace Hestia.Access.Requests.Shared;
 

diff --git a/Hestia.Access/Requests/User/Commands/CreateUser/CreateApplicationUserCommand.cs b/Hestia.Access/Requests/User/Commands/CreateUser/CreateApplicationUserCommand.cs
@@ -1,5 +1,5 @@
 using Hestia.Domain.Models.Authentication;
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 using Microsoft.AspNetCore.Identity;
 
 namespace Hestia.Access.Requests.User.Commands.CreateUser;

diff --git a/Hestia.Access/Requests/User/Commands/CreateUser/CreateInternalUserCommand.cs b/Hestia.Access/Requests/User/Commands/CreateUser/CreateInternalUserCommand.cs
@@ -1,4 +1,4 @@
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.User.Commands.CreateUser;
 

diff --git a/Hestia.Access/Requests/User/Queries/UserExists/GetExistingUserQuery.cs b/Hestia.Access/Requests/User/Queries/UserExists/GetExistingUserQuery.cs
@@ -1,5 +1,5 @@
 using Hestia.Domain.Models.Authentication;
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.User.Queries.UserExists;
 

diff --git a/Hestia.Access/Requests/User/Queries/ValidateUserLogin/ValidateUserLoginQuery.cs b/Hestia.Access/Requests/User/Queries/ValidateUserLogin/ValidateUserLoginQuery.cs
@@ -1,5 +1,5 @@
 using Hestia.Domain.Models.Authentication;
-using MediatR;
+using Hestia.Mediator.Infrastructure.Messaging;
 
 namespace Hestia.Access.Requests.User.Queries.ValidateUserLogin;
 

diff --git a/Hestia.Api.Tests/Configuration/Application/ConfigureServicesTests.cs b/Hestia.Api.Tests/Configuration/Application/ConfigureServicesTests.cs
@@ -2,17 +2,18 @@
 using Hestia.Api.Configuration.Application;
 using Hestia.Api.Tests.Shared;
 using Hestia.Application.Interfaces.Authentication;
-using Hestia.Application.Interfaces.Infrastructure;
 using Hestia.Application.Interfaces.Product;
 using Hestia.Application.Interfaces.Response;
 using Hestia.Domain.Models.Authentication;
+using Hestia.Mediator.Infrastructure;
+using Hestia.Mediator.Infrastructure.Layers;
 using Hestia.Persistence.Contexts;
-using MediatR;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -33,7 +34,10 @@ public void ConfigureApplicationServices_ShouldRegisterExpectedServices()
         services.AddSingleton<IWebHostEnvironment>(new MockWebHostEnvironment { EnvironmentName = Environments.Development });
         services.AddMemoryCache();
         services.AddDataProtection();
-        services.AddScoped<HestiaContext>();
+        services.AddDbContext<HestiaContext>(options =>
+        {
+            options.UseInMemoryDatabase("TestDb");
+        });
 
         // Add Identity services
         services.AddIdentityCore<ApplicationUser>(options => { })
@@ -67,10 +71,6 @@ public void ConfigureApplicationServices_ShouldRegisterExpectedServices()
         var mediator = serviceProvider.GetService<IMediator>();
         Assert.NotNull(mediator);
 
-        // Check if AutoMapper is registered
-        var mapper = serviceProvider.GetService<AutoMapper.IMapper>();
-        Assert.NotNull(mapper);
-
         // Check if FluentValidation validators are registered
         var validators = serviceProvider.GetServices<IValidator>();
         Assert.NotNull(validators);

diff --git a/Hestia.Api.Tests/Configuration/Extensions/WebApplicationBuilderExtensionsTests.cs b/Hestia.Api.Tests/Configuration/Extensions/WebApplicationBuilderExtensionsTests.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
@@ -35,7 +36,10 @@ public void ConfigureAuthentication_ShouldAddAuthenticationServices()
     {
         // Arrange
         var builder = WebApplication.CreateBuilder();
-        builder.Services.AddScoped<HestiaContext>();
+        builder.Services.AddDbContext<HestiaContext>(options =>
+        {
+            options.UseInMemoryDatabase("TestDb");
+        });
         builder.Environment.EnvironmentName = "Development";
         builder.Configuration.AddJsonFile("appsettings.json");
         builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json");

diff --git a/Hestia.Api.Tests/Configuration/Infrastructure/ConfigureServicesTests.cs b/Hestia.Api.Tests/Configuration/Infrastructure/ConfigureServicesTests.cs
@@ -2,6 +2,7 @@
 using Hestia.Background.Interfaces;
 using Hestia.Background.Tasks;
 using Hestia.Persistence.Contexts;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -47,8 +48,15 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection ConfigureInfrastructuresServices(this IServiceCollection services)
     {
-        services.AddScoped<HestiaContext>();
-        services.AddScoped<RheaContext>();
+        services.AddDbContext<HestiaContext>(options =>
+        {
+            options.UseInMemoryDatabase("TestDb");
+        });
+
+        services.AddDbContext<RheaContext>(options =>
+        {
+            options.UseInMemoryDatabase("TestDb");
+        });
 
         services.AddMemoryCache();
         services.ConfigureBackgroundRunners();

diff --git a/Hestia.Api.Tests/Hestia.Api.Tests.csproj b/Hestia.Api.Tests/Hestia.Api.Tests.csproj
@@ -8,13 +8,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Hestia.Api/Configuration/Application/ConfigureServices.cs b/Hestia.Api/Configuration/Application/ConfigureServices.cs
@@ -1,13 +1,16 @@
 using FluentValidation;
 using Hestia.Application.Handlers.Validation;
 using Hestia.Application.Interfaces.Authentication;
-using Hestia.Application.Interfaces.Infrastructure;
 using Hestia.Application.Interfaces.Product;
 using Hestia.Application.Interfaces.Response;
 using Hestia.Application.Services;
 using Hestia.Application.Services.Authentication;
 using Hestia.Application.Services.Product;
-using MediatR;
+using Hestia.Mediator.Infrastructure;
+using Hestia.Mediator.Infrastructure.Layers;
+using Hestia.Mediator.Infrastructure.Messaging;
+using Hestia.Mediator.Infrastructure.Pipeline;
+using Hestia.Mediator.Services;
 using System.Reflection;
 using System.Text.Json.Serialization;
 
@@ -22,19 +25,12 @@ public static IServiceCollection ConfigureApplicationServices(this IServiceColle
         services.AddApiServices();
         services.AddApplicationServices();
 
-        // MediatR
-        services.AddMediatR();
-
-        // AutoMapper
-        services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
+        // Mediator pattern
+        services.AddMediator();
 
         // FluentValidation validators
         services.AddFluentValidationValidators();
 
-        // MediatR layers
-        services.AddTransient<IAccessLayer, MediatrAdapter>();
-        services.AddTransient<ICoreLayer, MediatrAdapter>();
-
         services.AddControllers().AddJsonOptions(options =>
         {
             options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
@@ -43,16 +39,49 @@ public static IServiceCollection ConfigureApplicationServices(this IServiceColle
         return services;
     }
 
-    public static IServiceCollection AddMediatR(this IServiceCollection services)
+    public static IServiceCollection AddMediator(this IServiceCollection services)
     {
-        services.AddMediatR(cfg =>
-        {
-            cfg.RegisterServicesFromAssemblies(AppDomain.CurrentDomain.GetAssemblies());
-        });
+        // Mediator pattern service
+        services.AddSingleton<IMediator, MediatorService>();
+
+        // Mediator pattern layers
+        services.AddTransient<IAccessLayer, MediatorAdapter>();
+        services.AddTransient<ICoreLayer, MediatorAdapter>();
+
+        services.AddRequestHandlers();
 
         return services;
     }
 
+    private static void AddRequestHandlers(this IServiceCollection services)
+    {
+        var handlerInterfaceType = typeof(IRequestHandler<,>);
+
+        var assemblies = Directory
+            .GetFiles(AppContext.BaseDirectory, "*.dll", SearchOption.TopDirectoryOnly)
+            .Where(file =>
+            {
+                string name = Path.GetFileName(file);
+                // Adjust filter to match your solution's assemblies
+                return name.StartsWith("Hestia.", StringComparison.OrdinalIgnoreCase);
+            })
+            .Select(Assembly.LoadFrom)
+            .ToList();
+
+        var handlerTypes = assemblies
+            .SelectMany(a => a.GetTypes())
+            .Where(t => !t.IsAbstract && !t.IsInterface)
+            .SelectMany(t => t.GetInterfaces(), (type, iface) => new { type, iface })
+            .Where(x => x.iface.IsGenericType &&
+                        x.iface.GetGenericTypeDefinition() == handlerInterfaceType)
+            .ToList();
+
+        foreach (var handler in handlerTypes)
+        {
+            services.AddTransient(handler.iface, handler.type);
+        }
+    }
+
     public static IServiceCollection AddFluentValidationValidators(this IServiceCollection services)
     {
         services.AddValidatorsFromAssembly(Assembly.Load("Hestia.Domain"));

diff --git a/Hestia.Api/Configuration/Infrastructure/ConfigureServices.cs b/Hestia.Api/Configuration/Infrastructure/ConfigureServices.cs
@@ -2,6 +2,7 @@
 using Hestia.Background.Interfaces;
 using Hestia.Background.Tasks;
 using Hestia.Persistence.Contexts;
+using Microsoft.EntityFrameworkCore;
 
 namespace Hestia.Api.Configuration.Infrastructure;
 
@@ -27,8 +28,17 @@ private static IServiceCollection ConfigureBackgroundRunners(this IServiceCollec
 
     private static IServiceCollection ConfigureDbContexts(this IServiceCollection services)
     {
-        services.AddScoped<HestiaContext>();
-        services.AddScoped<RheaContext>();
+        services.AddDbContext<HestiaContext>((serviceProvider, options) =>
+        {
+            var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+            options.UseNpgsql(configuration.GetConnectionString("AuthServer"));
+        });
+
+        services.AddDbContext<RheaContext>((serviceProvider, options) =>
+        {
+            var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+            options.UseNpgsql(configuration.GetConnectionString("DataServer"));
+        });
 
         return services;
     }

diff --git a/Hestia.Api/Controllers/AuthenticationController.cs b/Hestia.Api/Controllers/AuthenticationController.cs
@@ -1,9 +1,9 @@
 using Hestia.Application.Handlers.Authentication.Commands.Login;
 using Hestia.Application.Handlers.Authentication.Commands.Register;
-using Hestia.Application.Interfaces.Infrastructure;
 using Hestia.Application.Models.Authentication.Inbound;
 using Hestia.Application.Models.Authentication.Outbound;
 using Hestia.Application.Models.Shared;
+using Hestia.Mediator.Infrastructure.Layers;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Hestia.Api.Controllers;

diff --git a/Hestia.Api/Controllers/ProductController.cs b/Hestia.Api/Controllers/ProductController.cs
@@ -2,11 +2,11 @@
 using Hestia.Application.Handlers.Product.Commands.DeleteProduct;
 using Hestia.Application.Handlers.Product.Commands.UpdateProduct;
 using Hestia.Application.Handlers.Product.Queries.GetProduct;
-using Hestia.Application.Interfaces.Infrastructure;
 using Hestia.Application.Models.Shared;
 using Hestia.Domain.Models.Product.Inbound.CreateProduct;
 using Hestia.Domain.Models.Product.Inbound.GetProduct;
 using Hestia.Domain.Models.Product.Inbound.UpdateProduct;
+using Hestia.Mediator.Infrastructure.Layers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

diff --git a/Hestia.Api/Hestia.Api.csproj b/Hestia.Api/Hestia.Api.csproj
@@ -14,25 +14,27 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.8" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.8" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.1.0" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\Hestia.Application\Hestia.Application.csproj" />
 		<ProjectReference Include="..\Hestia.Background\Hestia.Background.csproj" />
 		<ProjectReference Include="..\Hestia.Domain\Hestia.Domain.csproj" />
+		<ProjectReference Include="..\Hestia.Mediator\Hestia.Mediator.csproj" />
 		<ProjectReference Include="..\Hestia.Persistence\Hestia.Persistence.csproj" />
 	</ItemGroup>
 

diff --git a/...cation/Inbound/ApplicationUserLoginDto.cs → ...cation/Inbound/ApplicationUserLoginDto.cs b/...cation/Inbound/ApplicationUserLoginDto.cs → ...cation/Inbound/ApplicationUserLoginDto.cs
diff --git a/...ion/Inbound/ApplicationUserRegisterDto.cs → ...ion/Inbound/ApplicationUserRegisterDto.cs b/...ion/Inbound/ApplicationUserRegisterDto.cs → ...ion/Inbound/ApplicationUserRegisterDto.cs
diff --git a/...nd/ApplicationUserRegisterDtoValidator.cs → ...nd/ApplicationUserRegisterDtoValidator.cs b/...nd/ApplicationUserRegisterDtoValidator.cs → ...nd/ApplicationUserRegisterDtoValidator.cs
diff --git a/...tbound/ApplicationUserLoginResponseDto.cs → ...tbound/ApplicationUserLoginResponseDto.cs b/...tbound/ApplicationUserLoginResponseDto.cs → ...tbound/ApplicationUserLoginResponseDto.cs
diff --git a/...und/ApplicationUserRegisterResponseDto.cs → ...und/ApplicationUserRegisterResponseDto.cs b/...und/ApplicationUserRegisterResponseDto.cs → ...und/ApplicationUserRegisterResponseDto.cs