fix grpc call from mobile bff to basket.api and add ordering, in ordering controller

ericuss · ericuss · commit 3f61eb0ef93c · 2019-08-27T14:07:39.000+02:00
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -115,6 +115,7 @@ services:
       - Serilog__MinimumLevel__Override__Ordering.API=Verbose
     ports:
       - "5102:80" 
+      - "5581:5001"  
       
   ordering.backgroundtasks:
     environment:
@@ -284,14 +285,16 @@ services:
       - urls__catalog=http://catalog.api
       - urls__orders=http://ordering.api
       - urls__identity=http://identity.api
+      - urls__grpcBasket=http://10.0.75.1:5580
+      - urls__grpcOrdering=http://10.0.75.1:5581
       - CatalogUrlHC=http://catalog.api/hc
       - OrderingUrlHC=http://ordering.api/hc
       - IdentityUrlHC=http://identity.api/hc             
       - BasketUrlHC=http://basket.api/hc
       - MarketingUrlHC=http://marketing.api/hc
       - PaymentUrlHC=http://payment.api/hc
       - LocationUrlHC=http://locations.api/hc
-      - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
+      - IdentityUrlExternal=http://10.0.75.1:5105
     ports:
       - "5120:80"   
 
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
@@ -27,5 +27,7 @@ public class OrdersOperations
         public string Basket { get; set; }
         public string Catalog { get; set; }
         public string Orders { get; set; }
+        public string GrpcBasket { get; set; }
+        public string GrpcOrdering { get; set; }
     }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/OrderController.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/OrderController.cs
@@ -13,12 +13,12 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers
     public class OrderController : ControllerBase
     {
         private readonly IBasketService _basketService;
-        private readonly IOrderApiClient _orderClient;
+        private readonly IOrderingService _orderingService;
 
-        public OrderController(IBasketService basketService, IOrderApiClient orderClient)
+        public OrderController(IBasketService basketService, IOrderingService orderingService)
         {
             _basketService = basketService;
-            _orderClient = orderClient;
+            _orderingService = orderingService;
         }
 
         [Route("draft/{basketId}")]
@@ -39,7 +39,7 @@ public async Task<ActionResult<OrderData>> GetOrderDraftAsync(string basketId)
                 return BadRequest($"No basket found for id {basketId}");
             }
 
-            return await _orderClient.GetOrderDraftFromBasketAsync(basket);
+            return await _orderingService.GetOrderDraftAsync(basket);
         }
     }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs
@@ -40,8 +40,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
-            _logger.LogInformation("@@@@@@@@@@@@@@@@@ {@request}", request);
-
             return await base.SendAsync(request, cancellationToken);
         }
 
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="$(Grpc_AspNetCore_Server_ClientFactory)" />
     <PackageReference Include="Google.Protobuf" Version="$(Google_Protobuf)" />
     <PackageReference Include="Grpc.Core" Version="1.22.0" />
-    <PackageReference Include="Grpc.Tools" Version="$(Grpc_Tools)" PrivateAssets="All" />   
+    <PackageReference Include="Grpc.Tools" Version="$(Grpc_Tools)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="$(Microsoft_AspNetCore_Diagnostics_HealthChecks)" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(Microsoft_Extensions_Diagnostics_HealthChecks)" />
     <PackageReference Include="Serilog.AspNetCore" Version="$(Serilog_AspNetCore)" />
@@ -34,10 +34,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Protobuf Include="..\..\..\Services\Basket\Basket.API\Proto\basket.proto" GrpcServices="Client" />
     <Protobuf Include="..\..\..\Services\Catalog\Catalog.API\Proto\catalog.proto" GrpcServices="Client" />
