Change SPA app to call basket for order checkout

ramon-tomas-c · ramon-tomas-c · commit b2b01bae062b · 2017-05-16T09:23:35.000+02:00
diff --git a/src/Services/Basket/Basket.API/Controllers/BasketController.cs b/src/Services/Basket/Basket.API/Controllers/BasketController.cs
@@ -52,10 +52,13 @@ 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,
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -3,12 +3,11 @@
     using AspNetCore.Http;
     using Autofac;
     using Autofac.Extensions.DependencyInjection;
-    using global::Ordering.API.Application.IntegrationEvents;
-    using global::Ordering.API.Application.IntegrationEvents.Events;
-    using global::Ordering.API.Infrastructure.Middlewares;
     using global::Ordering.API.Application.IntegrationCommands.Commands;
+    using global::Ordering.API.Application.IntegrationEvents;
     using global::Ordering.API.Application.IntegrationEvents.Events;
     using global::Ordering.API.Application.Sagas;
+    using global::Ordering.API.Infrastructure.Middlewares;
     using Infrastructure;
     using Infrastructure.Auth;
     using Infrastructure.AutofacModules;
@@ -31,7 +30,6 @@
     using System;
     using System.Data.Common;
     using System.Reflection;
-    using global::Ordering.API.Application.IntegrationEvents.EventHandling;
 
     public class Startup
     {
diff --git a/src/Web/WebMVC/Services/BasketService.cs b/src/Web/WebMVC/Services/BasketService.cs
@@ -60,7 +60,7 @@ public async Task Checkout(BasketDTO basket)
             var token = await GetUserTokenAsync();
             var updateBasketUri = API.Basket.CheckoutBasket(_remoteServiceBaseUrl);
 
-            var response = await _apiClient.PutAsync(updateBasketUri, basket, token);
+            var response = await _apiClient.PostAsync(updateBasketUri, basket, token);
 
             response.EnsureSuccessStatusCode();
         }
diff --git a/src/Web/WebSPA/Client/modules/basket/basket.service.ts b/src/Web/WebSPA/Client/modules/basket/basket.service.ts
@@ -4,7 +4,9 @@ import { Router }                   from '@angular/router';
 
 import { DataService }              from '../shared/services/data.service';
 import { SecurityService }          from '../shared/services/security.service';
-import { IBasket }                  from '../shared/models/basket.model';
+import { IBasket } from '../shared/models/basket.model';
+import { IOrder } from '../shared/models/order.model';
+import { IBasketCheckout } from '../shared/models/basketCheckout.model';
 import { IBasketItem }              from '../shared/models/basketItem.model';
 import { BasketWrapperService }     from '../shared/services/basket.wrapper.service';
 import { ConfigurationService }     from '../shared/services/configuration.service';
@@ -67,6 +69,12 @@ export class BasketService {
         });
     }
 
