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

christian147 · christian147 · commit f79e21f2f717 · 2017-05-18T11:51:12.000+02:00
# Conflicts:
#	src/Services/Ordering/Ordering.API/Startup.cs
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketCheckout.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketCheckout.cs
@@ -0,0 +1,36 @@
+﻿using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace eShopOnContainers.Core.Models.Basket
+{
+    public class BasketCheckout
+    {
+        [Required]
+        public string City { get; set; }
+        [Required]
+        public string Street { get; set; }
+        [Required]
+        public string State { get; set; }
+        [Required]
+        public string Country { get; set; }
+
+        public string ZipCode { get; set; }
+        [Required]
+        public string CardNumber { get; set; }
+        [Required]
+        public string CardHolderName { get; set; }
+
+        [Required]
+        public DateTime CardExpiration { get; set; }
+
+        [Required]
+        public string CardSecurityNumber { get; set; }
+
+        public int CardTypeId { get; set; }
+
+        public string Buyer { get; set; }
+
+        [Required]
+        public Guid RequestId { get; set; }
+    }
+}
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
@@ -42,6 +42,15 @@ public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBaske
             return result;
         }
 
+        public async Task CheckoutAsync(BasketCheckout basketCheckout, string token)
+        {
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint + "/checkout");
+
+            string uri = builder.ToString();
+
+            await _requestProvider.PostAsync(uri, basketCheckout, token);
+        }
+
         public async Task ClearBasketAsync(string guidUser, string token)
         {
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs
@@ -7,6 +7,7 @@ public interface IBasketService
     {
         Task<CustomerBasket> GetBasketAsync(string guidUser, string token);
         Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token);
+        Task CheckoutAsync(BasketCheckout basketCheckout, string token);
         Task ClearBasketAsync(string guidUser, string token);
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
@@ -1,13 +1,15 @@
-﻿using System.Collections.ObjectModel;
+﻿using eShopOnContainers.Core.Models.Basket;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 
 namespace eShopOnContainers.Core.Services.Order
 {
     public interface IOrderService
     {
-        Task CreateOrderAsync(Models.Orders.Order newOrder, string token);
+        //Task CreateOrderAsync(Models.Orders.Order newOrder, string token);
         Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token);
         Task<Models.Orders.Order> GetOrderAsync(int orderId, string token);
         Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync(string token);
+        BasketCheckout MapOrderToBasket(Models.Orders.Order order);
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs
@@ -1,4 +1,5 @@
 ﻿using eShopOnContainers.Core.Extensions;
+using eShopOnContainers.Core.Models.Basket;
 using eShopOnContainers.Core.Models.Orders;
 using eShopOnContainers.Core.Models.User;
 using System;
@@ -64,17 +65,18 @@ public class OrderMockService : IOrderService
             new CardType { Id = 3, Name = "MasterCard" },
         };
 
-        public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
+        private static BasketCheckout MockBasketCheckout = new BasketCheckout()
         {
-            await Task.Delay(500);
-
-            if (!string.IsNullOrEmpty(token))
-            {
-                newOrder.OrderNumber = string.Format("{0}", MockOrders.Count + 1);
-
-                MockOrders.Insert(0, newOrder);
-            }
-        }
+            CardExpiration = DateTime.UtcNow,
+            CardHolderName = "FakeCardHolderName",
+            CardNumber = "122333423224",
+            CardSecurityNumber = "1234",
+            CardTypeId = 1,
+            City = "FakeCity",
+            Country = "FakeCountry",
+            ZipCode = "FakeZipCode",
+            Street = "FakeStreet"
+        };
 
         public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token)
         {
@@ -111,5 +113,10 @@ public async Task<ObservableCollection<CardType>> GetCardTypesAsync(string token
             else
                 return new ObservableCollection<CardType>();
         }
+
+        public BasketCheckout MapOrderToBasket(Models.Orders.Order order)
+        {
+            return MockBasketCheckout;            
+        }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
@@ -1,4 +1,5 @@
-﻿using eShopOnContainers.Core.Services.RequestProvider;
+﻿using eShopOnContainers.Core.Models.Basket;
+using eShopOnContainers.Core.Services.RequestProvider;
 using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
@@ -14,17 +15,6 @@ public OrderService(IRequestProvider requestProvider)
             _requestProvider = requestProvider;
         }
 
