Issue #59: Update login and cart APIs.

src/Shopizy.Api/Common/Mapping/CartMappingConfig.cs

@@ -1,7 +1,6 @@
 using Ardalis.GuardClauses;
 using Mapster;
 using Shopizy.Application.Carts.Commands.AddProductToCart;
-using Shopizy.Application.Carts.Commands.CreateCartWithFirstProduct;
 using Shopizy.Application.Carts.Commands.RemoveProductFromCart;
 using Shopizy.Application.Carts.Commands.UpdateProductQuantity;
 using Shopizy.Application.Carts.Queries.GetCart;
@@ -17,8 +16,6 @@ public void Register(TypeAdapterConfig config)
     {
         Guard.Against.Null(config);
 
-        config.NewConfig<CreateCartWithFirstProductRequest, CreateCartWithFirstProductCommand>();
-
         config
             .NewConfig<(Guid CartId, AddProductToCartRequest request), AddProductToCartCommand>()
             .Map(dest => dest.CartId, src => src.CartId)

src/Shopizy.Api/Controllers/AuthenticationController.cs

@@ -16,7 +16,7 @@ public class AuthenticationController(ISender mediator, IMapper mapper) : ApiCon
     private readonly IMapper _mapper = mapper;
 
     [HttpPost("register")]
-    [SwaggerResponse(StatusCodes.Status200OK, null, typeof(AuthResponse))]
+    [SwaggerResponse(StatusCodes.Status200OK, null, typeof(SuccessResult))]
     [SwaggerResponse(StatusCodes.Status400BadRequest, null, typeof(ErrorResult))]
     [SwaggerResponse(StatusCodes.Status401Unauthorized, null, typeof(ErrorResult))]
     [SwaggerResponse(StatusCodes.Status409Conflict, null, typeof(ErrorResult))]

src/Shopizy.Api/Controllers/CartController.cs

@@ -2,7 +2,6 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Shopizy.Application.Carts.Commands.AddProductToCart;
-using Shopizy.Application.Carts.Commands.CreateCartWithFirstProduct;
 using Shopizy.Application.Carts.Commands.RemoveProductFromCart;
 using Shopizy.Application.Carts.Commands.UpdateProductQuantity;
 using Shopizy.Application.Carts.Queries.GetCart;
@@ -31,22 +30,6 @@ public async Task<IActionResult> GetCartAsync(Guid userId)
         return result.Match(Product => Ok(_mapper.Map<CartResponse>(Product)), Problem);
     }
 
-    [HttpPost]
-    [SwaggerResponse(StatusCodes.Status200OK, null, typeof(CartResponse))]
-    [SwaggerResponse(StatusCodes.Status400BadRequest, null, typeof(ErrorResult))]
-    [SwaggerResponse(StatusCodes.Status401Unauthorized, null, typeof(ErrorResult))]
-    [SwaggerResponse(StatusCodes.Status409Conflict, null, typeof(ErrorResult))]
-    [SwaggerResponse(StatusCodes.Status500InternalServerError, null, typeof(ErrorResult))]
-    public async Task<IActionResult> CreateCartWithFirstProductAsync(
-        CreateCartWithFirstProductRequest request
-    )
-    {
-        var command = _mapper.Map<CreateCartWithFirstProductCommand>(request);
-        var result = await _mediator.Send(command);
-
-        return result.Match(product => Ok(_mapper.Map<CartResponse>(product)), Problem);
-    }
-
     [HttpPatch("{cartId:guid}")]
     [SwaggerResponse(StatusCodes.Status200OK, null, typeof(CartResponse))]
     [SwaggerResponse(StatusCodes.Status400BadRequest, null, typeof(ErrorResult))]

src/Shopizy.Application/Authentication/Commands/Register/RegisterCommandHandler.cs

@@ -2,6 +2,7 @@
 using MediatR;
 using Shopizy.Application.Common.Interfaces.Authentication;
 using Shopizy.Application.Common.Interfaces.Persistence;
+using Shopizy.Domain.Carts;
 using Shopizy.Domain.Common.CustomErrors;
 using Shopizy.Domain.Permissions.ValueObjects;
 using Shopizy.Domain.Users;
@@ -10,11 +11,13 @@ namespace Shopizy.Application.Authentication.Commands.Register;
 
 public class RegisterCommandHandler(
     IUserRepository userRepository,
-    IPasswordManager passwordManager
+    IPasswordManager passwordManager,
+    ICartRepository cartRepository
 ) : IRequestHandler<RegisterCommand, ErrorOr<Success>>
 {
     private readonly IUserRepository _userRepository = userRepository;
     private readonly IPasswordManager _passwordManager = passwordManager;
+    private readonly ICartRepository _cartRepository = cartRepository;
 
     public async Task<ErrorOr<Success>> Handle(
         RegisterCommand command,
@@ -66,6 +69,10 @@ CancellationToken cancellationToken
             return CustomErrors.User.UserNotCreated;
         }
 
+        var cart = Cart.Create(user.Id);
+        await _cartRepository.AddAsync(cart);
+        await _cartRepository.Commit(cancellationToken);
+
         return Result.Success;
     }
 }

