Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign

# Conflicts:
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

Author: christian147

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -52,15 +52,21 @@ public async Task<IActionResult> Post([FromBody]CustomerBasket value)
         }
 
         [Route("checkout")]
-        [HttpPut]
-        public async Task<IActionResult> Checkout([FromBody]BasketCheckout value)
+        [HttpPost]
+        public async Task<IActionResult> Checkout([FromBody]BasketCheckout value, [FromHeader(Name = "x-requestid")] string requestId)
         {
             var userId = _identitySvc.GetUserIdentity();
+            value.RequestId = (Guid.TryParse(requestId, out Guid guid) && guid != Guid.Empty) ?
+                guid : value.RequestId;
+
             var basket = await _repository.GetBasketAsync(userId);
             var eventMessage = new UserCheckoutAcceptedIntegrationEvent(userId, value.City, value.Street,
                 value.State, value.Country, value.ZipCode, value.CardNumber, value.CardHolderName,
                 value.CardExpiration, value.CardSecurityNumber, value.CardTypeId, value.Buyer, value.RequestId, basket);
 
+            // Once basket is checkout, sends an integration event to
+            // ordering.api to convert basket to order and proceeds with
+            // order creation process
             _eventBus.Publish(eventMessage);
 
             if (basket == null)

src/Services/Catalog/Catalog.API/IntegrationCommands/CommandHandlers/DecrementOrderStockCommandMsgHandler.cs

@@ -23,20 +23,11 @@ public async Task Handle(DecrementOrderStockCommandMsg @event)
             foreach (var orderStockItem in @event.OrderStockItems)
             {
                 var catalogItem = _catalogContext.CatalogItems.Find(orderStockItem.ProductId);
-                CheckValidcatalogItemId(catalogItem);
 
                 catalogItem.RemoveStock(orderStockItem.Units);
             }
 
             await _catalogContext.SaveChangesAsync();
         }
-
-        private void CheckValidcatalogItemId(CatalogItem catalogItem)
-        {
-            if (catalogItem is null)
-            {
-                throw new CatalogDomainException("Not able to process catalog event. Reason: no valid catalogItemId");
-            }
-        }
     }
 }

src/Services/Ordering/Ordering.API/Application/Commands/ShipOrderCommand.cs

@@ -0,0 +1,21 @@
+using MediatR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.Commands
+{
+    public class ShipOrderCommand : IAsyncRequest<bool>
+    {
+
+        [DataMember]
+        public int OrderNumber { get; private set; }
+
+        public ShipOrderCommand(int orderNumber)
+        {
+            OrderNumber = orderNumber;
+        }
+    }
+}

src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs

