Place the command files in the corresponding folder

src/Ordering.API/Apis/OrdersApi.cs

@@ -1,4 +1,9 @@
-using Microsoft.AspNetCore.Http.HttpResults;
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrderDraft;
+using eShop.Ordering.API.Application.Commands.Identified;
+using eShop.Ordering.API.Application.Commands.ShipOrder;
+using Microsoft.AspNetCore.Http.HttpResults;
 using CardType = eShop.Ordering.API.Application.Queries.CardType;
 using Order = eShop.Ordering.API.Application.Queries.Order;
 

src/Ordering.API/Application/Commands/CancelOrderCommand.cs → src/Ordering.API/Application/Commands/CancelOrder/CancelOrderCommand.cs

@@ -1,4 +1,4 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.CancelOrder;
 
 public record CancelOrderCommand(int OrderNumber) : IRequest<bool>;
 

src/Ordering.API/Application/Commands/CancelOrderCommandHandler.cs → src/Ordering.API/Application/Commands/CancelOrder/CancelOrderCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.CancelOrder;
 
 // Regular CommandHandler
 public class CancelOrderCommandHandler : IRequestHandler<CancelOrderCommand, bool>

src/Ordering.API/Application/Commands/CreateOrderCommand.cs → src/Ordering.API/Application/Commands/CreateOrder/CreateOrderCommand.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.CreateOrder;
+
+using eShop.Ordering.API.Application.Commands.CreateOrderDraft;
 
 // DDD and CQRS patterns comment: Note that it is recommended to implement immutable Commands
 // In this case, its immutability is achieved by having all the setters as private

src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs → src/Ordering.API/Application/Commands/CreateOrder/CreateOrderCommandHandler.cs

@@ -1,5 +1,5 @@
-namespace eShop.Ordering.API.Application.Commands;
-
+namespace eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.Identified;
 using eShop.Ordering.Domain.AggregatesModel.OrderAggregate;
 
 // Regular CommandHandler

src/Ordering.API/Application/Commands/CreateOrderDraftCommand.cs → src/Ordering.API/Application/Commands/CreateOrderDraft/CreateOrderDraftCommand.cs

@@ -1,4 +1,5 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.CreateOrderDraft;
+
 using eShop.Ordering.API.Application.Models;
 
 public record CreateOrderDraftCommand(string BuyerId, IEnumerable<BasketItem> Items) : IRequest<OrderDraftDTO>;

src/Ordering.API/Application/Commands/CreateOrderDraftCommandHandler.cs → src/Ordering.API/Application/Commands/CreateOrderDraft/CreateOrderDraftCommandHandler.cs

@@ -1,4 +1,4 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.CreateOrderDraft;
 
 using eShop.Ordering.API.Extensions;
 using eShop.Ordering.Domain.AggregatesModel.OrderAggregate;

src/Ordering.API/Application/Commands/IdentifiedCommand.cs → src/Ordering.API/Application/Commands/Identified/IdentifiedCommand.cs

@@ -1,4 +1,4 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.Identified;
 
 public class IdentifiedCommand<T, R> : IRequest<R>
     where T : IRequest<R>

src/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs → src/Ordering.API/Application/Commands/Identified/IdentifiedCommandHandler.cs

@@ -1,4 +1,8 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.ShipOrder;
+
+namespace eShop.Ordering.API.Application.Commands.Identified;
 
 /// <summary>
 /// Provides a base implementation for handling duplicate request and ensuring idempotent updates, in the cases where

src/Ordering.API/Application/Commands/SetAwaitingValidationOrderStatusCommand.cs → src/Ordering.API/Application/Commands/SetAwaitingValidationOrderStatus/SetAwaitingValidationOrderStatusCommand.cs

@@ -1,3 +1,3 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.SetAwaitingValidationOrderStatus;
 
 public record SetAwaitingValidationOrderStatusCommand(int OrderNumber) : IRequest<bool>;

src/Ordering.API/Application/Commands/SetAwaitingValidationOrderStatusCommandHandler.cs → src/Ordering.API/Application/Commands/SetAwaitingValidationOrderStatus/SetAwaitingValidationOrderStatusCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.SetAwaitingValidationOrderStatus;
 
 // Regular CommandHandler
 public class SetAwaitingValidationOrderStatusCommandHandler : IRequestHandler<SetAwaitingValidationOrderStatusCommand, bool>