src/Shopizy.Application/Authentication/Queries/login/LoginQueryHandler.cs

@@ -3,6 +3,7 @@
 using Shopizy.Application.Authentication.Common;
 using Shopizy.Application.Common.Interfaces.Authentication;
 using Shopizy.Application.Common.Interfaces.Persistence;
+using Shopizy.Domain.Carts;
 using Shopizy.Domain.Common.CustomErrors;
 
 namespace Shopizy.Application.Authentication.Queries.login;
@@ -11,13 +12,15 @@ public class LoginQueryHandler(
     IUserRepository userRepository,
     IPermissionRepository permissionRepository,
     IJwtTokenGenerator jwtTokenGenerator,
-    IPasswordManager passwordManager
+    IPasswordManager passwordManager,
+    ICartRepository cartRepository
 ) : IRequestHandler<LoginQuery, ErrorOr<AuthResult>>
 {
     private readonly IUserRepository _userRepository = userRepository;
     private readonly IPermissionRepository _permissionRepository = permissionRepository;
     private readonly IJwtTokenGenerator _jwtTokenGenerator = jwtTokenGenerator;
     private readonly IPasswordManager _passwordManager = passwordManager;
+    private readonly ICartRepository _cartRepository = cartRepository;
 
     public async Task<ErrorOr<AuthResult>> Handle(
         LoginQuery query,
@@ -52,6 +55,15 @@ CancellationToken cancellationToken
 
         var token = _jwtTokenGenerator.GenerateToken(user.Id, roles, assignedPermissions);
 
+        var cart = await _cartRepository.GetCartByUserIdAsync(user.Id);
+
+        if (cart is null)
+        {
+            cart = Cart.Create(user.Id);
+            await _cartRepository.AddAsync(cart);
+            await _cartRepository.Commit(cancellationToken);
+        }
+
         return new AuthResult(user.Id.Value, user.FirstName, user.LastName, user.Email, token);
     }
 }

src/Shopizy.Application/Carts/Commands/AddProductToCart/AddProductToCartCommand.cs

@@ -6,5 +6,10 @@
 namespace Shopizy.Application.Carts.Commands.AddProductToCart;
 
 [Authorize(Permissions = Permissions.Cart.Modify)]
-public record AddProductToCartCommand(Guid CartId, Guid ProductId, string Color, string Size)
-    : IAuthorizeableRequest<ErrorOr<Cart>>;
+public record AddProductToCartCommand(
+    Guid CartId,
+    Guid ProductId,
+    string Color,
+    string Size,
+    int Quantity
+) : IAuthorizeableRequest<ErrorOr<Cart>>;

src/Shopizy.Application/Carts/Commands/AddProductToCart/AddProductToCartCommandHandler.cs

@@ -54,7 +54,9 @@ CancellationToken cancellationToken
             return CustomErrors.Product.ProductNotFound;
         }
 
-        cart.AddLineItem(CartItem.Create(ProductId.Create(cmd.ProductId), cmd.Color, cmd.Size));
+        cart.AddLineItem(
+            CartItem.Create(ProductId.Create(cmd.ProductId), cmd.Color, cmd.Size, cmd.Quantity)
+        );
 
         _cartRepository.Update(cart);
 

src/Shopizy.Application/Orders/Commands/CreateOrder/CreateOrderCommand.cs

@@ -1,13 +1,12 @@
 using ErrorOr;
 using Shopizy.Application.Common.Security.Permissions;
-using Shopizy.Application.Common.Security.Policies;
 using Shopizy.Application.Common.Security.Request;
 using Shopizy.Domain.Common.Enums;
 using Shopizy.Domain.Orders;
 
 namespace Shopizy.Application.Orders.Commands.CreateOrder;
 
-[Authorize(Permissions = Permissions.Order.Create, Policies = Policy.Admin)]
+[Authorize(Permissions = Permissions.Order.Create)]
 public record CreateOrderCommand(
     string PromoCode,
     int DeliveryMethod,

src/Shopizy.Application/Orders/Commands/CreateOrder/CreateOrderCommandHandler.cs

@@ -43,6 +43,8 @@ CancellationToken cancellationToken
         //     }
         // }
 
+
+
         var order = Order.Create(
             userId: UserId.Create(_currentUser.GetCurrentUserId()),
             promoCode: request.PromoCode,
@@ -58,29 +60,37 @@ CancellationToken cancellationToken
                 country: request.ShippingAddress.Country,
                 zipCode: request.ShippingAddress.ZipCode
             ),
-            orderItems: products.ConvertAll(product =>
-            {
-                var item = request.OrderItems.First(p => p.ProductId == product.Id.Value);
-                var photoUrl =
-                    product.ProductImages.Count == 0 ? "" : product.ProductImages[0].ImageUrl;
+            orderItems: request
+                .OrderItems.ToList()
+                .ConvertAll(item =>
+                {
+                    var product = products.First(p => p.Id.Value == item.ProductId);
+                    var photoUrl =
+                        product.ProductImages.Count == 0 ? "" : product.ProductImages[0].ImageUrl;
 
-                return OrderItem.Create(
-                    name: product.Name,
-                    pictureUrl: photoUrl,
-                    unitPrice: product.UnitPrice,
-                    quantity: item.Quantity,
-                    color: item.Color,
-                    size: item.Size,
-                    discount: product.Discount
-                );
-            })
+                    return OrderItem.Create(
+                        name: product.Name,
+                        pictureUrl: photoUrl,
+                        unitPrice: Price.CreateNew(
+                            product.UnitPrice.Amount,
+                            product.UnitPrice.Currency
+                        ),
+                        quantity: item.Quantity,
+                        color: item.Color,
+                        size: item.Size,
+                        discount: product.Discount
+                    );
+                })
         );
 
         await _orderRepository.AddAsync(order);
         if (await _orderRepository.Commit(cancellationToken) <= 0)
         {
             return CustomErrors.Order.OrderNotCreated;
         }
