ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/migration/net-6' into update-services-net-6

Browse Source
This commit is contained in:
Sumit Ghosh 2021-10-21 14:33:09 +05:30
commit 6b99883788
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/BasketController.cs
View File

@ -27,7 +27,6 @@ public class BasketController : ControllerBase
// Retrieve the current basket
var basket = await _basket.GetByIdAsync(data.BuyerId) ?? new BasketData(data.BuyerId);
var catalogItems = await _catalog.GetCatalogItemsAsync(data.Items.Select(x => x.ProductId));
// group by product id to avoid duplicates
var itemsCalculated = data
@ -126,7 +125,11 @@ public class BasketController : ControllerBase
//item.PictureUri =
// Step 2: Get current basket status
<<<<<<< HEAD
var currentBasket = (await _basket.GetByIdAsync(data.BasketId)) ?? new BasketData(data.BasketId);
=======
var currentBasket = (await _basket.GetById(data.BasketId)) ?? new BasketData(data.BasketId);
>>>>>>> upstream/migration/net-6
// Step 3: Merge current status with new product
currentBasket.Items.Add(new BasketDataItem()
{

3
src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs
View File

@ -10,8 +10,7 @@ public class BasketService : IBasketService
_basketClient = basketClient;
_logger = logger;
}
public async Task<BasketData> GetByIdAsync(string id)
{
_logger.LogDebug("grpc client created, request = {@id}", id);