AaronPo/the-biergarten-app
1
0
Fork 0
mirror of https://github.com/aaronpo97/the-biergarten-app.git synced 2026-10-14 17:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade MediatR to 12.5.0 and forward cancellation tokens through pipeline behaviors (#320)

Browse Source
This commit is contained in:
Aaron Po
2026-09-26 19:50:44 -04:00
committed by GitHub
parent 0ff42c3c70
commit e1b6cba1d4
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/backend/API/API.Core/API.Core.csproj
View File

@@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="MediatR" Version="12.5.0" />
</ItemGroup>
<ItemGroup>

2
web/backend/Database/Database.Seed/Database.Seed.csproj
View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="idunno.Password.Generator" Version="2.0.0" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.11" />
<PackageReference Include="SkiaSharp" Version="4.151.1" />

8
web/backend/Shared/Shared.Application.Tests/Behaviors/UnhandledExceptionLoggingBehaviorTests.cs
View File

@@ -26,7 +26,7 @@ public class UnhandledExceptionLoggingBehaviorTests
UnhandledExceptionLoggingBehavior<TestRequest, TestResponse> behavior = CreateBehavior();
TestRequest request = new("aaron", "pa$$word123");
InvalidOperationException thrown = new("Something went wrong.");
RequestHandlerDelegate<TestResponse> next = () => throw thrown;
Task<TestResponse> next(CancellationToken _ = default) => throw thrown;
Func<Task> act = async () => await behavior.Handle(request, next, CancellationToken.None);
@@ -42,7 +42,7 @@ public class UnhandledExceptionLoggingBehaviorTests
UnhandledExceptionLoggingBehavior<TestRequest, TestResponse> behavior = CreateBehavior();
TestRequest request = new("aaron", "pa$$word123");
ValidationException thrown = new([new ValidationFailure("Username", "is required")]);
RequestHandlerDelegate<TestResponse> next = () => throw thrown;
Task<TestResponse> next(CancellationToken _ = default) => throw thrown;
Func<Task> act = async () => await behavior.Handle(request, next, CancellationToken.None);
@@ -56,7 +56,7 @@ public class UnhandledExceptionLoggingBehaviorTests
UnhandledExceptionLoggingBehavior<TestRequest, TestResponse> behavior = CreateBehavior();
TestRequest request = new("aaron", "pa$$word123");
TestResponse response = new("ok");
RequestHandlerDelegate<TestResponse> next = () => Task.FromResult(response);
Task<TestResponse> next(CancellationToken _ = default) => Task.FromResult(response);
TestResponse result = await behavior.Handle(request, next, CancellationToken.None);
@@ -69,7 +69,7 @@ public class UnhandledExceptionLoggingBehaviorTests
{
UnhandledExceptionLoggingBehavior<TestRequest, TestResponse> behavior = CreateBehavior();
TestRequest request = new("aaron", "pa$$word123");
RequestHandlerDelegate<TestResponse> next = () =>
Task<TestResponse> next(CancellationToken _ = default) =>
throw new InvalidOperationException("Something went wrong.");
Func<Task> act = async () => await behavior.Handle(request, next, CancellationToken.None);

29
web/backend/Shared/Shared.Application.Tests/Behaviors/ValidationBehaviorTests.cs
View File

@@ -31,17 +31,13 @@ public class ValidationBehaviorTests
TestRequest request = new("aaron", "pa$$word123");
TestResponse response = new("ok");
bool nextInvoked = false;
RequestHandlerDelegate<TestResponse> next = () =>
Task<TestResponse> next(CancellationToken _ = default)
{
nextInvoked = true;
return Task.FromResult(response);
};
}
TestResponse result = await behavior.Handle(
request,
next,
CancellationToken.None
);
TestResponse result = await behavior.Handle(request, next, CancellationToken.None);
nextInvoked.Should().BeTrue();
result.Should().BeSameAs(response);
@@ -65,11 +61,11 @@ public class ValidationBehaviorTests
);
TestRequest request = new("", "pa$$word123");
bool nextInvoked = false;
RequestHandlerDelegate<TestResponse> next = () =>
Task<TestResponse> next(CancellationToken _ = default)
{
nextInvoked = true;
return Task.FromResult(new TestResponse("ok"));
};
}
Func<Task> act = async () => await behavior.Handle(request, next, CancellationToken.None);
@@ -107,7 +103,7 @@ public class ValidationBehaviorTests
secondValidatorMock.Object
);
TestRequest request = new("aaron", "pa$$word123");
RequestHandlerDelegate<TestResponse> next = () =>
static Task<TestResponse> next(CancellationToken _ = default) =>
Task.FromResult(new TestResponse("ok"));
await behavior.Handle(request, next, CancellationToken.None);
@@ -158,7 +154,7 @@ public class ValidationBehaviorTests
secondValidatorMock.Object
);
TestRequest request = new("", "pa$$word123");
RequestHandlerDelegate<TestResponse> next = () =>
Task<TestResponse> next(CancellationToken _ = default) =>
Task.FromResult(new TestResponse("ok"));
Func<Task> act = async () => await behavior.Handle(request, next, CancellationToken.None);
@@ -171,17 +167,12 @@ public class ValidationBehaviorTests
[Fact]
public async Task Handle_WhenNoValidatorsAreRegistered_InvokesNext()
{
ValidationBehavior<TestRequest, TestResponse> behavior =
CreateBehavior();
ValidationBehavior<TestRequest, TestResponse> behavior = CreateBehavior();
TestRequest request = new("aaron", "pa$$word123");
TestResponse response = new("ok");
RequestHandlerDelegate<TestResponse> next = () => Task.FromResult(response);
Task<TestResponse> next(CancellationToken _ = default) => Task.FromResult(response);
TestResponse result = await behavior.Handle(
request,
next,
CancellationToken.None
);
TestResponse result = await behavior.Handle(request, next, CancellationToken.None);
result.Should().BeSameAs(response);
}

4
web/backend/Shared/Shared.Application/Behaviors/UnhandledExceptionLoggingBehavior.cs
View File

@@ -67,7 +67,7 @@ public partial class UnhandledExceptionLoggingBehavior<TRequest, TResponse>
{
try
{
return await next();
return await next(cancellationToken);
}
catch (ValidationException)
{
@@ -78,7 +78,7 @@ public partial class UnhandledExceptionLoggingBehavior<TRequest, TResponse>
{
if (_logger.IsEnabled(LogLevel.Error))
LogUnhandledException(ex, typeof(TRequest).Name, Serialize(request));
throw;
}
}

4
web/backend/Shared/Shared.Application/Behaviors/ValidationBehavior.cs
View File

@@ -21,7 +21,7 @@ public class ValidationBehavior<TRequest, TResponse>(IEnumerable<IValidator<TReq
)
{
if (!validators.Any())
return await next();
return await next(cancellationToken);
ValidationContext<TRequest> context = new(request);
@@ -35,6 +35,6 @@ public class ValidationBehavior<TRequest, TResponse>(IEnumerable<IValidator<TReq
if (failures.Count > 0)
throw new ValidationException(failures);
return await next();
return await next(cancellationToken);
}
}

2
web/backend/Shared/Shared.Application/Shared.Application.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="FluentValidation" Version="11.3.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
</ItemGroup>