-        public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
-        {
-            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
-
-            builder.Path = "api/v1/orders/new";
-
-            string uri = builder.ToString();
-
-            await _requestProvider.PostAsync(uri, newOrder, token, "x-requestid");
-        }
-
         public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token)
         {
         
@@ -82,5 +72,21 @@ public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
                 return new ObservableCollection<Models.Orders.CardType>();
             }
         }
+
+        public BasketCheckout MapOrderToBasket(Models.Orders.Order order)
+        {
+            return new BasketCheckout()
+            {
+                CardExpiration = order.CardExpiration,
+                CardHolderName = order.CardHolderName,
+                CardNumber = order.CardNumber,
+                CardSecurityNumber = order.CardSecurityNumber,
+                CardTypeId = order.CardTypeId,
+                City = order.ShippingCity,
+                Country = order.ShippingCountry,
+                ZipCode = order.ShippingZipCode,
+                Street = order.ShippingStreet
+            };
+        }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
@@ -132,8 +132,10 @@ private async Task CheckoutAsync()
             {
                 var authToken = Settings.AuthAccessToken;
 
-                // Create new order
-                await _orderService.CreateOrderAsync(Order, authToken);
+                var basket = _orderService.MapOrderToBasket(Order);
+
+                // Create basket checkout
+                await _basketService.CheckoutAsync(basket, authToken);
 
                 // Clean Basket
                 await _basketService.ClearBasketAsync(_shippingAddress.Id.ToString(), authToken);
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Helpers\EasingHelper.cs" />
     <Compile Include="Helpers\ServicesHelper.cs" />
     <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Models\Basket\BasketCheckout.cs" />
     <Compile Include="Models\Basket\BasketItem.cs" />
     <Compile Include="Models\Basket\CustomerBasket.cs" />
     <Compile Include="Models\Catalog\CatalogBrand.cs" />
@@ -260,6 +261,11 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.ComponentModel.Annotations">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.6\Profile\Profile44\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs
@@ -1,5 +1,6 @@
 ﻿using Basket.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 using System;
 using System.Threading.Tasks;
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs b/src/Services/Basket/Basket.API/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs
@@ -7,9 +7,9 @@ namespace Basket.API.IntegrationEvents.Events
     // An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.
     public class OrderStartedIntegrationEvent : IntegrationEvent
     {
-        public string UserId { get; }
+        public string UserId { get; set; }
 
-        public OrderStartedIntegrationEvent(string userId) =>
-            UserId = userId;
+        public OrderStartedIntegrationEvent(string userId)
+            => UserId = userId;            
     }
 }
diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs
@@ -1,30 +1,30 @@
-﻿using Basket.API.Infrastructure.Filters;
+﻿using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Basket.API.Infrastructure.Filters;
 using Basket.API.IntegrationEvents.EventHandling;
 using Basket.API.IntegrationEvents.Events;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
 using Microsoft.eShopOnContainers.Services.Basket.API.Auth.Server;
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.EventHandling;
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+using Microsoft.eShopOnContainers.Services.Basket.API.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.HealthChecks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
 using StackExchange.Redis;
+using System;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System;
-using Microsoft.eShopOnContainers.Services.Basket.API.Services;
-using Microsoft.AspNetCore.Http;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API
 {
@@ -114,6 +114,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             services.AddTransient<IBasketRepository, RedisBasketRepository>();
             services.AddTransient<IIdentityService, IdentityService>();
             RegisterServiceBus(services);
+            services.AddOptions();
 
             var container = new ContainerBuilder();
             container.Populate(services);
@@ -127,7 +128,6 @@ private void RegisterServiceBus(IServiceCollection services)
 
             services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
             services.AddTransient<OrderStartedIntegrationEventHandler>();
-
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -166,7 +166,6 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)
         protected virtual void ConfigureEventBus(IApplicationBuilder app)
         {
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
-
             eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
             eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>();
         }
