Change Xamarin app to call basket for order checkout

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; }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs

@@ -42,6 +42,15 @@ namespace eShopOnContainers.Core.Services.Basket
             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);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs

@@ -7,6 +7,7 @@ namespace eShopOnContainers.Core.Services.Basket
     {
         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);
     }
 }

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);
     }
 }

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 @@ namespace eShopOnContainers.Core.Services.Order
             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 @@ namespace eShopOnContainers.Core.Services.Order
             else
                 return new ObservableCollection<CardType>();
         }
+
+        public BasketCheckout MapOrderToBasket(Models.Orders.Order order)
+        {
+            return MockBasketCheckout;            
+        }
     }
 }

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 @@ namespace eShopOnContainers.Core.Services.Order
             _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 @@ namespace eShopOnContainers.Core.Services.Order
                 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
+            };
+        }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs

@@ -132,8 +132,10 @@ namespace eShopOnContainers.Core.ViewModels
             {
                 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);

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>