Merge pull request #17 from evans-costa/feature/soft-delete

Implement soft delete functionality and enhance email handling

Author: evans-costa

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
     name: Code Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0.x'
           cache: true
@@ -32,25 +32,25 @@ jobs:
     needs: linting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0.x'
           cache: true
           cache-dependency-path: Voltiq.slnx
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'zulu'
 
       - name: Cache SonarCloud Scanner
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar

src/Voltiq.API/Controllers/Auth/AuthController.cs

@@ -3,15 +3,38 @@
 using Microsoft.AspNetCore.Mvc;
 using Voltiq.Application.Features.Auth.Commands.Login;
 using Voltiq.Application.Features.Auth.Commands.Refresh;
-using Voltiq.Application.Features.Users.Queries.GetCurrentUser;
+using Voltiq.Application.Features.Users.Commands.RegisterUser;
 using Voltiq.Application.Mappings.Auth;
+using Voltiq.Application.Mappings.Users;
 
 namespace Voltiq.API.Controllers.Auth;
 
 [ApiVersion("1.0")]
-[Route("api/v{version:apiVersion}/auth")]
+[Route("api/v{version:apiVersion}")]
 public sealed class AuthController : BaseApiController
 {
+    /// <summary>Registers a new user account.</summary>
+    /// <response code="201">User registered successfully.</response>
+    /// <response code="400">Validation error.</response>
+    /// <response code="409">Email and/or document already in use.</response>
+    [AllowAnonymous]
+    [HttpPost("register")]
+    [ProducesResponseType(typeof(RegisterUserResponse), StatusCodes.Status201Created)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Register(
+        [FromBody] RegisterUserRequest request,
+        CancellationToken cancellationToken)
+    {
+        var command = request.ToCommand();
+        var result = await Sender.Send(command, cancellationToken);
+
+        return result.Match(
+            user => CreatedAtAction(nameof(Register), new { id = user.Id }, user),
+            ToErrorResult);
+    }
+
+
     /// <summary>Authenticates a user and returns an access token and a refresh token.</summary>
     /// <response code="200">Authentication successful.</response>
     /// <response code="400">Validation error.</response>
@@ -52,21 +75,4 @@ public async Task<IActionResult> Refresh(
             Ok,
             ToErrorResult);
     }
-
-    /// <summary>Returns the currently authenticated user.</summary>
-    /// <response code="200">Current user data.</response>
-    /// <response code="401">Token missing or invalid.</response>
-    /// <response code="404">User no longer exists.</response>
-    [HttpGet("me")]
-    [ProducesResponseType(typeof(GetUserResponse), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> Me(CancellationToken cancellationToken)
-    {
-        var result = await Sender.Send(new GetCurrentUserQuery(), cancellationToken);
-
-        return result.Match(
-            Ok,
-            ToErrorResult);
-    }
 }

src/Voltiq.API/Controllers/BaseApiController.cs

@@ -11,16 +11,15 @@ namespace Voltiq.API.Controllers;
 [Route("api/v{version:apiVersion}/[controller]")]
 public abstract class BaseApiController : ControllerBase
 {
-    [field: AllowNull, MaybeNull]
+    [field: AllowNull]
+    [field: MaybeNull]
     protected ISender Sender =>
         field ??= HttpContext.RequestServices.GetRequiredService<ISender>();
 
     protected IActionResult ToErrorResult(List<Error>? errors)
     {
         if (errors is null || errors.Count == 0)
-        {
             return Problem(title: ResourceErrorMessages.TITULO_ERRO_INESPERADO, statusCode: 500);
-        }
 
         return errors.All(error => error.Type == ErrorType.Validation)
             ? BuildValidationProblem(errors)
@@ -29,21 +28,18 @@ protected IActionResult ToErrorResult(List<Error>? errors)
 
     private ObjectResult BuildProblem(Error error)
     {
-        var statusCode = error.Type switch
+        var (statusCode, title) = error.Type switch
         {
-            ErrorType.Conflict => StatusCodes.Status409Conflict,
-            ErrorType.Validation => StatusCodes.Status400BadRequest,
-            ErrorType.NotFound => StatusCodes.Status404NotFound,
-            ErrorType.Unauthorized => StatusCodes.Status401Unauthorized,
-            _ => StatusCodes.Status500InternalServerError
-        };
-
-        var title = error.Type switch
-        {
-            ErrorType.Conflict => ResourceErrorMessages.TITULO_CONFLITO,
-            ErrorType.NotFound => ResourceErrorMessages.TITULO_NAO_ENCONTRADO,
-            ErrorType.Unauthorized => ResourceErrorMessages.TITULO_NAO_AUTORIZADO,
-            _ => ResourceErrorMessages.TITULO_ERRO_INESPERADO
+            ErrorType.Conflict => (StatusCodes.Status409Conflict,
+                ResourceErrorMessages.TITULO_CONFLITO),
+            ErrorType.NotFound => (StatusCodes.Status404NotFound,
+                ResourceErrorMessages.TITULO_NAO_ENCONTRADO),
+            ErrorType.Unauthorized => (StatusCodes.Status401Unauthorized,
+                ResourceErrorMessages.TITULO_NAO_AUTORIZADO),
+            ErrorType.Validation => (StatusCodes.Status400BadRequest,
+                ResourceErrorMessages.TITULO_VALIDACAO),
+            _ => (StatusCodes.Status500InternalServerError,
+                ResourceErrorMessages.TITULO_ERRO_INESPERADO)
         };
 
         return Problem(
@@ -57,12 +53,12 @@ private ActionResult BuildValidationProblem(List<Error> errors)
         var modelStateDictionary = new ModelStateDictionary();
 
         foreach (var error in errors)
-        {
             modelStateDictionary.AddModelError(
                 error.Code,
                 error.Description);
-        }
 
-        return ValidationProblem(modelStateDictionary);
+        return ValidationProblem(
+            title: ResourceErrorMessages.TITULO_VALIDACAO,
+            modelStateDictionary: modelStateDictionary);
     }
 }

src/Voltiq.API/Controllers/Users/UsersController.cs

@@ -1,33 +1,26 @@
 using Asp.Versioning;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Voltiq.Application.Features.Users.Commands.RegisterUser;
-using Voltiq.Application.Mappings.Users;
+using Voltiq.Application.Features.Users.Queries.GetCurrentUser;
 
 namespace Voltiq.API.Controllers.Users;
 
 [ApiVersion("1.0")]
-
 public sealed class UsersController : BaseApiController
 {
-    /// <summary>Registers a new user account.</summary>
-    /// <response code="201">User registered successfully.</response>
-    /// <response code="400">Validation error.</response>
-    /// <response code="409">Email and/or document already in use.</response>
-    [AllowAnonymous]
-    [HttpPost]
-    [ProducesResponseType(StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> Register(
-        [FromBody] RegisterUserRequest request,
-        CancellationToken cancellationToken)
+    /// <summary>Returns the currently authenticated user.</summary>
+    /// <response code="200">Current user data.</response>
+    /// <response code="401">Token missing or invalid.</response>
+    /// <response code="404">User no longer exists.</response>
+    [HttpGet("me")]
+    [ProducesResponseType(typeof(GetUserResponse), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Me(CancellationToken cancellationToken)
     {
-        var command = request.ToCommand();
-        var result = await Sender.Send(command, cancellationToken);
+        var result = await Sender.Send(new GetCurrentUserQuery(), cancellationToken);
 
         return result.Match(
-             user => CreatedAtAction(nameof(Register), new { id = user.Id }, user),
-             ToErrorResult);
+            Ok,
+            ToErrorResult);
     }
 }

src/Voltiq.API/Program.cs

@@ -18,6 +18,8 @@
 builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
 
 builder.Services.AddControllers();
+builder.Services.AddRouting(options => options.LowercaseUrls = true);
+
 builder.Services.AddApiVersioning(options =>
 {
     options.DefaultApiVersion = new ApiVersion(1, 0);

src/Voltiq.Application/Features/Clients/ClientResponse.cs

@@ -4,6 +4,7 @@ public sealed record ClientResponse(
     Guid Id,
     string Name,
     string Phone,
+    string Email,
     string Street,
     string Number,
     string City,

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientCommand.cs

@@ -6,6 +6,7 @@ namespace Voltiq.Application.Features.Clients.Commands.RegisterClient;
 public sealed record RegisterClientCommand(
     string Name,
     string Phone,
+    string Email,
     string Street,
     string Number,
     string City,

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientCommandHandler.cs

@@ -24,9 +24,17 @@ public async Task<ErrorOr<ClientResponse>> Handle(RegisterClientCommand request,
         if (userId == Guid.Empty)
             return Error.Unauthorized(description: ResourceErrorMessages.TITULO_NAO_AUTORIZADO);
 
+        var email = Email.Create(request.Email).Value;
+
+        var emailExists = await clientRepository.ExistsWithEmailForUserAsync(
+            email, userId, cancellationToken: cancellationToken);
+
+        if (emailExists)
+            return Error.Conflict(description: ResourceErrorMessages.CLIENTE_EMAIL_JA_CADASTRADO);
+
         var address = Address.Create(request.Street, request.Number, request.City, request.State,
             request.ZipCode);
-        var client = Client.Register(userId, request.Name, request.Phone, address);
+        var client = Client.Register(userId, request.Name, request.Phone, email, address);
 
         await clientRepository.AddAsync(client, cancellationToken);
         await unitOfWork.SaveChangesAsync(cancellationToken);

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientCommandValidator.cs

@@ -13,6 +13,10 @@ public RegisterClientCommandValidator()
         RuleFor(x => x.Phone)
             .NotEmpty().WithMessage(ResourceErrorMessages.CLIENTE_TELEFONE_OBRIGATORIO);
 
+        RuleFor(x => x.Email)
+            .NotEmpty().WithMessage(ResourceErrorMessages.CLIENTE_EMAIL_OBRIGATORIO)
+            .EmailAddress().WithMessage(ResourceErrorMessages.CLIENTE_EMAIL_INVALIDO);
+
         RuleFor(x => x.Street)
             .NotEmpty().WithMessage(ResourceErrorMessages.CLIENTE_ENDERECO_LOGRADOURO_OBRIGATORIO);
 

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientRequest.cs

@@ -3,6 +3,7 @@ namespace Voltiq.Application.Features.Clients.Commands.RegisterClient;
 public sealed record RegisterClientRequest(
     string Name,
     string Phone,
+    string Email,
     string Street,
     string Number,
     string City,