cleanup

jicking · Apr 19, 2024 · 6ba2b68 · 6ba2b68
1 parent c47af51
commit 6ba2b68
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/JixMinApi/Features/Todo/Queries/GetTodoByIdQuery.cs b/JixMinApi/Features/Todo/Queries/GetTodoByIdQuery.cs
@@ -1,12 +1,11 @@
 using FluentValidation;
 using FluentValidation.Results;
-using JixMinApi.Features.Todo.Commands;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
 namespace JixMinApi.Features.Todo.Queries;
 
-public record GetTodoByIdQuery(Guid Id) :IRequest<Result<TodoDto>>;
+public record GetTodoByIdQuery(Guid Id) : IRequest<Result<TodoDto>>;
 
 public sealed class GetTodoByIdQueryValidator
     : AbstractValidator<GetTodoByIdQuery>

diff --git a/JixMinApi/Features/Todo/Result.cs b/JixMinApi/Features/Todo/Result.cs
@@ -3,12 +3,18 @@
 
 public class Result<T>
 {
-    public bool IsSuccess => !Errors.Any();
+    public bool IsSuccess => !Errors.Any() && !IsNotFound;
     public T? Value { get; init; }
     public IReadOnlyList<KeyValuePair<string, string>> Errors { get; init; } = [];
+    public bool IsNotFound { get; set; }
 
     public Result(T value)
     {
+        if (value is null)
+        {
+            IsNotFound = true;
+        }
+
         Value = value;
     }
 
@@ -22,10 +28,9 @@ public Result(string field, string validationErrorMessage)
         Errors = [new(field, validationErrorMessage)];
     }
 
-    // TODO: using NotFound still Result.IsSuccess to true, will lead to bugs
-    public static Result<T> NotFound<T>()
+    public static Result<T> NotFound()
     {
-        T val = default(T);
+        T val = default;
         return new Result<T>(val);
     }
 }

diff --git a/JixMinApi/Features/Todo/TodoEndpoints.cs b/JixMinApi/Features/Todo/TodoEndpoints.cs
@@ -67,12 +67,10 @@ public static async Task<Results<ValidationProblem, NotFound, Ok<TodoDto>>> GetT
 
         if (!result.IsSuccess)
         {
-            return TypedResults.ValidationProblem(result.Errors.ToErrorDictionary());
-        }
-
-        if (result.Value is null)
-        {
-            return TypedResults.NotFound();
+            if (result.IsNotFound)
+                return TypedResults.NotFound();
+            else
+                return TypedResults.ValidationProblem(result.Errors.ToErrorDictionary());
         }
 
         return TypedResults.Ok(result.Value);
@@ -103,6 +101,6 @@ public static async Task<Results<Created<TodoDto>, ValidationProblem>> CreateTod
         }
 
         var todo = result.Value;
-        return TypedResults.Created($"{Constants.TodoApiRootPath}/{todo.Id}", todo);
+        return TypedResults.Created($"{Constants.TodoApiRootPath}/{todo!.Id}", todo);
     }
 }
diff --git a/JixMinApi/Program.cs b/JixMinApi/Program.cs
@@ -1,7 +1,6 @@
 using FluentValidation;
 using JixMinApi.Features.Todo;
 using JixMinApi.Shared;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
 

diff --git a/JixMinApiTests/Features/Todo/TodoEndpointsTests.cs b/JixMinApiTests/Features/Todo/TodoEndpointsTests.cs
@@ -2,7 +2,6 @@
 using MediatR;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.HttpResults;
-using Microsoft.AspNetCore.Mvc;
 using Moq;
 using Xunit;
 using Assert = Xunit.Assert;
@@ -46,7 +45,7 @@ public async Task GetTodoByIdAsync_Returns_NotFound_When_Todo_Not_Found()
         var mediatorMock = new Mock<IMediator>();
         var nonExistentId = Guid.NewGuid(); // Assuming this id doesn't exist
         mediatorMock.Setup(m => m.Send(It.IsAny<GetTodoByIdQuery>(), CancellationToken.None))
-            .ReturnsAsync(Result<TodoDto>.NotFound<TodoDto>());
+            .ReturnsAsync(Result<TodoDto>.NotFound());
 
         // Act
         var response = await TodoEndpoints.GetTodoByIdAsync(nonExistentId, mediatorMock.Object);