feat: refactor cart functionality and update exception handling

baotoq · Dec 10, 2024 · 0092f44 · 0092f44
1 parent a2571f6
commit 0092f44
Show file tree

Hide file tree

Showing 23 changed files with 140 additions and 62 deletions.
diff --git a/code/src/MicroCommerce.ApiService/Domain/Entities/Product.cs b/code/src/MicroCommerce.ApiService/Domain/Entities/Product.cs
@@ -1,6  1,5 @@
 using System.ComponentModel.DataAnnotations;
 using MicroCommerce.ApiService.Domain.Common;
-using MicroCommerce.ApiService.Exceptions;
 
 namespace MicroCommerce.ApiService.Domain.Entities;
 

diff --git a/code/src/MicroCommerce.ApiService/Features/Carts/AddProductToCart.cs b/code/src/MicroCommerce.ApiService/Features/Carts/AddProductToCart.cs
@@ -2,8  2,8 @@
 using FluentValidation;
 using MediatR;
 using MicroCommerce.ApiService.Domain.Entities;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Infrastructure;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 using MicroCommerce.ApiService.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

diff --git a/code/src/MicroCommerce.ApiService/Features/Carts/GetCart.cs b/code/src/MicroCommerce.ApiService/Features/Carts/GetCart.cs
@@ -23,6  23,16 @@ public record Response
     {
         public Guid Id { get; init; }
         public CartStatus Status { get; init; }
 
         public IList<CartItemViewModel> CartItems { get; init; } = new List<CartItemViewModel>();
     }
 
     public record CartItemViewModel
     {
         public Guid Id { get; init; }
         public string Name { get; init; } = "";
         public decimal Price { get; init; }
         public string ImageUrl { get; set; } = "";
     }
 
     public class Handler : IRequestHandler<Query, Response>
@@ -37,6  47,8 @@ public Handler(ApplicationDbContext context)
         public async Task<Response> Handle(Query request, CancellationToken cancellationToken)
         {
             var cart = await _context.Carts
                 .Include(cart => cart.CartItems)
                     .ThenInclude(cartItem => cartItem.Product)
                 .FirstOrDefaultAsync(s => s.Id == request.Id, cancellationToken);
 
             if (cart is null)
@@ -47,7  59,14 @@ public async Task<Response> Handle(Query request, CancellationToken cancellation
             return new Response
             {
                 Id = cart.Id,
-                Status = cart.Status
                 Status = cart.Status,
                 CartItems = cart.CartItems.Select(s => new CartItemViewModel
                 {
                     Id = s.Product.Id,
                     Name = s.Product.Name,
                     Price = s.Product.Price,
                     ImageUrl = s.Product.ImageUrl
                 }).ToList()
             };
         }
     }

diff --git a/code/src/MicroCommerce.ApiService/Features/Carts/PlaceOrder.cs b/code/src/MicroCommerce.ApiService/Features/Carts/PlaceOrder.cs
@@ -2,9  2,9 @@
 using FluentValidation;
 using MediatR;
 using MicroCommerce.ApiService.Domain.Entities;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Features.DomainEvents;
 using MicroCommerce.ApiService.Infrastructure;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 using MicroCommerce.ApiService.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

diff --git a/code/src/MicroCommerce.ApiService/Features/Carts/RemoveProductFromCart.cs b/code/src/MicroCommerce.ApiService/Features/Carts/RemoveProductFromCart.cs
@@ -2,8  2,8 @@
 using FluentValidation;
 using MediatR;
 using MicroCommerce.ApiService.Domain.Entities;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Infrastructure;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 using MicroCommerce.ApiService.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/AddInfrastructure.cs b/code/src/MicroCommerce.ApiService/Infrastructure/AddInfrastructure.cs
@@ -7,8  7,8 @@
 using MassTransit;
 using MediatR;
 using MicroCommerce.ApiService.Domain.Entities;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Infrastructure.Behaviour;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 using MicroCommerce.ApiService.Infrastructure.Interceptors;
 using MicroCommerce.ApiService.Services;
 using MicroCommerce.ApiService.Services.Elasticsearch;
