Add tests and fix Command with response (#3)

Sergi0Martin · web-flow · commit 810e841bcf85 · 2025-04-13T02:11:01.000+02:00
* Add middleware support (#1) Add functionality for configuring and executing custom middlewares before or after commands. * update example * update example * Add tests and fix Command with response Command with response when middleware configured was not working properly
diff --git a/OpenMediator.sln b/OpenMediator.sln
@@ -14,6 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{18DC
 		.github\workflows\open-mediator-nuget-package.yml = .github\workflows\open-mediator-nuget-package.yml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{00CDF08F-6557-44E0-9B54-D0FC0CB1879A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMediator.Integration.Test", "test\OpenMediator.Integration.Test\OpenMediator.Integration.Test.csproj", "{D06610C3-70D7-48FD-9075-A40CA685B58A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMediator.Shared.Integration.Test", "test\OpenMediator.Shared.Integration.Test\OpenMediator.Shared.Integration.Test.csproj", "{2436B77B-FA64-4DF2-A93D-DA175B411C44}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,12 +30,22 @@ Global
 		{A45D5C4D-8957-4619-868F-6B6F7AC4E42A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A45D5C4D-8957-4619-868F-6B6F7AC4E42A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A45D5C4D-8957-4619-868F-6B6F7AC4E42A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D06610C3-70D7-48FD-9075-A40CA685B58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D06610C3-70D7-48FD-9075-A40CA685B58A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D06610C3-70D7-48FD-9075-A40CA685B58A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D06610C3-70D7-48FD-9075-A40CA685B58A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2436B77B-FA64-4DF2-A93D-DA175B411C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2436B77B-FA64-4DF2-A93D-DA175B411C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2436B77B-FA64-4DF2-A93D-DA175B411C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2436B77B-FA64-4DF2-A93D-DA175B411C44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{A45D5C4D-8957-4619-868F-6B6F7AC4E42A} = {185D813C-7310-4B27-A1B8-5DE91B7084FA}
 		{18DC3938-D752-44C5-A4A3-23BED5C157C9} = {8F49E2C3-A3E4-4114-A8D6-7FF7CC4E66EC}
+		{D06610C3-70D7-48FD-9075-A40CA685B58A} = {00CDF08F-6557-44E0-9B54-D0FC0CB1879A}
+		{2436B77B-FA64-4DF2-A93D-DA175B411C44} = {00CDF08F-6557-44E0-9B54-D0FC0CB1879A}
 	EndGlobalSection
 EndGlobal
diff --git a/examples/WebApplicationAPI/Controllers/UserController.cs b/examples/WebApplicationAPI/Controllers/UserController.cs
@@ -1,6 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenMediator.Buses;
-using WebApplicationAPI.UseCases;
+using WebApplicationAPI.Domain;
+using WebApplicationAPI.UseCases.CreateUser;
+using WebApplicationAPI.UseCases.GetUser;
+using WebApplicationAPI.ViewModels;
 
 namespace WebApplicationAPI.Controllers;
 
@@ -13,7 +16,14 @@ public async Task<IActionResult> CreateUser()
     {
         var command = new CreateUserCommand(1, "UserTest");
         await _mediator.SendAsync(command);
-
         return Ok();
     }
+
+    [HttpGet("{id:int}")]
+    public async Task<IActionResult> GetUser(int id)
+    {
+        var command = new GetUserCommand(id);
+        var user = await _mediator.SendAsync<GetUserCommand, User>(command);
+        return Ok(UserViewModel.FromUser(user));
+    }
 }
diff --git a/examples/WebApplicationAPI/Domain/User.cs b/examples/WebApplicationAPI/Domain/User.cs
@@ -0,0 +1,15 @@
+﻿namespace WebApplicationAPI.Domain;
+
+public sealed class User
+{
+    public User(int id, string name, string email)
+    {
+        Id = id;
+        Name = name;
+        Email = email;
+    }
+
+    public int Id { get; private set; }
+    public string Name { get; private set; }
+    public string Email { get; private set; } = string.Empty;
+}
diff --git a/examples/WebApplicationAPI/MediatorMiddleware/CustomMediatorMiddleware.cs b/examples/WebApplicationAPI/MediatorMiddleware/CustomMediatorMiddleware.cs
@@ -17,6 +17,5 @@ public async Task ExecuteAsync<TCommand>(TCommand command, Func<Task> next)
         // Do something after the command
         _logger.LogInformation("=========> After command: {Command}", command.GetType().Name);
         Task.Delay(1000).Wait();
-
     }
 }
diff --git a/examples/WebApplicationAPI/UseCases/CreateUser/CreateUserCommand.cs b/examples/WebApplicationAPI/UseCases/CreateUser/CreateUserCommand.cs
@@ -1,5 +1,5 @@
 ﻿using OpenMediator;
 
-namespace WebApplicationAPI.UseCases;
+namespace WebApplicationAPI.UseCases.CreateUser;
 
 public record CreateUserCommand(int Id, string Name) : ICommand;
diff --git a/examples/WebApplicationAPI/UseCases/CreateUser/CreateUserCommandHandler.cs b/examples/WebApplicationAPI/UseCases/CreateUser/CreateUserCommandHandler.cs
@@ -1,6 +1,6 @@
 ﻿using OpenMediator;
 
-namespace WebApplicationAPI.UseCases;
+namespace WebApplicationAPI.UseCases.CreateUser;
 
 public record CreateUserCommandHandler(ILogger<CreateUserCommandHandler> _logger) : ICommandHandler<CreateUserCommand>
 {
diff --git a/examples/WebApplicationAPI/UseCases/GetUser/GetUserCommand.cs b/examples/WebApplicationAPI/UseCases/GetUser/GetUserCommand.cs
@@ -0,0 +1,6 @@
+﻿using OpenMediator;
+using WebApplicationAPI.Domain;
+
+namespace WebApplicationAPI.UseCases.GetUser;
+
+public record GetUserCommand(int Id) : ICommand<User>;
diff --git a/examples/WebApplicationAPI/UseCases/GetUser/GetUserCommandHandler.cs b/examples/WebApplicationAPI/UseCases/GetUser/GetUserCommandHandler.cs
@@ -0,0 +1,19 @@
+﻿using OpenMediator;
+using WebApplicationAPI.Domain;
+
+namespace WebApplicationAPI.UseCases.GetUser;
+
+public record GetUserCommandHandler(ILogger<GetUserCommandHandler> _logger) : ICommandHandler<GetUserCommand, User>
+{
+    public async Task<User> HandleAsync(GetUserCommand command)
+    {
+        // Simulate some work
+        _logger.LogInformation("=========> Handling command: {Command}", command.GetType().Name);
+        await Task.Delay(1000);
+
+        return new User(
+            id: 1,
+            name: "Ralph",
+            email: "ralp@company.com");
+    }
+}
diff --git a/examples/WebApplicationAPI/ViewModels/UserViewModel.cs b/examples/WebApplicationAPI/ViewModels/UserViewModel.cs
@@ -0,0 +1,11 @@
+﻿using WebApplicationAPI.Domain;
+
+namespace WebApplicationAPI.ViewModels;
+
+public sealed record UserViewModel(
+    int Id,
+    string Name
+)
+{
+    public static UserViewModel FromUser(User user) => new(user.Id, user.Name);
+}
diff --git a/examples/WebApplicationAPI/WebApplicationAPI.http b/examples/WebApplicationAPI/WebApplicationAPI.http
@@ -3,3 +3,8 @@
 POST {{WebApplicationAPI_HostAddress}}/api/user
 
 ###
+
+@id=99
+GET {{WebApplicationAPI_HostAddress}}/api/user/{{id}}
+
+###
diff --git a/src/Middlewares/IMediatorMiddleware.cs b/src/Middlewares/IMediatorMiddleware.cs
@@ -3,4 +3,6 @@ namespace OpenMediator.Middlewares;
 public interface IMediatorMiddleware
 {
     Task ExecuteAsync<TCommand>(TCommand command, Func<Task> next) where TCommand : ICommand;
+
+    Task ExecuteAsync<TCommand, TResponse>(TCommand command, Func<Task<TResponse>> next) where TCommand : ICommand<TResponse>;
 }
diff --git a/src/OpenMediator.csproj b/src/OpenMediator.csproj
@@ -11,7 +11,7 @@
 		<PackageTags>mediator;mediator-pattern</PackageTags>
 		<Description>Alternative for those who do not want to pay for a mediator implementation.</Description>
 		<Authors>Sergio Martin</Authors>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<RepositoryUrl>https://github.com/Sergi0Martin/OpenMediator</RepositoryUrl>
 		<PackageProjectUrl>https://sergi0martin.github.io/OpenMediator</PackageProjectUrl>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -21,6 +21,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<Folder Include="Properties\" />
 		<Folder Include="Resources\" />
 		<None Include="..\README.md">
 			<Pack>True</Pack>
diff --git a/test/OpenMediator.Integration.Test/Commands/CommandResponseTest.cs b/test/OpenMediator.Integration.Test/Commands/CommandResponseTest.cs
@@ -0,0 +1,44 @@
+﻿using Microsoft.Extensions.DependencyInjection;
+using OpenMediator.Buses;
+using OpenMediator.Shared.Integration.Test;
+using OpenMediator.Shared.Integration.Test.Commands;
+
+namespace OpenMediator.Integration.Test.Commands;
+
+public sealed class CustomMediatorMiddlewareTest
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IMediatorBus _mediator;
+    private TestDependency _testDependency;
+
+    public CustomMediatorMiddlewareTest()
+    {
+        _testDependency = new TestDependency();
+        var services = new ServiceCollection();
+        services.AddOpenMediator(config =>
+        {
+            config.RegisterCommandsFromAssembly(typeof(GetUserCommandHandler).Assembly);
+        });
+        services.AddSingleton(_testDependency);
+        _serviceProvider = services.BuildServiceProvider();
+        _mediator = _serviceProvider.GetService<IMediatorBus>()!;
+    }
+
+    [Fact]
+    public async Task Send_Command_With_Response_Works()
+    {
+        // Arrange
+        var command = new GetUserCommand(1);
+
+        // Act
+        var result = await _mediator.SendAsync<GetUserCommand, User>(command);
+
+        // Assert
+        var expectedResult = new User(
+            Id: 1,
+            Name: "Ralph",
+            Email: "ralp@company.com");
+        Assert.Equal(result, expectedResult);
+        Assert.True(_testDependency.Called);
+    }
+}
diff --git a/test/OpenMediator.Integration.Test/Commands/CommandTest.cs b/test/OpenMediator.Integration.Test/Commands/CommandTest.cs
@@ -0,0 +1,39 @@
+﻿using Microsoft.Extensions.DependencyInjection;
+using OpenMediator.Buses;
+using OpenMediator.Shared.Integration.Test;
+using OpenMediator.Shared.Integration.Test.Commands;
+
+namespace OpenMediator.Integration.Test.Commands;
+
+public sealed class CommandTest
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IMediatorBus _mediator;
+    private TestDependency _testDependency;
+
+    public CommandTest()
+    {
+        _testDependency = new TestDependency();
+        var services = new ServiceCollection();
+        services.AddOpenMediator(config =>
+        {
+            config.RegisterCommandsFromAssembly(typeof(GetUserCommandHandler).Assembly);
+        });
+        services.AddSingleton(_testDependency);
+        _serviceProvider = services.BuildServiceProvider();
+        _mediator = _serviceProvider.GetService<IMediatorBus>()!;
+    }
+
+    [Fact]
+    public async Task Send_Command_Works()
+    {
+        // Arrange
+        var command = new CreateUserCommand(1, "UserTest");
+
+        // Act
+        await _mediator.SendAsync(command);
+
+        // Assert
+        Assert.True(_testDependency.Called);
+    }
+}
diff --git a/test/OpenMediator.Integration.Test/MediatorMiddleware/CustomMediatorMiddlewareTest.cs b/test/OpenMediator.Integration.Test/MediatorMiddleware/CustomMediatorMiddlewareTest.cs
@@ -0,0 +1,46 @@
+﻿using Microsoft.Extensions.DependencyInjection;
+using OpenMediator.Buses;
+using OpenMediator.Shared.Integration.Test;
+using OpenMediator.Shared.Integration.Test.Commands;
+
+namespace OpenMediator.Integration.Test.MediatorMiddleware;
+
+public sealed class CustomMediatorMiddlewareTest
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IMediatorBus _mediator;
+    private TestDependency _testDependency;
+
+    public CustomMediatorMiddlewareTest()
+    {
+        _testDependency = new TestDependency();
+        var services = new ServiceCollection();
+        services.AddOpenMediator(config =>
+        {
+            config.RegisterCommandsFromAssembly(typeof(GetUserCommandHandler).Assembly);
+            config.RegisterMiddleware<CustomMediatorMiddleware>();
+        });
+        services.AddSingleton(_testDependency);
+        _serviceProvider = services.BuildServiceProvider();
+        _mediator = _serviceProvider.GetService<IMediatorBus>()!;
+    }
+
+    [Fact]
+    public async Task Send_Command_With_Response_Works()
+    {
+        // Arrange
+        var command = new GetUserCommand(1);
+
+        // Act
+        var result = await _mediator.SendAsync<GetUserCommand, User>(command);
+
+        // Assert
+        var expectedResult = new User(
+            Id: 1,
+            Name: "Ralph",
+            Email: "ralp@company.com");
+        Assert.Equal(result, expectedResult);
+        Assert.True(_testDependency.Called);
+        Assert.Equal(3, _testDependency.Counter);
+    }
+}
diff --git a/test/OpenMediator.Integration.Test/OpenMediator.Integration.Test.csproj b/test/OpenMediator.Integration.Test/OpenMediator.Integration.Test.csproj
@@ -0,0 +1,33 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\OpenMediator.csproj" />
+    <ProjectReference Include="..\OpenMediator.Shared.Integration.Test\OpenMediator.Shared.Integration.Test.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/OpenMediator.Shared.Integration.Test/Commands/CreateUserCommand.cs b/test/OpenMediator.Shared.Integration.Test/Commands/CreateUserCommand.cs
@@ -0,0 +1,12 @@
+﻿namespace OpenMediator.Shared.Integration.Test.Commands;
+
+public record CreateUserCommand(int Id, string Name) : ICommand;
+
+public record CreateUserCommandHandler(TestDependency testDependency) : ICommandHandler<CreateUserCommand>
+{
+    public async Task HandleAsync(CreateUserCommand command)
+    {
+        await Task.Delay(500);
+        testDependency.Called = true;
+    }
+}
diff --git a/test/OpenMediator.Shared.Integration.Test/Commands/GetUserCommand.cs b/test/OpenMediator.Shared.Integration.Test/Commands/GetUserCommand.cs
@@ -0,0 +1,20 @@
+﻿namespace OpenMediator.Shared.Integration.Test.Commands;
+
+public record GetUserCommand(int Id) : ICommand<User>;
+
+public record User(int Id, string Name, string Email);
+
+public record GetUserCommandHandler(TestDependency testDependency) : ICommandHandler<GetUserCommand, User>
+{
+    public async Task<User> HandleAsync(GetUserCommand command)
+    {
+        await Task.Delay(500);
+        testDependency.Called = true;
+        testDependency.Counter++;
+
+        return new User(
+            Id: 1,
+            Name: "Ralph",
+            Email: "ralp@company.com");
+    }
+}
diff --git a/test/OpenMediator.Shared.Integration.Test/CustomMediatorMiddleware.cs b/test/OpenMediator.Shared.Integration.Test/CustomMediatorMiddleware.cs
diff --git a/test/OpenMediator.Shared.Integration.Test/OpenMediator.Shared.Integration.Test.csproj b/test/OpenMediator.Shared.Integration.Test/OpenMediator.Shared.Integration.Test.csproj
diff --git a/test/OpenMediator.Shared.Integration.Test/TestDependency.cs b/test/OpenMediator.Shared.Integration.Test/TestDependency.cs

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,5 @@ public async Task ExecuteAsync<TCommand>(TCommand command, Func<Task> next)`
`17`	`17`	`// Do something after the command`
`18`	`18`	`_logger.LogInformation("=========> After command: {Command}", command.GetType().Name);`
`19`	`19`	`Task.Delay(1000).Wait();`
`20`		`-`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using OpenMediator;`
`2`	`2`
`3`		`-namespace WebApplicationAPI.UseCases;`
	`3`	`+namespace WebApplicationAPI.UseCases.CreateUser;`
`4`	`4`
`5`	`5`	`public record CreateUserCommandHandler(ILogger<CreateUserCommandHandler> _logger) : ICommandHandler<CreateUserCommand>`
`6`	`6`	`{`