diff --git a/Baguette.Extensions.AspNetCore.sln b/Baguette.Extensions.AspNetCore.sln index c9944ec..b5a4e96 100644 --- a/Baguette.Extensions.AspNetCore.sln +++ b/Baguette.Extensions.AspNetCore.sln @@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baguette.Extensions.AspNetCore.Mediator", "src\Baguette.Extensions.AspNetCore.Mediator\Baguette.Extensions.AspNetCore.Mediator.csproj", "{9C7970CB-13DB-4016-A9D4-B52C8788BFBC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baguette.Extensions.AspNetCore.Mediator.MediatR", "src\Baguette.Extensions.AspNetCore.Mediator.MediatR\Baguette.Extensions.AspNetCore.Mediator.MediatR.csproj", "{2A0764B1-6C7D-4729-8A10-071897166AE4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -12,5 +14,9 @@ Global {9C7970CB-13DB-4016-A9D4-B52C8788BFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C7970CB-13DB-4016-A9D4-B52C8788BFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C7970CB-13DB-4016-A9D4-B52C8788BFBC}.Release|Any CPU.Build.0 = Release|Any CPU + {2A0764B1-6C7D-4729-8A10-071897166AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A0764B1-6C7D-4729-8A10-071897166AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A0764B1-6C7D-4729-8A10-071897166AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A0764B1-6C7D-4729-8A10-071897166AE4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/Baguette.Extensions.AspNetCore.Mediator.MediatR.csproj b/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/Baguette.Extensions.AspNetCore.Mediator.MediatR.csproj new file mode 100644 index 0000000..6309db4 --- /dev/null +++ b/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/Baguette.Extensions.AspNetCore.Mediator.MediatR.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/MediatRService.cs b/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/MediatRService.cs new file mode 100644 index 0000000..0a146b3 --- /dev/null +++ b/src/Baguette.Extensions.AspNetCore.Mediator.MediatR/MediatRService.cs @@ -0,0 +1,27 @@ +using System.Diagnostics.CodeAnalysis; +using MediatR; + +namespace Baguette.Extensions.AspNetCore.Mediator.MediatR; + +public class MediatRService(ISender sender) : IMediatorService +{ + public async ValueTask TrySendAsync(object? value, CancellationToken cancellationToken = default) + { + if (value is not IRequest request) + return false; + + await sender.Send(request, cancellationToken); + + return true; + } + + public async ValueTask<(bool IsSucess, TResponse? Response)> TrySendAsync(object? value, CancellationToken cancellationToken = default) + { + if (value is not IRequest request) + return (false, default); + + var response = await sender.Send(request, cancellationToken); + + return (true, response); + } +} \ No newline at end of file diff --git a/src/Baguette.Extensions.AspNetCore.Mediator/IMediatorService.cs b/src/Baguette.Extensions.AspNetCore.Mediator/IMediatorService.cs index 8373de3..9e722ee 100644 --- a/src/Baguette.Extensions.AspNetCore.Mediator/IMediatorService.cs +++ b/src/Baguette.Extensions.AspNetCore.Mediator/IMediatorService.cs @@ -4,11 +4,7 @@ namespace Baguette.Extensions.AspNetCore.Mediator; public interface IMediatorService { - bool TryGetRequest(object? value, [NotNullWhen(true)] out IRequest? request); + ValueTask TrySendAsync(object? value, CancellationToken cancellationToken = default); - bool TryGetRequest(object? value, [NotNullWhen(true)] out IRequest? request); - - ValueTask SendAsync(IRequest request, CancellationToken cancellationToken = default); - - ValueTask SendAsync(IRequest request, CancellationToken cancellationToken = default); + ValueTask<(bool IsSucess, TResponse? Response)> TrySendAsync(object? value, CancellationToken cancellationToken = default); } \ No newline at end of file diff --git a/src/Baguette.Extensions.AspNetCore.Mediator/IRequest.cs b/src/Baguette.Extensions.AspNetCore.Mediator/IRequest.cs deleted file mode 100644 index 97113cd..0000000 --- a/src/Baguette.Extensions.AspNetCore.Mediator/IRequest.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Baguette.Extensions.AspNetCore.Mediator; - -public interface IRequest; - -public interface IRequest; \ No newline at end of file diff --git a/src/Baguette.Extensions.AspNetCore.Mediator/SendEndpointRequestFilter.cs b/src/Baguette.Extensions.AspNetCore.Mediator/SendEndpointRequestFilter.cs index 9b83beb..6ea8851 100644 --- a/src/Baguette.Extensions.AspNetCore.Mediator/SendEndpointRequestFilter.cs +++ b/src/Baguette.Extensions.AspNetCore.Mediator/SendEndpointRequestFilter.cs @@ -13,14 +13,13 @@ public class SendEndpointRequestFilter : IEndpointFilter var value = await next(context); if (value is IResult) - return value; + return value; // If the next delegate already returned an IResult, just return it - if (!mediator.TryGetRequest(value, out var typedRequest)) - throw new InvalidOperationException(); // TODO: Handle case where the request is not an IRequest + var (success, response) = await mediator.TrySendAsync(value); - var response = await mediator.SendAsync(typedRequest, context.HttpContext.RequestAborted); - - return response; + return success + ? Results.Ok(response) + : throw new InvalidOperationException(); // TODO: Handle case where request can't be sent or response can't be produced } } @@ -33,14 +32,11 @@ public class SendEndpointRequestFilter : IEndpointFilter var value = await next(context); if (value is IResult) - return value; + return value; // If the next delegate already returned an IResult, just return it - if (!mediator.TryGetRequest(value, out var typedRequest)) - throw new InvalidOperationException(); // TODO: Handle case where the request is not an IRequest - - await mediator.SendAsync(typedRequest, context.HttpContext.RequestAborted); - - return null; + return await mediator.TrySendAsync(value) + ? Results.Ok() + : throw new InvalidOperationException(); // TODO: Handle case where request can't be sent } }