Merge pull request #123 from cnblogs/fix-nullable-result-from-query

fix: map null query result to NotFoundResult
cnblogs · Jul 8, 2023 · 1e0eb6f · 1e0eb6f
2 parents 3b7d19a + 98aae1e
commit 1e0eb6f
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cnblogs.CodeQuality" Version="1.6.8">
+        <PackageReference Include="Cnblogs.CodeQuality" Version="1.7.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs
@@ -35,6 +35,6 @@ public QueryEndpointHandler(IMediator mediator)
         }
 
         var response = await _mediator.Send(query);
-        return response;
+        return response == null ? Results.NotFound() : Results.Ok(response);
     }
 }
diff --git a/....Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj b/....Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.0.1"/>
+    <PackageReference Include="MediatR" Version="12.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...hitecture.Ddd.EventBus.Abstractions/Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj b/...hitecture.Ddd.EventBus.Abstractions/Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj
@@ -6,6 +6,6 @@
     </Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.0.1"/>
+    <PackageReference Include="MediatR" Version="12.1.0" />
   </ItemGroup>
 </Project>
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetStringQuery.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetStringQuery.cs
@@ -2,4 +2,4 @@
 
 namespace Cnblogs.Architecture.IntegrationTestProject.Application.Queries;
 
-public record GetStringQuery(string? AppId = null, int? StringId = null) : IQuery<string>;
+public record GetStringQuery(string? AppId = null, int? StringId = null, bool Found = true) : IQuery<string>;
diff --git a/.../Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetStringQueryHandler.cs b/.../Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetStringQueryHandler.cs
@@ -7,6 +7,6 @@ public class GetStringQueryHandler : IQueryHandler<GetStringQuery, string>
     /// <inheritdoc />
     public Task<string?> Handle(GetStringQuery request, CancellationToken cancellationToken)
     {
-        return Task.FromResult((string?)"Hello");
+        return request.Found ? Task.FromResult((string?)"Hello") : Task.FromResult((string?)null);
     }
 }
diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj
@@ -3,8 +3,8 @@
     <PackageReference Include="Cnblogs.Serilog.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs
@@ -1,4 +1,5 @@
-using System.Net.Http.Json;
+using System.Net;
+using System.Net.Http.Json;
 using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions;
 using Cnblogs.Architecture.IntegrationTestProject;
 using FluentAssertions;
@@ -23,6 +24,19 @@ public async Task GetItem_SuccessAsync()
         content.Should().NotBeNullOrEmpty();
     }
 
+    [Fact]
+    public async Task GetItem_NotFondAsync()
+    {
+        // Arrange
+        var builder = new WebApplicationFactory<Program>();
+
+        // Act
+        var response = await builder.CreateClient().GetAsync("/api/v1/strings/1?found=false");
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.NotFound);
+    }
+
     [Fact]
     public async Task ListItems_SuccessAsync()
     {

diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -3,8 +3,8 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.8" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		namespace Cnblogs.Architecture.IntegrationTestProject.Application.Queries;

		public record GetStringQuery(string? AppId = null, int? StringId = null) : IQuery<string>;
		public record GetStringQuery(string? AppId = null, int? StringId = null, bool Found = true) : IQuery<string>;