+    setBasketCheckout(basketCheckout): Observable<boolean> {
+        return this.service.postWithId(this.basketUrl + '/checkout', basketCheckout).map((response: Response) => {
+            return true;
+        });
+    }
+
     getBasket(): Observable<IBasket> {
         return this.service.get(this.basketUrl + '/' + this.basket.buyerId).map((response: Response) => {
             if (response.status === 204) {
@@ -83,6 +91,25 @@ export class BasketService {
         this.basketDropedSource.next();
     }
 
+    mapBasketInfoCheckout(order: IOrder): IBasketCheckout {
+        let basketCheckout = <IBasketCheckout>{};
+
+        basketCheckout.street = order.street
+        basketCheckout.city = order.city;
+        basketCheckout.country = order.country;
+        basketCheckout.state = order.state;
+        basketCheckout.zipcode = order.zipcode;
+        basketCheckout.cardexpiration = order.cardexpiration;
+        basketCheckout.cardnumber = order.cardnumber;
+        basketCheckout.cardsecuritynumber = order.cardsecuritynumber;
+        basketCheckout.cardtypeid = order.cardtypeid;
+        basketCheckout.cardholdername = order.cardholdername;
+        basketCheckout.total = 0;
+        basketCheckout.expiration = order.expiration;
+
+        return basketCheckout;
+    }    
+
     private loadData() {
         this.getBasket().subscribe(basket => {
             if (basket != null)
diff --git a/src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts b/src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
-import { OrdersService }                            from '../orders.service';
+import { OrdersService } from '../orders.service';
+import { BasketService } from '../../basket/basket.service';
 import { IOrder }                                   from '../../shared/models/order.model';
 import { BasketWrapperService }                     from '../../shared/services/basket.wrapper.service';
 
@@ -18,9 +19,9 @@ export class OrdersNewComponent implements OnInit {
     errorReceived: boolean;
     order: IOrder;
 
-    constructor(private service: OrdersService, fb: FormBuilder, private router: Router) {
+    constructor(private orderService: OrdersService, private basketService: BasketService, fb: FormBuilder, private router: Router) {
         // Obtain user profile information
-        this.order = service.mapBasketAndIdentityInfoNewOrder();
+        this.order = orderService.mapOrderAndIdentityInfoNewOrder();
         this.newOrderForm = fb.group({
             'street': [this.order.street, Validators.required],
             'city': [this.order.city, Validators.required],
@@ -36,7 +37,7 @@ export class OrdersNewComponent implements OnInit {
     ngOnInit() {
     }
 
-    submitForm(value: any) {
+    submitForm(value: any) {        
         this.order.street = this.newOrderForm.controls['street'].value;
         this.order.city = this.newOrderForm.controls['city'].value;
         this.order.state = this.newOrderForm.controls['state'].value;
@@ -46,8 +47,8 @@ export class OrdersNewComponent implements OnInit {
         this.order.cardholdername = this.newOrderForm.controls['cardholdername'].value;
         this.order.cardexpiration = new Date(20 + this.newOrderForm.controls['expirationdate'].value.split('/')[1], this.newOrderForm.controls['expirationdate'].value.split('/')[0]);
         this.order.cardsecuritynumber = this.newOrderForm.controls['securitycode'].value;
-
-        this.service.postOrder(this.order)
+        let basketCheckout = this.basketService.mapBasketInfoCheckout(this.order);
+        this.basketService.setBasketCheckout(basketCheckout)
             .catch((errMessage) => {
                 this.errorReceived = true;
                 this.isOrderProcessing = false;
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.module.ts b/src/Web/WebSPA/Client/modules/orders/orders.module.ts
@@ -5,12 +5,13 @@ import { SharedModule }         from '../shared/shared.module';
 import { OrdersComponent }      from './orders.component';
 import { OrdersDetailComponent }      from './orders-detail/orders-detail.component';
 import { OrdersNewComponent }      from './orders-new/orders-new.component';
-import { OrdersService }        from './orders.service';
+import { OrdersService } from './orders.service';
+import { BasketService } from '../basket/basket.service';
 import { Header }                from '../shared/components/header/header';
 
 @NgModule({
     imports: [BrowserModule, SharedModule],
     declarations: [OrdersComponent, OrdersDetailComponent, OrdersNewComponent],
-    providers: [OrdersService]
+    providers: [OrdersService, BasketService]
 })
 export class OrdersModule { }
diff --git a/src/Web/WebSPA/Client/modules/orders/orders.service.ts b/src/Web/WebSPA/Client/modules/orders/orders.service.ts
@@ -44,13 +44,7 @@ export class OrdersService {
         });
     }
 
-    postOrder(item): Observable<boolean> {
-        return this.service.postWithId(this.ordersUrl + '/api/v1/orders/new', item).map((response: Response) => {
-            return true;
-        });
-    }
-
-    mapBasketAndIdentityInfoNewOrder(): IOrder {
+    mapOrderAndIdentityInfoNewOrder(): IOrder {
         let order = <IOrder>{};
         let basket = this.basketService.basket;
         let identityInfo = this.identityService.UserData;
diff --git a/src/Web/WebSPA/Client/modules/shared/models/basketCheckout.model.ts b/src/Web/WebSPA/Client/modules/shared/models/basketCheckout.model.ts
@@ -0,0 +1,16 @@
+﻿export interface IBasketCheckout {
+    city: number;
+    street: string;
+    state: string;
+    country: number;
+    zipcode: string;
+    cardnumber: string;
+    cardexpiration: Date;
+    expiration: string;
+    cardsecuritynumber: string;
+    cardholdername: string;
+    cardtypeid: number;
+    buyer: string;
+    ordernumber: string;
+    total: number;
+}
diff --git a/src/Web/WebSPA/Client/modules/shared/services/data.service.ts b/src/Web/WebSPA/Client/modules/shared/services/data.service.ts
@@ -39,6 +39,10 @@ export class DataService {
         return this.doPost(url, data, false, params);
     }
 
+    putWithId(url: string, data: any, params?: any): Observable<Response> {
+        return this.doPut(url, data, true, params);
+    }
+
     private doPost(url: string, data: any, needId: boolean, params?: any): Observable<Response> {
         let options: RequestOptionsArgs = {};
 
@@ -57,6 +61,24 @@ export class DataService {
             }).catch(this.handleError);
     }
 
+    private doPut(url: string, data: any, needId: boolean, params?: any): Observable<Response> {
+        let options: RequestOptionsArgs = {};
+
+        options.headers = new Headers();
+        if (this.securityService) {
+            options.headers.append('Authorization', 'Bearer ' + this.securityService.GetToken());
+        }
+        if (needId) {
+            let guid = Guid.newGuid();
+            options.headers.append('x-requestid', guid);
+        }
+
+        return this.http.put(url, data, options).map(
+            (res: Response) => {
+                return res;
+            }).catch(this.handleError);
+    }
+
     delete(url: string, params?: any) {
         let options: RequestOptionsArgs = {};
 
diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj
@@ -72,12 +72,12 @@
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
   </ItemGroup>
 
-  <!-- workaround for https://github.com/aspnet/websdk/issues/114 -->
+  <!-- workaround for https://github.com/aspnet/websdk/issues/114 --><!--
   <Target Name="AddGeneratedContentItems" BeforeTargets="AssignTargetPaths" DependsOnTargets="PrepareForPublish">
       <ItemGroup>
           <Content Include="wwwroot/**" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Content)" />
       </ItemGroup>
-  </Target>
+  </Target>-->
 
   <ItemGroup>
     <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" />
diff --git a/test/Services/FunctionalTests/Services/Basket/BasketTestsStartup.cs b/test/Services/FunctionalTests/Services/Basket/BasketTestsStartup.cs
@@ -1,10 +1,7 @@
-﻿using Microsoft.eShopOnContainers.Services.Basket.API;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.AspNetCore.Hosting;
+﻿using FunctionalTests.Middleware;
 using Microsoft.AspNetCore.Builder;
-using FunctionalTests.Middleware;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.eShopOnContainers.Services.Basket.API;
 
 namespace FunctionalTests.Services.Basket
 {
diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj
@@ -18,6 +18,9 @@
 
   <ItemGroup>
     <!--<Content Include="settings.json;web.config">-->
+    <Content Include="Services\Basket\appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Services\Catalog\settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -30,6 +33,7 @@
     <ProjectReference Include="..\..\..\src\Services\Basket\Basket.API\Basket.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Catalog\Catalog.API\Catalog.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Ordering\Ordering.API\Ordering.API.csproj" />
+    <ProjectReference Include="..\..\..\src\Web\WebMVC\WebMVC.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Services/IntegrationTests/Services/Basket/BasketScenarioBase.cs b/test/Services/IntegrationTests/Services/Basket/BasketScenarioBase.cs
@@ -0,0 +1,36 @@
+﻿using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.eShopOnContainers.Services.Basket.API;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace IntegrationTests.Services.Basket
+{
+    public class BasketScenarioBase
+    {
+        public TestServer CreateServer()
+        {
+            var webHostBuilder = new WebHostBuilder();
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\basket");
+            webHostBuilder.UseStartup<BasketTestsStartup>();
+
+            return new TestServer(webHostBuilder);
+        }
+
+        public static class Get
+        {
+            public static string GetBasket(int id)
+            {
+                return $"api/v1/basket/{id}";
+            }
+        }
+
+        public static class Post
+        {
+            public static string Basket = "api/v1/basket";
+            public static string CheckoutOrder = "api/v1/basket/checkout";
+        }
+    }
+}
diff --git a/test/Services/IntegrationTests/Services/Basket/BasketScenarios.cs b/test/Services/IntegrationTests/Services/Basket/BasketScenarios.cs
@@ -0,0 +1,80 @@
+﻿using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+using Newtonsoft.Json;
+using System;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using WebMVC.Models;
+using Xunit;
+
+namespace IntegrationTests.Services.Basket
+{
+    public class BasketScenarios
+        : BasketScenarioBase
+    {
+        [Fact]
+        public async Task Post_basket_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {               
+                var content = new StringContent(BuildBasket(), UTF8Encoding.UTF8, "application/json");
+                var response = await server.CreateClient()
+                   .PostAsync(Post.Basket, content);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_basket_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                   .GetAsync(Get.GetBasket(1));
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Send_Checkout_basket_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var content = new StringContent(BuildCheckout(), UTF8Encoding.UTF8, "application/json");
+                var response = await server.CreateClient()
+                   .PostAsync(Post.CheckoutOrder, content);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        string BuildBasket()
+        {
+            var order = new CustomerBasket("1");            
+            return JsonConvert.SerializeObject(order);
+        }
+
+        string BuildCheckout()
+        {
+            var checkoutBasket = new BasketDTO()
+            {
+                City = "city",
+                Street = "street",
+                State = "state",
+                Country = "coutry",
+                ZipCode = "zipcode",
+                CardNumber = "CardNumber",
+                CardHolderName = "CardHolderName",
+                CardExpiration = DateTime.UtcNow,
+                CardSecurityNumber = "1234",
+                CardTypeId = 1,
+                Buyer = "Buyer",
+                RequestId = Guid.NewGuid()
+            };
+
+            return JsonConvert.SerializeObject(checkoutBasket);
+        }
+    }
+}
diff --git a/test/Services/IntegrationTests/Services/Basket/BasketTestsStartup.cs b/test/Services/IntegrationTests/Services/Basket/BasketTestsStartup.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/OrderingScenarioBase.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs
diff --git a/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs b/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs
diff --git a/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs b/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public async Task Checkout(BasketDTO basket)`
`60`	`60`	`var token = await GetUserTokenAsync();`
`61`	`61`	`var updateBasketUri = API.Basket.CheckoutBasket(_remoteServiceBaseUrl);`
`62`	`62`
`63`		`- var response = await _apiClient.PutAsync(updateBasketUri, basket, token);`
	`63`	`+ var response = await _apiClient.PostAsync(updateBasketUri, basket, token);`
`64`	`64`
`65`	`65`	`response.EnsureSuccessStatusCode();`
`66`	`66`	`}`