+
+        // remove cart items events
+
         return order;
     }
 }

src/Shopizy.Application/Payments/Commands/CardNotPresentSale/CardNotPresentSaleCommand.cs

@@ -1,11 +1,10 @@
 using ErrorOr;
 using Shopizy.Application.Common.Security.Permissions;
-using Shopizy.Application.Common.Security.Policies;
 using Shopizy.Application.Common.Security.Request;
 
 namespace Shopizy.Application.Payments.Commands.CardNotPresentSale;
 
-[Authorize(Permissions = Permissions.Order.Get, Policies = Policy.Admin)]
+[Authorize(Permissions = Permissions.Order.Create)]
 public record CardNotPresentSaleCommand(
     Guid OrderId,
     decimal Amount,

src/Shopizy.Application/Payments/Commands/CashOnDeliverySale/CashOnDeliverySaleCommand.cs

@@ -1,11 +1,10 @@
 using ErrorOr;
 using Shopizy.Application.Common.Security.Permissions;
-using Shopizy.Application.Common.Security.Policies;
 using Shopizy.Application.Common.Security.Request;
 
 namespace Shopizy.Application.Payments.Commands.CashOnDeliverySale;
 
-[Authorize(Permissions = Permissions.Order.Get, Policies = Policy.Admin)]
+[Authorize(Permissions = Permissions.Order.Create)]
 public record CashOnDeliverySaleCommand(
     Guid OrderId,
     decimal Amount,

src/Shopizy.Application/Products/Commands/DeleteProductImage/DeleteProductImageCommandHandler.cs

@@ -27,8 +27,8 @@ CancellationToken cancellationToken
             return CustomErrors.Product.ProductNotFound;
         }
 
-        Domain.Products.Entities.ProductImage? prodImage = product.ProductImages.FirstOrDefault(
-            pi => pi.Id == ProductImageId.Create(cmd.ImageId)
+        var prodImage = product.ProductImages.FirstOrDefault(pi =>
+            pi.Id == ProductImageId.Create(cmd.ImageId)
         );
 
         if (prodImage is null)

src/Shopizy.Contracts/Cart/AddProductToCartRequest.cs

@@ -1,3 +1,3 @@
 namespace Shopizy.Contracts.Cart;
 
-public record AddProductToCartRequest(Guid ProductId, string Color, string Size);
+public record AddProductToCartRequest(Guid ProductId, string Color, string Size, int Quantity);

src/Shopizy.Contracts/Cart/CreateCartWithFirstProductRequest.cs

@@ -1,3 +1,8 @@
 namespace Shopizy.Contracts.Cart;
 
-public record CreateCartWithFirstProductRequest(Guid ProductId, string Color, string Size);
+public record CreateCartWithFirstProductRequest(
+    Guid ProductId,
+    string Color,
+    string Size,
+    int Quantity
+);

src/Shopizy.Domain/Carts/Entities/CartItem.cs

@@ -13,23 +13,29 @@ public sealed class CartItem : Entity<CartItemId>
     public string Size { get; private set; }
     public int Quantity { get; private set; }
 
-    public static CartItem Create(ProductId productId, string color, string size)
+    public static CartItem Create(ProductId productId, string color, string size, int quantity)
     {
-        return new CartItem(CartItemId.CreateUnique(), productId, color, size);
+        return new CartItem(CartItemId.CreateUnique(), productId, color, size, quantity);
     }
 
     public void UpdateQuantity(int quantity)
     {
         Quantity = quantity;
     }
 
-    private CartItem(CartItemId CartItemId, ProductId productId, string color, string size)
+    private CartItem(
+        CartItemId CartItemId,
+        ProductId productId,
+        string color,
+        string size,
+        int quantity
+    )
         : base(CartItemId)
     {
         ProductId = productId;
         Color = color;
         Size = size;
-        Quantity = 1;
+        Quantity = quantity;
     }
 
     private CartItem() { }