src/Ordering.API/Application/Commands/SetPaidOrderStatusCommand.cs → src/Ordering.API/Application/Commands/SetPaidOrderStatus/SetPaidOrderStatusCommand.cs

@@ -1,3 +1,3 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.SetPaidOrderStatus;
 
 public record SetPaidOrderStatusCommand(int OrderNumber) : IRequest<bool>;

src/Ordering.API/Application/Commands/SetPaidOrderStatusCommandHandler.cs → src/Ordering.API/Application/Commands/SetPaidOrderStatus/SetPaidOrderStatusCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.SetPaidOrderStatus;
 
 // Regular CommandHandler
 public class SetPaidOrderStatusCommandHandler : IRequestHandler<SetPaidOrderStatusCommand, bool>

src/Ordering.API/Application/Commands/SetStockConfirmedOrderStatusCommand.cs → src/Ordering.API/Application/Commands/SetStockConfirmedOrderStatus/SetStockConfirmedOrderStatusCommand.cs

@@ -1,3 +1,3 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.SetStockConfirmedOrderStatus;
 
 public record SetStockConfirmedOrderStatusCommand(int OrderNumber) : IRequest<bool>;

src/Ordering.API/Application/Commands/SetStockConfirmedOrderStatusCommandHandler.cs → src/Ordering.API/Application/Commands/SetStockConfirmedOrderStatus/SetStockConfirmedOrderStatusCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.SetStockConfirmedOrderStatus;
 
 // Regular CommandHandler
 public class SetStockConfirmedOrderStatusCommandHandler : IRequestHandler<SetStockConfirmedOrderStatusCommand, bool>

src/Ordering.API/Application/Commands/SetStockRejectedOrderStatusCommand.cs → src/Ordering.API/Application/Commands/SetStockRejectedOrderStatus/SetStockRejectedOrderStatusCommand.cs

@@ -1,3 +1,3 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.SetStockRejectedOrderStatus;
 
 public record SetStockRejectedOrderStatusCommand(int OrderNumber, List<int> OrderStockItems) : IRequest<bool>;

src/Ordering.API/Application/Commands/SetStockRejectedOrderStatusCommandHandler.cs → src/Ordering.API/Application/Commands/SetStockRejectedOrderStatus/SetStockRejectedOrderStatusCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.SetStockRejectedOrderStatus;
 
 // Regular CommandHandler
 public class SetStockRejectedOrderStatusCommandHandler : IRequestHandler<SetStockRejectedOrderStatusCommand, bool>

src/Ordering.API/Application/Commands/ShipOrderCommand.cs → src/Ordering.API/Application/Commands/ShipOrder/ShipOrderCommand.cs

@@ -1,3 +1,3 @@
-namespace eShop.Ordering.API.Application.Commands;
+namespace eShop.Ordering.API.Application.Commands.ShipOrder;
 
 public record ShipOrderCommand(int OrderNumber) : IRequest<bool>;

src/Ordering.API/Application/Commands/ShipOrderCommandHandler.cs → src/Ordering.API/Application/Commands/ShipOrder/ShipOrderCommandHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Commands.ShipOrder;
 
 // Regular CommandHandler
 public class ShipOrderCommandHandler : IRequestHandler<ShipOrderCommand, bool>