@@ -99,7  99,10 @@ private static void AddEfCore(this IHostApplicationBuilder builder)
             options.AddInterceptors(sp.GetServices<DispatchDomainEventsInterceptor>());
             options.AddInterceptors(sp.GetServices<IndexProductInterceptor>());
         });
-        builder.EnrichNpgsqlDbContext<ApplicationDbContext>();
         builder.EnrichNpgsqlDbContext<ApplicationDbContext>(s =>
         {
             s.DisableRetry = true;
         });
     }
 
     private static void AddElasticsearch(this IHostApplicationBuilder builder)

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/Behaviour/UnhandledExceptionBehaviour.cs b/code/src/MicroCommerce.ApiService/Infrastructure/Behaviour/UnhandledExceptionBehaviour.cs
@@ -1,6  1,6 @@
 using System.Diagnostics;
 using MediatR;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 namespace MicroCommerce.ApiService.Infrastructure.Behaviour;
 

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/Behaviour/ValidationBehaviour.cs b/code/src/MicroCommerce.ApiService/Infrastructure/Behaviour/ValidationBehaviour.cs
@@ -1,7  1,7 @@
 using System.Diagnostics;
 using FluentValidation;
 using MediatR;
-using MicroCommerce.ApiService.Exceptions;
 using MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 namespace MicroCommerce.ApiService.Infrastructure.Behaviour;
 

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/CoreException.cs b/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/CoreException.cs
@@ -1,4  1,4 @@
-namespace MicroCommerce.ApiService.Exceptions;
 namespace MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 public class CoreException : Exception
 {

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/InvalidValidationException.cs b/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/InvalidValidationException.cs
@@ -1,6  1,6 @@
 using FluentValidation.Results;
 
-namespace MicroCommerce.ApiService.Exceptions;
 namespace MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 [Serializable]
 public class InvalidValidationException : Exception

diff --git a/...c/MicroCommerce.ApiService/Infrastructure/Exceptions/InvalidValidationExceptionHandler.cs b/...c/MicroCommerce.ApiService/Infrastructure/Exceptions/InvalidValidationExceptionHandler.cs
@@ -1,7  1,7 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace MicroCommerce.ApiService.Exceptions;
 namespace MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 public class InvalidValidationExceptionHandler : IExceptionHandler
 {

diff --git a/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/NotFoundExceptionHandler.cs b/code/src/MicroCommerce.ApiService/Infrastructure/Exceptions/NotFoundExceptionHandler.cs
@@ -2,7  2,7 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace MicroCommerce.ApiService.Exceptions;
 namespace MicroCommerce.ApiService.Infrastructure.Exceptions;
 
 public class NotFoundExceptionHandler : IExceptionHandler
 {

diff --git a/code/src/MicroCommerce.Web/CartApiClient.cs b/code/src/MicroCommerce.Web/CartApiClient.cs
@@ -0,0  1,25 @@
 using MicroCommerce.ApiService.Domain.Entities;
 using MicroCommerce.ApiService.Features.Carts;
 
 namespace MicroCommerce.Web;
 
 public class CartApiClient(HttpClient httpClient)
 {
     public async Task<GetCart.Response?> GetCartById(Guid id, CancellationToken cancellationToken = default)
     {
         var response = await httpClient.GetFromJsonAsync<GetCart.Response>($"/api/carts/{id}", cancellationToken);
 
         return response;
     }
 
     public async Task<AddProductToCart.Response?> AddProductToCart(AddProductToCart.Command request, CancellationToken cancellationToken = default)
     {
         var response = await httpClient.PostAsJsonAsync($"/api/carts/{request.CartId}/products", request, cancellationToken);
 
         response.EnsureSuccessStatusCode();
 
         var data = await response.Content.ReadFromJsonAsync<AddProductToCart.Response>(cancellationToken);
 
         return data;
     }
 }
diff --git a/code/src/MicroCommerce.Web/CartService.cs b/code/src/MicroCommerce.Web/CartService.cs
diff --git a/code/src/MicroCommerce.Web/Components/App.razor b/code/src/MicroCommerce.Web/Components/App.razor
@@ -7,14  7,15 @@
     <base href="/"/>
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css"/>
     <link rel="stylesheet" href="app.css"/>
     @* ReSharper disable once Html.PathError *@
     <link rel="stylesheet" href="MicroCommerce.Web.styles.css"/>
     <link rel="icon" type="image/png" href="favicon.png"/>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.1/css/all.min.css" integrity="sha512-5Hs3dF2AEPkpNAR7UiOHba lRSJNeM2ECkwxUIxC1Q/FLycGTbNapWXB4tP889k5T5Ju8fs4b1P5z/iB4nMfSQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <HeadOutlet/>
 </head>
 
 <body>
 <Routes/>
-<div id="app">Loading...</div>
 <script src="_framework/blazor.web.js"></script>
 </body>
 

diff --git a/code/src/MicroCommerce.Web/Components/Layout/MainLayout.razor b/code/src/MicroCommerce.Web/Components/Layout/MainLayout.razor
@@ -1,10  1,29 @@
 @inherits LayoutComponentBase
 
-<main>
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="#">My Shop</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav">
                 <li class="nav-item">
                     <NavLink class="nav-link" href="/">Products</NavLink>
                 </li>
                 <li class="nav-item">
                     <NavLink class="nav-link" href="/cart">Cart</NavLink>
                 </li>
             </ul>
         </div>
     </div>
 </nav>
 
 <main class="mt-4">
     @Body
 </main>
 
-<div id="blazor-error-ui">
 <div id="blazor-error-ui" data-nosnippet>
     An unhandled error has occurred.
     <a href="" class="reload">Reload</a>
     <a class="dismiss">🗙</a>

diff --git a/code/src/MicroCommerce.Web/Components/Layout/MainLayout.razor.css b/code/src/MicroCommerce.Web/Components/Layout/MainLayout.razor.css
@@ -8,11  8,12 @@
     position: fixed;
     width: 100%;
     z-index: 1000;
     color: red;
 }
 
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
 #blazor-error-ui .dismiss {
     cursor: pointer;
     position: absolute;
     right: 0.75rem;
     top: 0.5rem;
 }
diff --git a/code/src/MicroCommerce.Web/Components/Pages/Cart.razor b/code/src/MicroCommerce.Web/Components/Pages/Cart.razor
@@ -1,12  1,18 @@
 @page "/cart"
-@inject CartService CartService
 @using MicroCommerce.ApiService.Features.Carts
 @using MicroCommerce.ApiService.Features.Products
 @inject CartApiClient CartApiClient
 
 <h1 class="text-center my-4">Shopping Cart</h1>
 <div class="container">
     <ul class="list-group">
-        @if (CartService.CartItems.Count > 0)
         @if (_cart is null)
         {
-            @foreach (var item in CartService.CartItems)
             <p>Loading cart…</p>
         }
         else if (_cart.CartItems.Count > 0)
         {
             @foreach (var item in _cart.CartItems)
             {
                 <li class="list-group-item d-flex justify-content-between align-items-center">
                     @item.Name
@@ -20,3  26,13 @@
         }
     </ul>
 </div>
 
 @code {
 
     GetCart.Response? _cart;
 
     protected override async Task OnInitializedAsync()
     {
         _cart = await CartApiClient.GetCartById(Guid.NewGuid());
     }
 }
diff --git a/code/src/MicroCommerce.Web/Components/Pages/Home.razor b/code/src/MicroCommerce.Web/Components/Pages/Home.razor
@@ -1,6  1,10 @@
 @page "/"
-@using System.Globalization
 @using MicroCommerce.ApiService.Features.Carts
 @using MicroCommerce.ApiService.Features.Products
 @rendermode InteractiveServer
 
 @inject ProductApiClient ProductApiClient
 @inject CartApiClient CartApiClient
 
 <PageTitle>Home</PageTitle>
 
@@ -17,7  21,7 @@
             @foreach (var product in _products)
             {
                 <div class="col-md-4">
-                    <ProductCard Product="product" AddToCart="p => { }"></ProductCard>
                     <ProductCard Product="product" AddToCart="AddToCart"></ProductCard>
                 </div>
 
             }
@@ -27,10  31,20 @@
 
 @code {
 
-    GetProductsResponse.Product[]? _products;
     GetProductsFromElasticsearch.ProductViewModel[]? _products;
 
     protected override async Task OnInitializedAsync()
     {
         _products = await ProductApiClient.GetProductsAsync();
     }
 
     private async Task AddToCart(GetProductsFromElasticsearch.ProductViewModel product)
     {
         await CartApiClient.AddProductToCart(new AddProductToCart.Command
         {
             ProductId = product.Id,
             Quantity = 1,
             CartId = Guid.NewGuid()
         });
     }
 }
diff --git a/code/src/MicroCommerce.Web/Components/Shared/ProductCard.razor b/code/src/MicroCommerce.Web/Components/Shared/ProductCard.razor
@@ -1,4  1,5 @@
 @using System.Globalization
 @using MicroCommerce.ApiService.Features.Products
 
 <div class="card mb-4 h-100">
     <img src="images/@Product.ImageUrl" class="card-img-top" alt="@Product.Name">
@@ -12,6  13,6 @@
 </div>
 
 @code {
-    [Parameter] public required GetProductsResponse.Product Product { get; set; }
-    [Parameter] public required Action<GetProductsResponse.Product> AddToCart { get; set; }
     [Parameter] public required GetProductsFromElasticsearch.ProductViewModel Product { get; set; }
     [Parameter] public required Func<GetProductsFromElasticsearch.ProductViewModel, Task> AddToCart { get; set; }
 }
diff --git a/code/src/MicroCommerce.Web/MicroCommerce.Web.csproj b/code/src/MicroCommerce.Web/MicroCommerce.Web.csproj
@@ -13,6  13,7 @@
 
 
   <ItemGroup>
     <ProjectReference Include="..\MicroCommerce.ApiService\MicroCommerce.ApiService.csproj" />
     <ProjectReference Include="..\MicroCommerce.ServiceDefaults\MicroCommerce.ServiceDefaults.csproj" />
   </ItemGroup>
 

diff --git a/code/src/MicroCommerce.Web/ProductApiClient.cs b/code/src/MicroCommerce.Web/ProductApiClient.cs
@@ -1,25  1,14 @@
 using MicroCommerce.ApiService.Features.Products;
 
 namespace MicroCommerce.Web;
 
 public class ProductApiClient(HttpClient httpClient)
 {
-    public async Task<GetProductsResponse.Product[]?> GetProductsAsync(int maxItems = 10, CancellationToken cancellationToken = default)
     public async Task<GetProductsFromElasticsearch.ProductViewModel[]> GetProductsAsync(int maxItems = 10, CancellationToken cancellationToken = default)
     {
-        var response = await httpClient.GetFromJsonAsync<GetProductsResponse>("/api/products", cancellationToken);
         var response = await httpClient.GetFromJsonAsync<GetProductsFromElasticsearch.Response>("/api/products", cancellationToken);
 
-        return response?.Data ?? [];
         return response?.Data.ToArray() ?? [];
     }
 }
 
-public record GetProductsResponse
-{
-    public Product[]? Data { get; init; } = [];
-
-    public record Product
-    {
-        public Guid Id { get; init; }
-        public string Name { get; init; } = "";
-        public decimal Price { get; init; }
-        public long RemainingStock { get; init; }
-        public string ImageUrl { get; set; } = "";
-    }
-}