diff --git a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs
@@ -11,9 +11,9 @@ namespace Ordering.API.Application.IntegrationEvents.Events
     // An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.
     public class OrderStartedIntegrationEvent : IntegrationEvent
     {
-        public string UserId { get; }
+        public string UserId { get; set; }
 
-        public OrderStartedIntegrationEvent(string userId) =>
-            UserId = userId;
+        public OrderStartedIntegrationEvent(string userId)
+            => UserId = userId;
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs
@@ -1,9 +1,6 @@
 ﻿using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Ordering.API.Application.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Ordering.API.Application.IntegrationEvents.Events
 {
diff --git a/src/Services/Ordering/Ordering.API/Application/Validations/CancelOrderCommandValidator.cs b/src/Services/Ordering/Ordering.API/Application/Validations/CancelOrderCommandValidator.cs
@@ -0,0 +1,17 @@
+﻿using FluentValidation;
+using Ordering.API.Application.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.Validations
+{
+    public class CancelOrderCommandValidator : AbstractValidator<CancelOrderCommand>
+    {
+        public CancelOrderCommandValidator()
+        {
+            RuleFor(order => order.OrderNumber).NotEmpty().WithMessage("No orderId found");
+        }
+    }
+}
diff --git a/src/Services/Ordering/Ordering.API/Application/Validations/ShipOrderCommandValidator.cs b/src/Services/Ordering/Ordering.API/Application/Validations/ShipOrderCommandValidator.cs
@@ -0,0 +1,17 @@
+﻿using FluentValidation;
+using Ordering.API.Application.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.Validations
+{
+    public class ShipOrderCommandValidator : AbstractValidator<ShipOrderCommand>
+    {
+        public ShipOrderCommandValidator()
+        {
+            RuleFor(order => order.OrderNumber).NotEmpty().WithMessage("No orderId found");
+        }
+    }
+}
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -4,6 +4,7 @@
     using Autofac;
     using Autofac.Extensions.DependencyInjection;
     using global::Ordering.API.Application.IntegrationEvents;
+    using global::Ordering.API.Application.IntegrationEvents.EventHandling;
     using global::Ordering.API.Application.IntegrationEvents.Events;
     using global::Ordering.API.Infrastructure.Middlewares;
     using Infrastructure;
@@ -121,7 +122,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 return new DefaultRabbitMQPersistentConnection(factory, logger);
             });
 
-            RegisterServiceBus(services);
+            RegisterServiceBus(services);            
             services.AddOptions();
 
             //configure autofac
diff --git a/test/Services/FunctionalTests/Services/Basket/BasketScenariosBase.cs b/test/Services/FunctionalTests/Services/Basket/BasketScenariosBase.cs
@@ -29,6 +29,7 @@ public static string GetBasketByCustomer(string customerId)
         public static class Post
         {
             public static string CreateBasket = "/";
+            public static string Checkout = "/checkout";
         }
     }
 }
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
diff --git a/test/Services/IntegrationTests/Services/Basket/BasketScenarioBase.cs b/test/Services/IntegrationTests/Services/Basket/BasketScenarioBase.cs
diff --git a/test/Services/IntegrationTests/Services/Basket/BasketScenarios.cs b/test/Services/IntegrationTests/Services/Basket/BasketScenarios.cs
diff --git a/test/Services/IntegrationTests/Services/Basket/appsettings.json b/test/Services/IntegrationTests/Services/Basket/appsettings.json
diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public interface IBasketService`
`7`	`7`	`{`
`8`	`8`	`Task<CustomerBasket> GetBasketAsync(string guidUser, string token);`
`9`	`9`	`Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token);`
	`10`	`+ Task CheckoutAsync(BasketCheckout basketCheckout, string token);`
`10`	`11`	`Task ClearBasketAsync(string guidUser, string token);`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`		`-using System.Collections.ObjectModel;`
	`1`	`+using eShopOnContainers.Core.Models.Basket;`
	`2`	`+using System.Collections.ObjectModel;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace eShopOnContainers.Core.Services.Order`
`5`	`6`	`{`
`6`	`7`	`public interface IOrderService`
`7`	`8`	`{`
`8`		`- Task CreateOrderAsync(Models.Orders.Order newOrder, string token);`
	`9`	`+ //Task CreateOrderAsync(Models.Orders.Order newOrder, string token);`
`9`	`10`	`Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token);`
`10`	`11`	`Task<Models.Orders.Order> GetOrderAsync(int orderId, string token);`
`11`	`12`	`Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync(string token);`
	`13`	`+ BasketCheckout MapOrderToBasket(Models.Orders.Order order);`
`12`	`14`	`}`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ namespace Basket.API.IntegrationEvents.Events`
`7`	`7`	`// An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.`
`8`	`8`	`public class OrderStartedIntegrationEvent : IntegrationEvent`
`9`	`9`	`{`
`10`		`- public string UserId { get; }`
	`10`	`+ public string UserId { get; set; }`
`11`	`11`
`12`		`- public OrderStartedIntegrationEvent(string userId) =>`
`13`		`- UserId = userId;`
	`12`	`+ public OrderStartedIntegrationEvent(string userId)`
	`13`	`+ => UserId = userId;`
`14`	`14`	`}`
`15`	`15`	`}`