From 791e7d646c4c0cd6a9dbd8eff54171a4bd8721f2 Mon Sep 17 00:00:00 2001 From: ericuss Date: Wed, 4 Sep 2019 15:02:09 +0200 Subject: [PATCH] standarize the productId type --- .../Mobile.Bff.Shopping/aggregator/Models/BasketData.cs | 2 +- .../Web.Bff.Shopping/aggregator/Models/BasketData.cs | 2 +- src/Clients/Clients.Grpc.Caller/Protos/basket.proto | 2 +- .../eShopOnContainers.Core/Models/Basket/BasketItem.cs | 2 +- .../eShopOnContainers.Core/Models/Orders/OrderItem.cs | 2 +- .../ProductPriceChangedIntegrationEventHandler.cs | 3 +-- src/Services/Basket/Basket.API/Model/BasketItem.cs | 2 +- src/Services/Basket/Basket.API/Proto/basket.proto | 2 +- src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs | 2 +- .../Basket.FunctionalTests/RedisBasketRepositoryTests.cs | 2 +- .../Ordering/Ordering.API/Application/Models/BasketItem.cs | 2 +- .../Ordering/Ordering.API/Extensions/BasketItemExtensions.cs | 2 +- src/Services/Ordering/Ordering.API/Proto/ordering.proto | 2 +- .../WebSPA/Client/modules/shared/models/basketItem.model.ts | 2 +- .../WebSPA/Client/modules/shared/models/catalogItem.model.ts | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs index e2888f92e..426b8d2b5 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs @@ -22,7 +22,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models 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 index 34c170e08..507c7cdb7 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs @@ -22,7 +22,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models 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 index 1fc22bc99..f23c2f38e 100644 --- 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 index b9d8758ef..78395eda8 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs @@ -9,7 +9,7 @@ namespace eShopOnContainers.Core.Models.Basket 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 index 8732a59f4..9acfc53cd 100644 --- 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 index d303e0771..0e2d1b7a0 100644 --- a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs +++ b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs @@ -39,8 +39,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Even 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 index a41945145..4d2e4f331 100644 --- 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 index b332d8427..76ad33912 100644 --- 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 index 83d507ade..09ea14ff3 100644 --- a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs +++ b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs @@ -63,7 +63,7 @@ namespace Basket.FunctionalTests 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 index f3f6d196d..67931c443 100644 --- a/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs +++ b/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs @@ -75,7 +75,7 @@ namespace Basket.FunctionalTests { 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 index 698bdea3e..271524c69 100644 --- 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 index 56f280978..ba2b7e01f 100644 --- a/src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs +++ b/src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs @@ -21,7 +21,7 @@ namespace Ordering.API.Application.Models { 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 index 988f3465b..77e602c8a 100644 --- 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 index 44c5716a5..000b00f30 100644 --- 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 index bf4c7ea70..fcbaa80f9 100644 --- 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;