Browse Source

standarize the productId type

features/migration-dotnet3
ericuss 5 years ago
parent
commit
791e7d646c
15 changed files with 15 additions and 16 deletions
  1. +1
    -1
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
  2. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
  3. +1
    -1
      src/Clients/Clients.Grpc.Caller/Protos/basket.proto
  4. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
  5. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs
  6. +1
    -2
      src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
  7. +1
    -1
      src/Services/Basket/Basket.API/Model/BasketItem.cs
  8. +1
    -1
      src/Services/Basket/Basket.API/Proto/basket.proto
  9. +1
    -1
      src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
  10. +1
    -1
      src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
  11. +1
    -1
      src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs
  12. +1
    -1
      src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs
  13. +1
    -1
      src/Services/Ordering/Ordering.API/Proto/ordering.proto
  14. +1
    -1
      src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts
  15. +1
    -1
      src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts

+ 1
- 1
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs View File

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


+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs View File

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


+ 1
- 1
src/Clients/Clients.Grpc.Caller/Protos/basket.proto View File

@ -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;


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs View File

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


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs View File

@ -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")]


+ 1
- 2
src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs View File

@ -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)
{


+ 1
- 1
src/Services/Basket/Basket.API/Model/BasketItem.cs View File

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


+ 1
- 1
src/Services/Basket/Basket.API/Proto/basket.proto View File

@ -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;


+ 1
- 1
src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs View File

@ -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


+ 1
- 1
src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs View File

@ -75,7 +75,7 @@ namespace Basket.FunctionalTests
{
Id = "basketId",
PictureUrl = "pictureurl",
ProductId = "productId",
ProductId = 1,
ProductName = "productName",
Quantity = 1,
UnitPrice = 1


+ 1
- 1
src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs View File

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


+ 1
- 1
src/Services/Ordering/Ordering.API/Extensions/BasketItemExtensions.cs View File

@ -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,


+ 1
- 1
src/Services/Ordering/Ordering.API/Proto/ordering.proto View File

@ -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;


+ 1
- 1
src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts View File

@ -1,6 +1,6 @@
export interface IBasketItem {
id: string;
productId: string;
productId: number;
productName: string;
unitPrice: number;
oldUnitPrice: number;


+ 1
- 1
src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts View File

@ -1,5 +1,5 @@
export interface ICatalogItem {
id: string;
id: number;
name: string;
description: string;
price: number;


Loading…
Cancel
Save