+    <Protobuf Include="..\..\..\Services\Ordering\Ordering.API\Proto\ordering.proto" GrpcServices="Client" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
@@ -6,7 +6,7 @@ public class BasketData
     {
         public string BuyerId { get; set; }
 
-        public List<BasketDataItem> Items { get; set; }
+        public List<BasketDataItem> Items { get; set; } = new List<BasketDataItem>();
 
         public BasketData()
         {
@@ -16,7 +16,6 @@ public BasketData()
         public BasketData(string buyerId)
         {
             BuyerId = buyerId;
-            Items = new List<BasketDataItem>();
         }
     }
 
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
@@ -28,6 +26,6 @@ public class OrderData
 
         public string Buyer { get; set; }
 
-        public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
+        public List<OrderItemData> OrderItems { get;  } = new List<OrderItemData>();
     }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
+﻿namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
     public class OrderItemData
     {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
@@ -27,9 +27,6 @@ public BasketService(HttpClient httpClient, IOptions<UrlsConfig> config, ILogger
 
         public async Task<BasketData> GetById(string id)
         {
-
-            _logger.LogInformation("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ GetById @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2Support", true);
 
@@ -38,24 +35,21 @@ public async Task<BasketData> GetById(string id)
                 httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
                 using (var httpClient = new HttpClient(httpClientHandler))
                 {
-                    _logger.LogInformation("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ Http2UnencryptedSupport disable @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+                    //httpClient.BaseAddress = new Uri("http://10.0.75.1:5580");
+                    httpClient.BaseAddress = new Uri(_urls.GrpcBasket);
 
-                    httpClient.BaseAddress = new Uri("http://localhost:5580");
-
-                    _logger.LogInformation("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ {httpClient.BaseAddress} @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ " + httpClient.BaseAddress, httpClient.BaseAddress);
+                    _logger.LogDebug("Creating grpc client for basket {@httpClient.BaseAddress} ", httpClient.BaseAddress);
 
                     var client = GrpcClient.Create<Basket.BasketClient>(httpClient);
 
-                    _logger.LogInformation("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ client create @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+                    _logger.LogDebug("grpc client created, request = {@id}", id);
 
                     try
                     {
 
                         var response = await client.GetBasketByIdAsync(new BasketRequest { Id = id });
-                        _logger.LogInformation("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ call grpc server @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
 
-                        _logger.LogInformation("############## DATA: {@a}", response.Buyerid);
-                        _logger.LogInformation("############## DATA:response {@response}", response);
+                        _logger.LogDebug("grpc response {@response}", response);
 
                         return MapToBasketData(response);
                     }
@@ -66,11 +60,7 @@ public async Task<BasketData> GetById(string id)
                 }
             }
 
-            return null; // temp
-            // var data = await _apiClient.GetStringAsync(_urls.Basket +  UrlsConfig.BasketOperations.GetItemById(id));
-            // var basket = !string.IsNullOrEmpty(data) ? JsonConvert.DeserializeObject<BasketData>(data) : null;
-
-            // return basket;
+            return null;
         }
 
         public async Task UpdateAsync(BasketData currentBasket)
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IOrderingService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IOrderingService.cs
@@ -0,0 +1,10 @@
+﻿using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
+{
+    public interface IOrderingService
+    {
+        Task<OrderData> GetOrderDraftAsync(BasketData basketData);
+    }
+}
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs
@@ -0,0 +1,113 @@
+﻿using Grpc.Net.Client;
+using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
+using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using GrpcOrdering;
+using Grpc.Core;
+
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
+{
+    public class OrderingService : IOrderingService
+    {
+        private readonly HttpClient _httpClient;
+        private readonly UrlsConfig _urls;
+        private readonly ILogger<OrderingService> _logger;
+
+        public OrderingService(HttpClient httpClient, IOptions<UrlsConfig> config, ILogger<OrderingService> logger)
+        {
+            _httpClient = httpClient;
+            _urls = config.Value;
+            _logger = logger;
+        }
+
+        public async Task<OrderData> GetOrderDraftAsync(BasketData basketData)
+        {
+            AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
+            AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2Support", true);
+
+            using (var httpClientHandler = new HttpClientHandler())
+            {
+                httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
+                using (var httpClient = new HttpClient(httpClientHandler))
+                {
+                    httpClient.BaseAddress = new Uri(_urls.GrpcOrdering);
+
+                    _logger.LogDebug(" Creating grpc client for ordering {@httpClient.BaseAddress}", httpClient.BaseAddress);
+
+                    var client = GrpcClient.Create<OrderingGrpc.OrderingGrpcClient>(httpClient);
+
+                    _logger.LogDebug(" grpc client created, basketData={@basketData}", basketData);
+
+                    try
+                    {
+
+                        var command = MapToOrderDraftCommand(basketData);
+                        var response = await client.CreateOrderDraftFromBasketDataAsync(command);
+
+                        _logger.LogDebug(" grpc response: {@response}", response);
+
+                        return MapToResponse(response);
+                    }
+                    catch (RpcException e)
+                    {
+                        _logger.LogError($"Error calling via grpc to ordering: {e.Status} - {e.Message}");
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private OrderData MapToResponse(GrpcOrdering.OrderDraftDTO orderDraft)
+        {
+            if (orderDraft == null)
+            {
+                return null;
+            }
+
+            var data = new OrderData
+            {
+                Total = (decimal)orderDraft.Total,
+            };
+
+            orderDraft.OrderItems.ToList().ForEach(o => data.OrderItems.Add(new OrderItemData
+            {
+                Discount = (decimal)o.Discount,
+                PictureUrl = o.PictureUrl,
+                ProductId = o.ProductId,
+                ProductName = o.ProductName,
+                UnitPrice = (decimal)o.UnitPrice,
+                Units = o.Units,
+            }));
+
+            return data;
+        }
+
+        private CreateOrderDraftCommand MapToOrderDraftCommand(BasketData basketData)
+        {
+            var command = new CreateOrderDraftCommand
+            {
+                BuyerId = basketData.BuyerId,
+            };
+
+            basketData.Items.ForEach(i => command.Items.Add(new BasketItem
+            {
+                Id = i.Id,
+                OldUnitPrice = (double)i.OldUnitPrice,
+                PictureUrl = i.PictureUrl,
+                ProductId = i.ProductId,
+                ProductName = i.ProductName,
+                Quantity = i.Quantity,
+                UnitPrice = (double)i.UnitPrice,
+            }));
+
+            return command;
+        }
+
+    }
+}
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
@@ -131,11 +131,9 @@ public static IServiceCollection AddCustomMvc(this IServiceCollection services,
                     {
                         Implicit = new OpenApiOAuthFlow()
                         {
-                            // AuthorizationUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize"),
-                            // TokenUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/token"),
-                            
-                            AuthorizationUrl = new Uri($"http://localhost:5105/connect/authorize"),
-                            TokenUrl = new Uri($"http://localhost:5105/connect/token"),
+                            AuthorizationUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize"),
+                            TokenUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/token"),
+
                             Scopes = new Dictionary<string, string>()
                             {
                                 { "mobileshoppingagg", "Shopping Aggregator for Mobile Clients" }
@@ -188,7 +186,8 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             //register http services
-            services.AddHttpClient<IBasketService, BasketService>()
+            services
+                .AddHttpClient<IBasketService, BasketService>()
                 .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
                 .AddPolicyHandler(GetRetryPolicy())
                 .AddPolicyHandler(GetCircuitBreakerPolicy())
@@ -204,6 +203,11 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
                    .AddPolicyHandler(GetCircuitBreakerPolicy())
                    .AddDevspacesSupport();
 
+            services.AddHttpClient<IOrderingService, OrderingService>()
+                   .AddPolicyHandler(GetRetryPolicy())
+                   .AddPolicyHandler(GetCircuitBreakerPolicy())
+                   .AddDevspacesSupport();
+
             return services;
         }
 
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json
@@ -3,7 +3,9 @@
     "basket": "http://localhost:55105",
     "catalog": "http://localhost:55101",
     "orders": "http://localhost:55102",
-    "identity": "http://localhost:55105"
+    "identity": "http://localhost:55105",
+    "grpcBasket": "http://localhost:5580",
+    "grpcOrdering": "http://localhost:5581"
   },
   "IdentityUrlExternal": "http://localhost:5105",
   "IdentityUrl": "http://localhost:5105",
diff --git a/src/Services/Ordering/Ordering.API/Grpc/OrderingService.cs b/src/Services/Ordering/Ordering.API/Grpc/OrderingService.cs
diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs
diff --git a/src/Services/Ordering/Ordering.API/Proto/ordering.proto b/src/Services/Ordering/Ordering.API/Proto/ordering.proto
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,7 @@ public class OrdersOperations`
`27`	`27`	`public string Basket { get; set; }`
`28`	`28`	`public string Catalog { get; set; }`
`29`	`29`	`public string Orders { get; set; }`
	`30`	`+ public string GrpcBasket { get; set; }`
	`31`	`+ public string GrpcOrdering { get; set; }`
`30`	`32`	`}`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers`
`13`	`13`	`public class OrderController : ControllerBase`
`14`	`14`	`{`
`15`	`15`	`private readonly IBasketService _basketService;`
`16`		`- private readonly IOrderApiClient _orderClient;`
	`16`	`+ private readonly IOrderingService _orderingService;`
`17`	`17`
`18`		`- public OrderController(IBasketService basketService, IOrderApiClient orderClient)`
	`18`	`+ public OrderController(IBasketService basketService, IOrderingService orderingService)`
`19`	`19`	`{`
`20`	`20`	`_basketService = basketService;`
`21`		`- _orderClient = orderClient;`
	`21`	`+ _orderingService = orderingService;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Route("draft/{basketId}")]`
`@@ -39,7 +39,7 @@ public async Task<ActionResult<OrderData>> GetOrderDraftAsync(string basketId)`
`39`	`39`	`return BadRequest($"No basket found for id {basketId}");`
`40`	`40`	`}`
`41`	`41`
`42`		`- return await _orderClient.GetOrderDraftFromBasketAsync(basket);`
	`42`	`+ return await _orderingService.GetOrderDraftAsync(basket);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage`
`40`	`40`	`request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);`
`41`	`41`	`}`
`42`	`42`
`43`		`- _logger.LogInformation("@@@@@@@@@@@@@@@@@ {@request}", request);`
`44`		`-`
`45`	`43`	`return await base.SendAsync(request, cancellationToken);`
`46`	`44`	`}`
`47`	`45`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class BasketData`
`6`	`6`	`{`
`7`	`7`	`public string BuyerId { get; set; }`
`8`	`8`
`9`		`- public List<BasketDataItem> Items { get; set; }`
	`9`	`+ public List<BasketDataItem> Items { get; set; } = new List<BasketDataItem>();`
`10`	`10`
`11`	`11`	`public BasketData()`
`12`	`12`	`{`
`@@ -16,7 +16,6 @@ public BasketData()`
`16`	`16`	`public BasketData(string buyerId)`
`17`	`17`	`{`
`18`	`18`	`BuyerId = buyerId;`
`19`		`- Items = new List<BasketDataItem>();`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`	`3`
`6`	`4`	`namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models`
`7`	`5`	`{`
`@@ -28,6 +26,6 @@ public class OrderData`
`28`	`26`
`29`	`27`	`public string Buyer { get; set; }`
`30`	`28`
`31`		`- public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();`
	`29`	`+ public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();`
`32`	`30`	`}`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`		`-`
`6`		`-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models`
	`1`	`+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models`
`7`	`2`	`{`
`8`	`3`	`public class OrderItemData`
`9`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
	`1`	`+using System.Collections.Generic;`
`5`	`2`
`6`	`3`	`namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models`
`7`	`4`	`{`