@@ -26,8 +26,6 @@ public async Task Handle(OrderStartedDomainEvent orderStartedEvent)
         {
             var cardTypeId = (orderStartedEvent.CardTypeId != 0) ? orderStartedEvent.CardTypeId : 1;
 
-            //var userGuid = _identityService.GetUserIdentity();
-
             var buyer = await _buyerRepository.FindAsync(orderStartedEvent.UserId);
             bool buyerOriginallyExisted = (buyer == null) ? false : true;
 

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

@@ -3,7 +3,6 @@
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
     using Ordering.API.Application.IntegrationEvents.Events;
-    using Ordering.Domain.Exceptions;
     using System.Threading.Tasks;
 
     public class OrderPaymentFailedIntegrationEventHandler : 

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSuccededIntegrationEventHandler.cs

@@ -3,7 +3,6 @@
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
     using Ordering.API.Application.IntegrationEvents.Events;
-    using Ordering.Domain.Exceptions;
     using System.Threading.Tasks;
 
     public class OrderPaymentSuccededIntegrationEventHandler : 

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

@@ -4,8 +4,6 @@
     using System.Threading.Tasks;
     using Events;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
-    using Ordering.API.Application.IntegrationCommands.Commands;
-    using Ordering.Domain.Exceptions;
 
     public class OrderStockConfirmedIntegrationEventHandler : 
         IIntegrationEventHandler<OrderStockConfirmedIntegrationEvent>

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockNotConfirmedIntegrationEventHandler.cs

@@ -4,11 +4,9 @@
 namespace Ordering.API.Application.IntegrationEvents.EventHandling
 {
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-    using System;
     using System.Threading.Tasks;
     using Events;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
-    using Domain.Exceptions;
 
     public class OrderStockNotConfirmedIntegrationEventHandler : IIntegrationEventHandler<OrderStockNotConfirmedIntegrationEvent>
     {

src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs

@@ -1,17 +1,14 @@
-using Autofac.Features.OwnedInstances;
-using MediatR;
+using MediatR;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands;
 using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
 using Ordering.API.Application.Commands;
 using Ordering.API.Application.IntegrationCommands.Commands;
+using Ordering.API.Application.IntegrationEvents;
 using Ordering.Domain.Exceptions;
-using System;
-using System.Linq;
 using System.Threading.Tasks;
-using Ordering.API.Application.IntegrationEvents;
 
 namespace Ordering.API.Application.Sagas
 {
@@ -25,20 +22,14 @@ namespace Ordering.API.Application.Sagas
     /// </summary>
     public class OrderProcessSaga : OrderSaga,
         IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>,
-        IAsyncRequestHandler<CancelOrderCommand, bool>
+        IAsyncRequestHandler<CancelOrderCommand, bool>,
+        IAsyncRequestHandler<ShipOrderCommand, bool>
     {
-        private readonly IMediator _mediator;
-        private readonly Func<Owned<OrderingContext>> _dbContextFactory;
-        private readonly IOrderingIntegrationEventService _orderingIntegrationEventService;
 
         public OrderProcessSaga(
-            Func<Owned<OrderingContext>> dbContextFactory, OrderingContext orderingContext,
-            IMediator mediator, IOrderingIntegrationEventService orderingIntegrationEventService)
+            OrderingContext orderingContext)
             : base(orderingContext)
         {
-            _dbContextFactory = dbContextFactory;
-            _mediator = mediator;
-            _orderingIntegrationEventService = orderingIntegrationEventService;
         }        
 
         /// <summary>
@@ -73,12 +64,41 @@ public async Task Handle(ConfirmGracePeriodCommandMsg @event)
         /// <returns></returns>
         public async Task<bool> Handle(CancelOrderCommand command)
         {
+            var result = false;
             var orderSaga = FindSagaById(command.OrderNumber);
             CheckValidSagaId(orderSaga);
 
-            // Set order status tu cancelled
+            // Not possible to cancel order when 
+            // it has already been shipped
+            if (orderSaga.GetOrderStatusId() != OrderStatus.Cancelled.Id
+                || orderSaga.GetOrderStatusId() != OrderStatus.Shipped.Id)
+            {
+                orderSaga.SetCancelStatus();
+                result = await SaveChangesAsync();
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Handler which processes the command when
+        /// administrator executes ship order from app
+        /// </summary>
+        /// <param name="command"></param>
+        /// <returns></returns>
+        public async Task<bool> Handle(ShipOrderCommand command)
+        {
+            var result = false;
+            var orderSaga = FindSagaById(command.OrderNumber);
+            CheckValidSagaId(orderSaga);
 
-            return true;
+            // Only ship order when 
+            // its status is paid
+            if (orderSaga.GetOrderStatusId() == OrderStatus.Paid.Id)
+            {
+                orderSaga.SetShippedStatus();
+                result = await SaveChangesAsync();
+            }
+            return result;
         }
 
         private void CheckValidSagaId(Order orderSaga)
@@ -103,6 +123,18 @@ protected override bool CreateResultForDuplicateRequest()
             }
         }
 
+        public class ShipOrderCommandIdentifiedHandler : IdentifierCommandHandler<ShipOrderCommand, bool>
+        {
+            public ShipOrderCommandIdentifiedHandler(IMediator mediator, IRequestManager requestManager) : base(mediator, requestManager)
+            {
+            }
+
+            protected override bool CreateResultForDuplicateRequest()
+            {
+                return true;                // Ignore duplicate requests for processing order.
+            }
+        }
+
         #endregion
     }
 }

src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs

@@ -28,7 +28,7 @@ public OrdersController(IMediator mediator, IOrderQueries orderQueries, IIdentit
         }
 
         [Route("cancel")]
-        [HttpPost]
+        [HttpPut]
         public async Task<IActionResult> CancelOrder([FromBody]CancelOrderCommand command, [FromHeader(Name = "x-requestid")] string requestId)
         {
             bool commandResult = false;
@@ -42,6 +42,21 @@ public async Task<IActionResult> CancelOrder([FromBody]CancelOrderCommand comman
 
         }
 
+        [Route("ship")]
+        [HttpPut]
+        public async Task<IActionResult> ShipOrder([FromBody]ShipOrderCommand command, [FromHeader(Name = "x-requestid")] string requestId)
+        {
+            bool commandResult = false;
+            if (Guid.TryParse(requestId, out Guid guid) && guid != Guid.Empty)
+            {
+                var requestShipOrder = new IdentifiedCommand<ShipOrderCommand, bool>(command, guid);
+                commandResult = await _mediator.SendAsync(requestShipOrder);
+            }
+
+            return commandResult ? (IActionResult)Ok() : (IActionResult)BadRequest();
+
+        }
+
         [Route("{orderId:int}")]
         [HttpGet]
         public async Task<IActionResult> GetOrder(int orderId)