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

Fix merge issues with rebase.

Browse Source
This commit is contained in:
BillWagner 2017-05-03 10:58:23 -04:00 committed by Bill Wagner
parent 4878101106
commit d44bf27550
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Basket/Basket.API/Controllers/BasketController.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
[HttpDelete("{id}")] [HttpDelete("{id}")]
public Task Delete(string id) public Task Delete(string id)
{ {
return _repository.DeleteBasket(id); return _repository.DeleteBasketAsync(id);
} }
} }
} }

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

@ -33,7 +33,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Even
{ {
var itemsToUpdate = basket?.Items?.Where(x => int.Parse(x.ProductId) == productId).ToList(); var itemsToUpdate = basket?.Items?.Where(x => int.Parse(x.ProductId) == productId).ToList();
if ((itemsToUpdate != null) && (itemsToUpdate.Any()) if ((itemsToUpdate != null) && (itemsToUpdate.Any()))
{ {
foreach (var item in itemsToUpdate) foreach (var item in itemsToUpdate)
{ {