standarize the productId type

ericuss · ericuss · commit 791e7d646c4c · 2019-09-04T15:02:09.000+02:00
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
@@ -22,7 +22,7 @@ public BasketData(string buyerId)
     public class BasketDataItem
     {
         public string Id { get; set; }
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
         public string ProductName { get; set; }
         public decimal UnitPrice { get; set; }
         public decimal OldUnitPrice { get; set; }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
@@ -22,7 +22,7 @@ public BasketData(string buyerId)
     public class BasketDataItem
     {
         public string Id { get; set; }
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
         public string ProductName { get; set; }
         public decimal UnitPrice { get; set; }
         public decimal OldUnitPrice { get; set; }
diff --git a/src/Clients/Clients.Grpc.Caller/Protos/basket.proto b/src/Clients/Clients.Grpc.Caller/Protos/basket.proto
@@ -25,7 +25,7 @@ message CustomerBasketResponse {
 
 message BasketItemResponse {
 	string id = 1;
-	string productid = 2;
+	int32 productid = 2;
 	string productname = 3;
 	double unitprice = 4;
 	double oldunitprice = 5;
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
@@ -9,7 +9,7 @@ public class BasketItem : BindableObject
 
         public string Id { get; set; }
        
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
 
         public string ProductName { get; set; }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs
@@ -5,7 +5,7 @@ namespace eShopOnContainers.Core.Models.Orders
 {
     public class OrderItem
     {
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
         public Guid? OrderId { get; set; }
 
         [JsonProperty("unitprice")]
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
@@ -39,8 +39,7 @@ public async Task Handle(ProductPriceChangedIntegrationEvent @event)
 
         private async Task UpdatePriceInBasketItems(int productId, decimal newPrice, decimal oldPrice, CustomerBasket basket)
         {
-            string match = productId.ToString();
-            var itemsToUpdate = basket?.Items?.Where(x => x.ProductId == match).ToList();
+            var itemsToUpdate = basket?.Items?.Where(x => x.ProductId == productId).ToList();
 
             if (itemsToUpdate != null)
             {
diff --git a/src/Services/Basket/Basket.API/Model/BasketItem.cs b/src/Services/Basket/Basket.API/Model/BasketItem.cs
@@ -6,7 +6,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
     public class BasketItem : IValidatableObject
     {
         public string Id { get; set; }
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
         public string ProductName { get; set; }
         public decimal UnitPrice { get; set; }
         public decimal OldUnitPrice { get; set; }
diff --git a/src/Services/Basket/Basket.API/Proto/basket.proto b/src/Services/Basket/Basket.API/Proto/basket.proto
@@ -25,7 +25,7 @@ message CustomerBasketResponse {
 
 message BasketItemResponse {
 	string id = 1;
-	string productid = 2;
+	int32 productid = 2;
 	string productname = 3;
 	double unitprice = 4;
 	double oldunitprice = 5;
diff --git a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
@@ -63,7 +63,7 @@ string BuildBasket()
 
             order.Items.Add(new BasketItem
             {
-                ProductId = "1",
+                ProductId = 1,
                 ProductName = ".NET Bot Black Hoodie",
                 UnitPrice = 10,
                 Quantity = 1
diff --git a/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs b/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
@@ -75,7 +75,7 @@ List<BasketItem> BuildBasketItems()
                 {
                     Id = "basketId",
                     PictureUrl = "pictureurl",
-                    ProductId = "productId",
+                    ProductId = 1,
                     ProductName = "productName",
                     Quantity = 1,
                     UnitPrice = 1
diff --git a/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs b/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs
@@ -8,7 +8,7 @@ namespace Ordering.API.Application.Models
     public class BasketItem
     {
         public string Id { get; set; }
-        public string ProductId { get; set; }
+        public int ProductId { get; set; }
         public string ProductName { get; set; }
         public decimal UnitPrice { get; set; }
         public decimal OldUnitPrice { get; set; }
diff --git a/src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs b/src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs
@@ -21,7 +21,7 @@ public static OrderItemDTO ToOrderItemDTO(this BasketItem item)
         {
             return new OrderItemDTO()
             {
-                ProductId = int.TryParse(item.ProductId, out int id) ? id : -1,
+                ProductId = item.ProductId,
                 ProductName = item.ProductName,
                 PictureUrl = item.PictureUrl,
                 UnitPrice = item.UnitPrice,
diff --git a/src/Services/Ordering/Ordering.API/Proto/ordering.proto b/src/Services/Ordering/Ordering.API/Proto/ordering.proto
@@ -16,7 +16,7 @@ message CreateOrderDraftCommand {
 
 message BasketItem {
     string id = 1;
-    string productId = 2;
+    int32 productId = 2;
     string productName = 3;
     double unitPrice = 4;
     double oldUnitPrice = 5;
diff --git a/src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts b/src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts
@@ -1,6 +1,6 @@
 export interface IBasketItem {
     id: string;
-    productId: string;
+    productId: number;
     productName: string;
     unitPrice: number;
     oldUnitPrice: number;
diff --git a/src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts b/src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts
@@ -1,5 +1,5 @@
 export interface ICatalogItem {
-    id: string;
+    id: number;
     name: string;
     description: string;
     price: number;

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public BasketData(string buyerId)`
`22`	`22`	`public class BasketDataItem`
`23`	`23`	`{`
`24`	`24`	`public string Id { get; set; }`
`25`		`- public string ProductId { get; set; }`
	`25`	`+ public int ProductId { get; set; }`
`26`	`26`	`public string ProductName { get; set; }`
`27`	`27`	`public decimal UnitPrice { get; set; }`
`28`	`28`	`public decimal OldUnitPrice { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace eShopOnContainers.Core.Models.Orders`
`5`	`5`	`{`
`6`	`6`	`public class OrderItem`
`7`	`7`	`{`
`8`		`- public string ProductId { get; set; }`
	`8`	`+ public int ProductId { get; set; }`
`9`	`9`	`public Guid? OrderId { get; set; }`
`10`	`10`
`11`	`11`	`[JsonProperty("unitprice")]`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ public async Task Handle(ProductPriceChangedIntegrationEvent @event)`
`39`	`39`
`40`	`40`	`private async Task UpdatePriceInBasketItems(int productId, decimal newPrice, decimal oldPrice, CustomerBasket basket)`
`41`	`41`	`{`
`42`		`- string match = productId.ToString();`
`43`		`- var itemsToUpdate = basket?.Items?.Where(x => x.ProductId == match).ToList();`
	`42`	`+ var itemsToUpdate = basket?.Items?.Where(x => x.ProductId == productId).ToList();`
`44`	`43`
`45`	`44`	`if (itemsToUpdate != null)`
`46`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model`
`6`	`6`	`public class BasketItem : IValidatableObject`
`7`	`7`	`{`
`8`	`8`	`public string Id { get; set; }`
`9`		`- public string ProductId { get; set; }`
	`9`	`+ public int ProductId { get; set; }`
`10`	`10`	`public string ProductName { get; set; }`
`11`	`11`	`public decimal UnitPrice { get; set; }`
`12`	`12`	`public decimal OldUnitPrice { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ string BuildBasket()`
`63`	`63`
`64`	`64`	`order.Items.Add(new BasketItem`
`65`	`65`	`{`
`66`		`- ProductId = "1",`
	`66`	`+ ProductId = 1,`
`67`	`67`	`ProductName = ".NET Bot Black Hoodie",`
`68`	`68`	`UnitPrice = 10,`
`69`	`69`	`Quantity = 1`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ List<BasketItem> BuildBasketItems()`
`75`	`75`	`{`
`76`	`76`	`Id = "basketId",`
`77`	`77`	`PictureUrl = "pictureurl",`
`78`		`- ProductId = "productId",`
	`78`	`+ ProductId = 1,`
`79`	`79`	`ProductName = "productName",`
`80`	`80`	`Quantity = 1,`
`81`	`81`	`UnitPrice = 1`