src/Ordering.API/Application/IntegrationEvents/EventHandling/GracePeriodConfirmedIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
+using eShop.Ordering.API.Application.Commands.SetAwaitingValidationOrderStatus;
+
+namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
 
 public class GracePeriodConfirmedIntegrationEventHandler(
     IMediator mediator,

src/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentFailedIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+
+namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
 
 public class OrderPaymentFailedIntegrationEventHandler(
     IMediator mediator,

src/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSucceededIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
+using eShop.Ordering.API.Application.Commands.SetPaidOrderStatus;
+
+namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
 
 public class OrderPaymentSucceededIntegrationEventHandler(
     IMediator mediator,

src/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
+using eShop.Ordering.API.Application.Commands.SetStockConfirmedOrderStatus;
+
+namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
 
 public class OrderStockConfirmedIntegrationEventHandler(
     IMediator mediator,

src/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockRejectedIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
+using eShop.Ordering.API.Application.Commands.SetStockRejectedOrderStatus;
+
+namespace eShop.Ordering.API.Application.IntegrationEvents.EventHandling;
 public class OrderStockRejectedIntegrationEventHandler(
     IMediator mediator,
     ILogger<OrderStockRejectedIntegrationEventHandler> logger) : IIntegrationEventHandler<OrderStockRejectedIntegrationEvent>

src/Ordering.API/Application/Validations/CancelOrderCommandValidator.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Validations;
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+
+namespace eShop.Ordering.API.Application.Validations;
 
 public class CancelOrderCommandValidator : AbstractValidator<CancelOrderCommand>
 {

src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs

@@ -1,4 +1,7 @@
-namespace eShop.Ordering.API.Application.Validations;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrderDraft;
+
+namespace eShop.Ordering.API.Application.Validations;
 public class CreateOrderCommandValidator : AbstractValidator<CreateOrderCommand>
 {
     public CreateOrderCommandValidator(ILogger<CreateOrderCommandValidator> logger)

src/Ordering.API/Application/Validations/IdentifiedCommandValidator.cs

@@ -1,4 +1,7 @@
-namespace eShop.Ordering.API.Application.Validations;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.API.Application.Validations;
 
 public class IdentifiedCommandValidator : AbstractValidator<IdentifiedCommand<CreateOrderCommand, bool>>
 {

src/Ordering.API/Application/Validations/ShipOrderCommandValidator.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Application.Validations;
+using eShop.Ordering.API.Application.Commands.ShipOrder;
+
+namespace eShop.Ordering.API.Application.Validations;
 
 public class ShipOrderCommandValidator : AbstractValidator<ShipOrderCommand>
 {

src/Ordering.API/Extensions/BasketItemExtensions.cs

@@ -1,4 +1,6 @@
-namespace eShop.Ordering.API.Extensions;
+using eShop.Ordering.API.Application.Commands.CreateOrderDraft;
+
+namespace eShop.Ordering.API.Extensions;
 
 public static class BasketItemExtensions
 {

src/Ordering.API/Extensions/Extensions.cs

@@ -1,4 +1,9 @@
-internal static class Extensions
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.Identified;
+using eShop.Ordering.API.Application.Commands.ShipOrder;
+
+internal static class Extensions
 {
     public static void AddApplicationServices(this IHostApplicationBuilder builder)
     {

tests/Ordering.FunctionalTests/OrderingApiTests.cs

@@ -3,7 +3,7 @@
 using System.Text.Json;
 using Asp.Versioning;
 using Asp.Versioning.Http;
-using eShop.Ordering.API.Application.Commands;
+using eShop.Ordering.API.Application.Commands.CreateOrderDraft;
 using eShop.Ordering.API.Application.Models;
 using eShop.Ordering.API.Application.Queries;
 using Microsoft.AspNetCore.Mvc.Testing;

tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs

@@ -1,4 +1,7 @@
-namespace eShop.Ordering.UnitTests.Application;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.Identified;
+
+namespace eShop.Ordering.UnitTests.Application;
 
 [TestClass]
 public class IdentifiedCommandHandlerTest

tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs

@@ -1,4 +1,5 @@
-using eShop.Ordering.API.Application.IntegrationEvents;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.IntegrationEvents;
 using eShop.Ordering.Domain.AggregatesModel.OrderAggregate;
 
 namespace eShop.Ordering.UnitTests.Application;

tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs

@@ -4,6 +4,10 @@
 using eShop.Ordering.API.Application.Queries;
 using Order = eShop.Ordering.API.Application.Queries.Order;
 using NSubstitute.ExceptionExtensions;
+using eShop.Ordering.API.Application.Commands.CancelOrder;
+using eShop.Ordering.API.Application.Commands.CreateOrder;
+using eShop.Ordering.API.Application.Commands.Identified;
+using eShop.Ordering.API.Application.Commands.ShipOrder;
 
 [TestClass]
 public class OrdersWebApiTest

tests/Ordering.UnitTests/Application/SetStockRejectedOrderStatusCommandTest.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using eShop.Ordering.API.Application.Commands.SetStockRejectedOrderStatus;
 
 namespace eShop.Ordering.UnitTests.Application;