refactor: feature product

src/RookieShop.ApiService/Endpoints/Reports/BestSellerProducts.cs

@@ -1,31 +1,33 @@
 using MediatR;
 using Microsoft.AspNetCore.Http.HttpResults;
-using RookieShop.Application.Reports.DTOs;
+using RookieShop.ApiService.ViewModels.Reports;
 using RookieShop.Application.Reports.Queries.BestSellerProducts;
 using RookieShop.Infrastructure.Endpoints.Abstractions;
 using RookieShop.Infrastructure.RateLimiter;
 
 namespace RookieShop.ApiService.Endpoints.Reports;
 
 public sealed class BestSellerProducts(ISender sender)
-    : IEndpoint<Ok<List<BestSellerProductsDto>>, BestSellerProductsRequest>
+    : IEndpoint<Ok<List<BestSellerProductsVm>>, BestSellerProductsRequest>
 {
     public void MapEndpoint(IEndpointRouteBuilder app) =>
         app.MapGet("/reports/best-seller-products",
                 async (int top) => await HandleAsync(new(top)))
-            .Produces<Ok<List<BestSellerProductsDto>>>()
+            .Produces<Ok<List<BestSellerProductsVm>>>()
             .WithTags(nameof(Reports))
             .WithName("Best Seller Products")
             .MapToApiVersion(new(1, 0))
             .RequirePerUserRateLimit();
 
-    public async Task<Ok<List<BestSellerProductsDto>>> HandleAsync(BestSellerProductsRequest request,
+    public async Task<Ok<List<BestSellerProductsVm>>> HandleAsync(BestSellerProductsRequest request,
         CancellationToken cancellationToken = default)
     {
         BestSellerProductsQuery query = new(request.Top);
 
-        var result = await sender.Send(query, cancellationToken);
+        var data = await sender.Send(query, cancellationToken);
 
-        return TypedResults.Ok(result.Value.ToList());
+        var result = data.Value.ToBestSellerProductsVm();
+
+        return TypedResults.Ok(result);
     }
 }

src/RookieShop.ApiService/Program.cs

@@ -29,6 +29,7 @@
     .AddRouting(options => options.LowercaseUrls = true)
     .AddSingleton(new JsonSerializerOptions
     {
+        WriteIndented = true,
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         PropertyNameCaseInsensitive = true
     });

src/RookieShop.ApiService/ViewModels/Reports/BestSellerProductsVm.cs

@@ -0,0 +1,11 @@
+using RookieShop.Domain.Entities.ProductAggregator.ValueObjects;
+
+namespace RookieShop.ApiService.ViewModels.Reports;
+
+public sealed record BestSellerProductsVm(
+    Guid ProductId,
+    string? ProductName,
+    int TotalSoldQuantity,
+    ProductPrice? Price,
+    string? ImageUrl
+);

src/RookieShop.ApiService/ViewModels/Reports/DtoToViewModelMapper.cs

@@ -0,0 +1,24 @@
+using System.Text.Json;
+using RookieShop.Application.Reports.DTOs;
+using RookieShop.Domain.Entities.ProductAggregator.ValueObjects;
+
+namespace RookieShop.ApiService.ViewModels.Reports;
+
+public static class DtoToViewModelMapper
+{
+    public static BestSellerProductsVm ToBestSellerProductsVm(this BestSellerProductsDto bestSellerProductsDto)
+    {
+        var price = JsonSerializer.Deserialize<ProductPrice>(bestSellerProductsDto.Price);
+
+        return new(
+            bestSellerProductsDto.ProductId,
+            bestSellerProductsDto.ProductName,
+            bestSellerProductsDto.TotalSoldQuantity,
+            price,
+            bestSellerProductsDto.ImageUrl
+        );
+    }
+
+    public static List<BestSellerProductsVm> ToBestSellerProductsVm(this IEnumerable<BestSellerProductsDto> bestSellerProductsDtos) =>
+        bestSellerProductsDtos.Select(ToBestSellerProductsVm).ToList();
+}

src/RookieShop.Application/Reports/DTOs/BestSellerProductsDto.cs

@@ -1,10 +1,13 @@
-namespace RookieShop.Application.Reports.DTOs;
+using System.Text.Json.Serialization;
+
+namespace RookieShop.Application.Reports.DTOs;
 
 public sealed class BestSellerProductsDto
 {
     public Guid ProductId { get; set; }
     public string? ProductName { get; set; }
     public int TotalSoldQuantity { get; set; }
+    [JsonRequired]
     public string Price { get; set; } = string.Empty;
     public string? ImageUrl { get; set; }
 }

ui/storefront/Areas/Basket/Views/Shared/Components/CheckOut/Default.cshtml

@@ -128,7 +128,7 @@
         Checkout
     </button>
     <smart-paste-button class="w-full text-center bg-stone-600 rounded-xl py-3 px-6 font-semibold text-lg text-white transition-all duration-500 hover:bg-stone-700">
-        <img loading="lazy" src="~/imgs/payment/smart-paste.svg" class="h-6 inline-block mr-2 htmx-indicator" alt="Paste" asp-append-version="true" />
+        <img loading="lazy" src="~/imgs/payment/smart-paste.svg" class="h-6 inline-block mr-2" alt="Paste" asp-append-version="true" />
         Smart Paste
     </smart-paste-button>
 </form>

ui/storefront/Areas/Product/Models/Products/ProductPrice.cs

@@ -1,7 +1,12 @@
-namespace RookieShop.Storefront.Areas.Product.Models.Products;
+using System.Text.Json.Serialization;
+
+namespace RookieShop.Storefront.Areas.Product.Models.Products;
 
 public sealed class ProductPrice
 {
+    [JsonPropertyName("price")]
     public decimal Price { get; set; }
+
+    [JsonPropertyName("priceSale")]
     public decimal? PriceSale { get; set; }
 }

ui/storefront/Models/Report/BestSellerProductViewModel.cs

@@ -1,8 +1,19 @@
-using RookieShop.Storefront.Areas.Product.Models.Products;
+using System.Text.Json.Serialization;
+using RookieShop.Storefront.Areas.Product.Models.Products;
 
 namespace RookieShop.Storefront.Models.Report;
 
-public sealed class BestSellerProductViewModel : BestSellerProduct
+public sealed class BestSellerProductViewModel
 {
+    [JsonPropertyName("productId")] public Guid ProductId { get; set; }
+
+    [JsonPropertyName("productName")] public string? ProductName { get; set; }
+
+    [JsonPropertyName("totalSoldQuantity")]
+    public int TotalSoldQuantity { get; set; }
+
+    [JsonPropertyName("imageUrl")] public string? ImageUrl { get; set; }
+
+    [JsonPropertyName("price")]
     public ProductPrice? Price { get; set; } 
 }

ui/storefront/Services/IReportService.cs

@@ -6,5 +6,5 @@ namespace RookieShop.Storefront.Services;
 public interface IReportService
 {
     [Get("/reports/best-seller-products")]
-    Task <List<BestSellerProductResponse>> GetBestSellerProductsAsync([Query] BestSellerProductFilterParams filterParams);
+    Task <List<BestSellerProductViewModel>> GetBestSellerProductsAsync([Query] BestSellerProductFilterParams filterParams);
 }

ui/storefront/Views/Shared/Components/FeatureProducts/Default.cshtml

@@ -1,4 +1,6 @@
-@model List<RookieShop.Storefront.Models.Report.BestSellerProductViewModel>
+@using System.Globalization
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@model List<RookieShop.Storefront.Models.Report.BestSellerProductViewModel>
 
 @if (Model.Count == 0)
 {
@@ -21,19 +23,19 @@ else
             <div class="mt-4 flex justify-between">
                 <div>
                     <h3 class="text-sm text-gray-700">
-                        <span class="font-medium hover:text-gray-800">
+                        <a asp-area="Product"
+                           asp-controller="Product"
+                           asp-action="Detail"
+                           asp-route-id="@item.ProductId" 
+                           class="font-medium hover:text-gray-800">
                             <span aria-hidden="true" class="absolute inset-0"></span>
                             @item.ProductName
-                        </span>
+                        </a>
                     </h3>
                 </div>
-                <a asp-area="Product"
-                   asp-controller="Product"
-                   asp-action="Detail"
-                   asp-route-id="@item.ProductId"
-                   class="text-sm font-medium text-gray-900 text-red-900">
-                    Purchase
-                </a>
+                <span class="text-sm font-medium text-gray-900 text-red-900">
+                    @item.Price?.PriceSale?.ToString("C", CultureInfo.CreateSpecificCulture("en-US"))
+                </span>
             </div>
         </div>
     }

ui/storefront/Views/Shared/Components/FeatureProducts/FeatureProductsViewComponent.cs

@@ -1,7 +1,4 @@
-using System.Text.Json;
-using Microsoft.AspNetCore.Mvc;
-using RookieShop.Storefront.Areas.Product.Models.Products;
-using RookieShop.Storefront.Models.Report;
+using Microsoft.AspNetCore.Mvc;
 using RookieShop.Storefront.Services;
 
 namespace RookieShop.Storefront.Views.Shared.Components.FeatureProducts;
@@ -13,15 +10,6 @@ public async Task<IViewComponentResult> InvokeAsync()
     {
         var data = await reportService.GetBestSellerProductsAsync(new());
 
-        var result = data.Select(x => new BestSellerProductViewModel
-        {
-            ProductId = x.ProductId,
-            ProductName = x.ProductName,
-            TotalSoldQuantity = x.TotalSoldQuantity,
-            Price = JsonSerializer.Deserialize<ProductPrice>(x.Price),
-            ImageUrl = x.ImageUrl
-        }).ToList();
-
-        return View(result);
+        return View(data);
     }
 }