diff --git a/src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs b/src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs index f26c46925..e91b52ae9 100644 --- a/src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs +++ b/src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs @@ -29,17 +29,16 @@ namespace Ordering.API.Application.Sagas OrderingContext orderingContext) : base(orderingContext) { - } + } /// - /// Command handler which confirms that the grace period - /// has been completed and order has not been cancelled. - /// If so, the process continues for validation. + /// Event handler which confirms that the grace period + /// has been completed and order will not initially be cancelled. + /// Therefore, the order process continues for validation. /// /// - /// Integration command message which is sent by a saga - /// scheduler which provides the sagas that its grace - /// period has completed. + /// Integration event message which is sent by a saga scheduler + /// telling us that the saga's grace period has completed. /// /// public async Task Handle(GracePeriodConfirmedIntegrationEvent @event) diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs b/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs index 68b1baf34..ebc4778d1 100644 --- a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs +++ b/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs @@ -31,7 +31,7 @@ if (!context.OrderStatus.Any()) { - context.OrderStatus.Add(OrderStatus.Submited); + context.OrderStatus.Add(OrderStatus.Submitted); context.OrderStatus.Add(OrderStatus.AwaitingValidation); context.OrderStatus.Add(OrderStatus.StockConfirmed); context.OrderStatus.Add(OrderStatus.Paid); diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs index a7389a227..37c17c897 100644 --- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs +++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs @@ -46,7 +46,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O _orderItems = new List(); _buyerId = buyerId; _paymentMethodId = paymentMethodId; - _orderStatusId = OrderStatus.Submited.Id; + _orderStatusId = OrderStatus.Submitted.Id; _orderDate = DateTime.UtcNow; Address = address; @@ -97,7 +97,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O public void SetAwaitingValidationStatus() { if (_orderStatusId == OrderStatus.Cancelled.Id || - _orderStatusId != OrderStatus.Submited.Id) + _orderStatusId != OrderStatus.Submitted.Id) { StatusChangeException(OrderStatus.AwaitingValidation); } diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs index 02891fb58..bc07635ae 100644 --- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs +++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs @@ -10,7 +10,7 @@ public class OrderStatus : Enumeration { - public static OrderStatus Submited = new OrderStatus(1, nameof(Submited).ToLowerInvariant()); + public static OrderStatus Submitted = new OrderStatus(1, nameof(Submitted).ToLowerInvariant()); public static OrderStatus AwaitingValidation = new OrderStatus(2, nameof(AwaitingValidation).ToLowerInvariant()); public static OrderStatus StockConfirmed = new OrderStatus(3, nameof(StockConfirmed).ToLowerInvariant()); public static OrderStatus Paid = new OrderStatus(4, nameof(Paid).ToLowerInvariant()); @@ -27,7 +27,7 @@ } public static IEnumerable List() => - new[] { Submited, AwaitingValidation, StockConfirmed, Paid, Shipped, Cancelled }; + new[] { Submitted, AwaitingValidation, StockConfirmed, Paid, Shipped, Cancelled }; public static OrderStatus FromName(string name) { diff --git a/src/Web/WebMVC/Views/Order/Index.cshtml b/src/Web/WebMVC/Views/Order/Index.cshtml index 8216c264d..16e5a2003 100644 --- a/src/Web/WebMVC/Views/Order/Index.cshtml +++ b/src/Web/WebMVC/Views/Order/Index.cshtml @@ -31,7 +31,7 @@ Detail
- @if (item.Status.ToLower() == "submited") + @if (item.Status.ToLower() == "submitted") { Cancel } diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs index e35fb45bd..50ae3cdbb 100644 --- a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs +++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs @@ -18,14 +18,14 @@ namespace FunctionalTests.Services.Ordering { // Issue: Unable to communicate with test host process //[Fact] - //public async Task Checkout_basket_and_check_order_status_submited() + //public async Task Checkout_basket_and_check_order_status_submitted() //{ // using (var orderServer = new OrderingScenariosBase().CreateServer()) // using (var basketServer = new BasketScenariosBase().CreateServer()) // { // // Expected data // var cityExpected = $"city-{Guid.NewGuid()}"; - // var orderStatusExpected = "submited"; + // var orderStatusExpected = "submitted"; // var basketClient = basketServer.CreateIdempotentClient(); // var orderClient = orderServer.CreateIdempotentClient();