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

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/BasketController.cs

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

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs

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