ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
This commit is contained in:
Christian Arenas 2017-05-16 11:21:37 +02:00
parent db41124d78
commit 504efbd191
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs
View File

@ -73,7 +73,7 @@ namespace Ordering.API.Application.Sagas
if (orderSaga.GetOrderStatusId() != OrderStatus.Cancelled.Id if (orderSaga.GetOrderStatusId() != OrderStatus.Cancelled.Id
|| orderSaga.GetOrderStatusId() != OrderStatus.Shipped.Id) || orderSaga.GetOrderStatusId() != OrderStatus.Shipped.Id)
{ {
orderSaga.SetCancelStatus(); orderSaga.SetCancelledStatus();
result = await SaveChangesAsync(); result = await SaveChangesAsync();
} }
return result; return result;

20
src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
View File

@ -170,36 +170,28 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
{ {
if (_orderStatusId == OrderStatus.Submited.Id) if (_orderStatusId == OrderStatus.Submited.Id)
{ {
_description = ""; _description = "The order was cancelled before the grace period was confirm.";
} }
else if (_orderStatusId == OrderStatus.AwaitingValidation.Id) else if (_orderStatusId == OrderStatus.AwaitingValidation.Id)
{ {
_description = ""; _description = "The order was cancelled before to check the order stock items.";
} }
else if (_orderStatusId == OrderStatus.StockConfirmed.Id) else if (_orderStatusId == OrderStatus.StockConfirmed.Id)
{ {
_description = ""; _description = "The order was cancelled before to pay the order.";
} }
else if (_orderStatusId == OrderStatus.Paid.Id) else if (_orderStatusId == OrderStatus.Paid.Id)
{ {
_description = ""; _description = "The order was cancelled before to ship the order.";
} }
else if(_orderStatusId == OrderStatus.Shipped.Id) else if(_orderStatusId == OrderStatus.Shipped.Id)
{ {
throw new OrderingDomainException("Not possible to change order status. Reason: cannot cancel order it is already shipped"); throw new OrderingDomainException("Not possible to change order status. Reason: cannot cancel order it is already shipped.");
} }
_orderStatusId = OrderStatus.Cancelled.Id; _orderStatusId = OrderStatus.Cancelled.Id;
} }
public void SetCancelStatus()
{
if (_orderStatusId == OrderStatus.Shipped.Id)
{
throw new OrderingDomainException("Not possible to change order status. Reason: cannot cancel order it is already shipped");
}
_orderStatusId = OrderStatus.Cancelled.Id;
}
#endregion #endregion
public int GetOrderStatusId() public int GetOrderStatusId()