Add product events handlers and fix bugs in Orders module

TuanDangIT · TuanDangIT · commit b425f9033b75 · 2026-03-30T23:09:03.000+02:00
diff --git a/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/Handlers/ProductAddedToOrderHandler.cs b/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/Handlers/ProductAddedToOrderHandler.cs
@@ -0,0 +1,31 @@
+﻿using Ecommerce.Modules.Carts.Core.DAL;
+using Ecommerce.Shared.Abstractions.Events;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Carts.Core.Events.External.Handlers
+{
+    internal class ProductAddedToOrderHandler : IEventHandler<ProductAddedToOrder>
+    {
+        private readonly ICartsDbContext _dbContext;
+
+        public ProductAddedToOrderHandler(ICartsDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+        public async Task HandleAsync(ProductAddedToOrder @event)
+        {
+            var product = await _dbContext.Products.FirstOrDefaultAsync(p => p.Id == @event.ProductId);
+
+            if (product is not null && product.HasQuantity)
+            {
+                product.DecreaseQuantity(@event.Quantity);
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+    }
+}
diff --git a/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/Handlers/ProductRemovedFromOrderHandler.cs b/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/Handlers/ProductRemovedFromOrderHandler.cs
@@ -0,0 +1,31 @@
+﻿using Ecommerce.Modules.Carts.Core.DAL;
+using Ecommerce.Shared.Abstractions.Events;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Carts.Core.Events.External.Handlers
+{
+    internal class ProductRemovedFromOrderHandler : IEventHandler<ProductRemovedFromOrder>
+    {
+        private readonly ICartsDbContext _dbContext;
+
+        public ProductRemovedFromOrderHandler(ICartsDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+        public async Task HandleAsync(ProductRemovedFromOrder @event)
+        {
+            var product = await _dbContext.Products.FirstOrDefaultAsync(p => p.Id == @event.ProductId);    
+
+            if (product is not null && product.HasQuantity)
+            {
+                product.IncreaseQuantity(@event.Quantity);
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+    }
+}
diff --git a/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/ProductAddedToOrder.cs b/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/ProductAddedToOrder.cs
@@ -0,0 +1,11 @@
+﻿using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Carts.Core.Events.External
+{
+    public record class ProductAddedToOrder(Guid ProductId, int Quantity) : IEvent;
+}
diff --git a/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/ProductRemovedFromOrder.cs b/Ecommerce/src/Modules/Carts/Ecommerce.Modules.Carts.Core/Events/External/ProductRemovedFromOrder.cs
@@ -0,0 +1,11 @@
+﻿using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Carts.Core.Events.External
+{
+    public record class ProductRemovedFromOrder(Guid ProductId, int Quantity) : IEvent;
+}
diff --git a/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/Handlers/ProductAddedToOrderHandler.cs b/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/Handlers/ProductAddedToOrderHandler.cs
@@ -0,0 +1,40 @@
+﻿using Ecommerce.Modules.Inventory.Domain.Auctions.Repositories;
+using Ecommerce.Modules.Inventory.Domain.Inventory.Repositories;
+using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Inventory.Application.Inventory.Events.Externals.Handlers
+{
+    internal class ProductAddedToOrderHandler : IEventHandler<ProductAddedToOrder>
+    {
+        private readonly IProductRepository _productRepository;
+        private readonly IAuctionRepository _auctionRepository;
+
+        public ProductAddedToOrderHandler(IProductRepository productRepository, IAuctionRepository auctionRepository)
+        {
+            _productRepository = productRepository;
+            _auctionRepository = auctionRepository;
+        }
+        public async Task HandleAsync(ProductAddedToOrder @event)
+        {
+            var product = await _productRepository.GetAsync(@event.ProductId);
+            var auction = await _auctionRepository.GetAsync(@event.ProductId);
+
+            if (product is not null && product.HasQuantity)
+            {
+                product.DecreaseQuantity(@event.Quantity);
+            }
+
+            if (auction is not null && auction.HasQuantity)
+            {
+                auction.DecreaseQuantity(@event.Quantity);
+            }
+
+            await _productRepository.UpdateAsync();
+        }
+    }
+}
diff --git a/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/Handlers/ProductRemovedFromOrderHandler.cs b/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/Handlers/ProductRemovedFromOrderHandler.cs
@@ -0,0 +1,40 @@
+﻿using Ecommerce.Modules.Inventory.Domain.Auctions.Repositories;
+using Ecommerce.Modules.Inventory.Domain.Inventory.Repositories;
+using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Inventory.Application.Inventory.Events.Externals.Handlers
+{
+    internal class ProductRemovedFromOrderHandler : IEventHandler<ProductRemovedFromOrder>
+    {
+        private readonly IProductRepository _productRepository;
+        private readonly IAuctionRepository _auctionRepository;
+
+        public ProductRemovedFromOrderHandler(IProductRepository productRepository, IAuctionRepository auctionRepository)
+        {
+            _productRepository = productRepository;
+            _auctionRepository = auctionRepository;
+        }
+        public async Task HandleAsync(ProductRemovedFromOrder @event)
+        {
+            var product = await _productRepository.GetAsync(@event.ProductId);
+            var auction = await _auctionRepository.GetAsync(@event.ProductId);
+
+            if (product is not null && product.HasQuantity)
+            {
+                product.IncreaseQuantity(@event.Quantity);
+            }
+
+            if (auction is not null && auction.HasQuantity)
+            {
+                auction.IncreaseQuantity(@event.Quantity);
+            }
+
+            await _productRepository.UpdateAsync();
+        }
+    }
+}
diff --git a/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/ProductAddedToOrder.cs b/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/ProductAddedToOrder.cs
@@ -0,0 +1,11 @@
+﻿using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Inventory.Application.Inventory.Events.Externals
+{
+    public record class ProductAddedToOrder(Guid ProductId, int Quantity) : IEvent;
+}
diff --git a/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/ProductRemovedFromOrder.cs b/Ecommerce/src/Modules/Inventory/Ecommerce.Modules.Inventory.Application/Inventory/Events/Externals/ProductRemovedFromOrder.cs
@@ -0,0 +1,11 @@
+﻿using Ecommerce.Shared.Abstractions.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ecommerce.Modules.Inventory.Application.Inventory.Events.Externals
+{
+    public record class ProductRemovedFromOrder(Guid ProductId, int Quantity) : IEvent;
+}
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Api/Controllers/OrdersController.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Api/Controllers/OrdersController.cs
@@ -82,8 +82,8 @@ public async Task<ActionResult<ApiResponse<OrderDetailsDto>>> GetOrder([FromRout
             => OkOrNotFound<OrderDetailsDto, Order>(await _mediator.Send(new GetOrder(orderId), cancellationToken), orderId.ToString());
 
         [Authorize(Roles = "Admin, Manager, Employee")]
-        [SwaggerOperation("Creates an order")]
-        [SwaggerResponse(StatusCodes.Status201Created, "Creates an order and returns it's identifier", typeof(Guid))]
+        [SwaggerOperation("Creates a draft order")]
+        [SwaggerResponse(StatusCodes.Status201Created, "Creates a draft order and returns it's identifier", typeof(Guid))]
         [SwaggerResponse(StatusCodes.Status403Forbidden, "Access is forbidden for this user")]
         [SwaggerResponse(StatusCodes.Status401Unauthorized, "User not authorized")]
         [HttpPost]
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/DTO/OrderDetailsDto.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/DTO/OrderDetailsDto.cs
@@ -13,8 +13,8 @@ public class OrderDetailsDto
         public CustomerDto? Customer { get; set; } = new();
         public decimal? TotalSum { get; set; }
         public IEnumerable<ProductDto>? Products { get; set; } = [];
-        public string? Payment { get; set; } = string.Empty;
-        public string? Status { get; set; } = string.Empty;
+        public string? Payment { get; set; } 
+        public string Status { get; set; } = string.Empty;
         public string? ClientAdditionalInformation { get; set; }
         public string? CompanyAdditionalInformation { get; set; }
         public OrderInvoiceDto? Invoice { get; set; }
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Events/External/Handlers/CustomerPlacedOrderHandler.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Events/External/Handlers/CustomerPlacedOrderHandler.cs
@@ -32,10 +32,6 @@ public async Task HandleAsync(CustomerPlacedOrder @event)
             var address = new Address(@event.Country, @event.StreetName, @event.ApartmentNumber is null ? @event.StreetNumber : @event.StreetNumber + "/" + @event.ApartmentNumber, 
                 @event.City, @event.PostalCode);
             var customer = new Customer(@event.FirstName, @event.LastName, @event.Email, @event.PhoneNumber, address, @event.CustomerId);
-            if (!Enum.TryParse(typeof(PaymentMethod), @event.PaymentMethod, out var paymentMethod))
-            {
-                throw new InvalidPaymentMethodException();
-            }
             var additionalInformation = @event.AdditionalInformation;
             var now = _timeProvider.GetUtcNow().UtcDateTime;
             Discount? discount = null;
@@ -53,7 +49,7 @@ public async Task HandleAsync(CustomerPlacedOrder @event)
                 customer, 
                 @event.Products, 
                 @event.TotalSum,
-                (PaymentMethod)paymentMethod!,
+                @event.PaymentMethod,
                 deliveryService,
                 additionalInformation,
                 discount,
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Events/ProductRemovedFromOrder.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Events/ProductRemovedFromOrder.cs
@@ -7,5 +7,5 @@
 
 namespace Ecommerce.Modules.Orders.Application.Orders.Events
 {
-    public record class ProductRemovedFromOrder(Guid ProductId, int? Quantity) : IEvent;
+    public record class ProductRemovedFromOrder(Guid ProductId, int Quantity) : IEvent;
 }
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Exceptions/DeliveryServiceNotSetException.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Exceptions/DeliveryServiceNotSetException.cs
@@ -7,9 +7,9 @@
 
 namespace Ecommerce.Modules.Orders.Application.Orders.Exceptions
 {
-    internal class InvalidPaymentMethodException : EcommerceException
+    internal class DeliveryServiceNotSetException : EcommerceException
     {
-        public InvalidPaymentMethodException() : base("Given payment method was invalid.")
+        public DeliveryServiceNotSetException() : base("Delivery service was not set.")
         {
         }
     }
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Orders/RemoveOrderItem/RemoveOrderItem.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Orders/RemoveOrderItem/RemoveOrderItem.cs
@@ -8,7 +8,7 @@
 
 namespace Ecommerce.Modules.Orders.Application.Orders.Features.Orders.RemoveOrderItem
 {
-    public sealed record class RemoveOrderItem(int OrderItemId, int? Quantity) : ICommand
+    public sealed record class RemoveOrderItem(int OrderItemId, int Quantity) : ICommand
     {
         [SwaggerIgnore]
         public Guid OrderId { get; init; }
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Orders/RemoveOrderItem/RemoveOrderItemHandler.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Orders/RemoveOrderItem/RemoveOrderItemHandler.cs
@@ -44,11 +44,8 @@ public async Task Handle(RemoveOrderItem request, CancellationToken cancellation
                 throw new ProductNotFoundException(orderItem.SKU);
 
             order.RemoveProduct(orderItem, request.Quantity);
-           
-            if (request.Quantity is not null)
-            {
-                product.IncreaseQuantity((int)request.Quantity!);
-            }
+
+            product.IncreaseQuantity(request.Quantity);
 
             await _orderRepository.UpdateAsync(cancellationToken);
 
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Shipments/CreateShipment/CreateShipmentHandler.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Application/Orders/Features/Shipments/CreateShipment/CreateShipmentHandler.cs
@@ -43,6 +43,12 @@ public async Task<int> Handle(CreateShipment request, CancellationToken cancella
                 query => query.Include(o => o.Shipments), 
                 query => query.Include(o => o.DeliveryService)) ?? 
                 throw new OrderNotFoundException(request.OrderId);
+
+            if (order.DeliveryService is null)
+            {
+                throw new DeliveryServiceNotSetException();
+            }
+
             var deliveryService = _deliveryServiceFactory.GetDeliveryService(order.DeliveryService.Courier) ?? 
                 throw new ShipmentCourierNotSupportedException(order.DeliveryService.Courier);
             if (order.Status == Domain.Orders.Entities.Enums.OrderStatus.Draft)
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Domain/Orders/Entities/Order.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Domain/Orders/Entities/Order.cs
@@ -19,14 +19,14 @@ public class Order : AggregateRoot, IAuditable
         private readonly List<OrderItem> _products = [];
         public IEnumerable<OrderItem> Products => _products;
         public decimal TotalSum { get; private set; }
-        public PaymentMethod Payment { get; private set; }
+        public string? Payment { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Placed;
         public bool IsCompleted => Status is OrderStatus.Cancelled || Status is OrderStatus.Completed || Status is OrderStatus.Returned;
         public string? ClientAdditionalInformation { get; private set; }
         public string? CompanyAdditionalInformation { get; private set; }
         public Discount? Discount { get; private set; }
         public string StripePaymentIntentId { get; private set; } = string.Empty;
-        public DeliveryService DeliveryService { get; private set; } = default!;
+        public DeliveryService? DeliveryService { get; private set; } 
         private readonly List<Shipment> _shipments = [];
         public IEnumerable<Shipment> Shipments => _shipments;
         public Return? Return { get; private set; }
@@ -36,7 +36,7 @@ public class Order : AggregateRoot, IAuditable
         public DateTime? UpdatedAt { get; private set; }
         public Invoice? Invoice { get; private set; }
         public bool HasInvoice => Invoice is not null;
-        public Order(Guid id, Customer customer, IEnumerable<OrderItem> products, decimal totalSum, PaymentMethod paymentMethod, 
+        public Order(Guid id, Customer customer, IEnumerable<OrderItem> products, decimal totalSum, string paymentMethod, 
             DeliveryService deliveryService, string? clientAdditionalInformation, Discount? discount, string stripePaymentIntentId)
         {
             if(totalSum < 0)
@@ -183,7 +183,7 @@ public void WriteAdditionalInformation(string additionalInformation)
 
         private void CalculateTotalSum()
         {
-            var productsTotal = _products.Sum(p => p.Price) + DeliveryService.Price;
+            var productsTotal = _products.Sum(p => p.Price) + DeliveryService?.Price ?? 0;
             if (Discount is null)
             {
                 TotalSum = productsTotal;
@@ -210,7 +210,7 @@ private void CalculateTotalSum()
             }
             if (calculatedTotal <= 0)
             {
-                TotalSum = 0 + DeliveryService.Price;
+                TotalSum = 0 + DeliveryService?.Price ?? 0;
                 return;
             }
             TotalSum = calculatedTotal;
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Configurations/OrderConfiguration.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Configurations/OrderConfiguration.cs
@@ -42,9 +42,6 @@ public void Configure(EntityTypeBuilder<Order> builder)
             builder.HasOne(o => o.Customer)
                 .WithOne(c => c.Order)
                 .HasForeignKey<Customer>(o => o.OrderId);
-            builder.Property(o => o.Payment)
-                .IsRequired()
-                .HasConversion<string>();
             builder.Property(o => o.Status)
                 .IsRequired()
                 .HasConversion<string>();
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Mappings/MappingExtensions.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Mappings/MappingExtensions.cs
@@ -48,7 +48,7 @@ public static OrderDetailsDto AsDetailsDto(this Order order, bool hasCustomerCon
                 TotalSum = order.TotalSum,
                 Products = order.Products.Select(p => p.AsDto()),
                 Shipment = order.Shipments.Select(s => s.AsDetailsDto()),
-                Payment = order.Payment.ToString(),
+                Payment = order.Payment?.ToString(),
                 Status = order.Status.ToString(),
                 ClientAdditionalInformation = order.ClientAdditionalInformation,
                 CompanyAdditionalInformation = !hasCustomerConstraint ? order.CompanyAdditionalInformation : null,
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330203820_AddNulabilityForDeliveryService.Designer.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330203820_AddNulabilityForDeliveryService.Designer.cs
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330203820_AddNulabilityForDeliveryService.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330203820_AddNulabilityForDeliveryService.cs
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330204627_ChangePaymentMethodTypeToString.Designer.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330204627_ChangePaymentMethodTypeToString.Designer.cs
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330204627_ChangePaymentMethodTypeToString.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/20260330204627_ChangePaymentMethodTypeToString.cs
diff --git a/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/OrdersDbContextModelSnapshot.cs b/Ecommerce/src/Modules/Orders/Ecommerce.Modules.Orders.Infrastructure/DAL/Migrations/OrdersDbContextModelSnapshot.cs
