From de8aded2b0d2ba61ac04df59804276deac888c4b Mon Sep 17 00:00:00 2001 From: dsanz Date: Mon, 20 Mar 2017 16:12:11 +0100 Subject: [PATCH] Fix #61 Async suffix for namig convention. --- .../Basket/Basket.API/Controllers/BasketController.cs | 6 +++--- src/Services/Basket/Basket.API/Model/IBasketRepository.cs | 6 +++--- .../Basket/Basket.API/Model/RedisBasketRepository.cs | 8 ++++---- .../Repositories/BuyerRepository.cs | 1 + .../Repositories/OrderRepository.cs | 1 + .../Services/Basket/RedisBasketRepositoryTests.cs | 8 ++++---- .../UnitTest/Basket/Application/BasketWebApiTest.cs | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Services/Basket/Basket.API/Controllers/BasketController.cs b/src/Services/Basket/Basket.API/Controllers/BasketController.cs index 2cb3fcafe..5bf23509c 100644 --- a/src/Services/Basket/Basket.API/Controllers/BasketController.cs +++ b/src/Services/Basket/Basket.API/Controllers/BasketController.cs @@ -26,7 +26,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers [HttpGet("{id}")] public async Task Get(string id) { - var basket = await _repository.GetBasket(id); + var basket = await _repository.GetBasketAsync(id); return Ok(basket); } @@ -35,7 +35,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers [HttpPost] public async Task Post([FromBody]CustomerBasket value) { - var basket = await _repository.UpdateBasket(value); + var basket = await _repository.UpdateBasketAsync(value); return Ok(basket); } @@ -44,7 +44,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers [HttpDelete("{id}")] public void Delete(string id) { - _repository.DeleteBasket(id); + _repository.DeleteBasketAsync(id); } } } diff --git a/src/Services/Basket/Basket.API/Model/IBasketRepository.cs b/src/Services/Basket/Basket.API/Model/IBasketRepository.cs index 3f0b99acf..af12023e0 100644 --- a/src/Services/Basket/Basket.API/Model/IBasketRepository.cs +++ b/src/Services/Basket/Basket.API/Model/IBasketRepository.cs @@ -7,8 +7,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model { public interface IBasketRepository { - Task GetBasket(string customerId); - Task UpdateBasket(CustomerBasket basket); - Task DeleteBasket(string id); + Task GetBasketAsync(string customerId); + Task UpdateBasketAsync(CustomerBasket basket); + Task DeleteBasketAsync(string id); } } diff --git a/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs b/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs index 19d8e7055..973d1669b 100644 --- a/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs +++ b/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs @@ -25,13 +25,13 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model } - public async Task DeleteBasket(string id) + public async Task DeleteBasketAsync(string id) { var database = await GetDatabase(); return await database.KeyDeleteAsync(id.ToString()); } - public async Task GetBasket(string customerId) + public async Task GetBasketAsync(string customerId) { var database = await GetDatabase(); @@ -44,7 +44,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model return JsonConvert.DeserializeObject(data); } - public async Task UpdateBasket(CustomerBasket basket) + public async Task UpdateBasketAsync(CustomerBasket basket) { var database = await GetDatabase(); @@ -56,7 +56,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model } _logger.LogInformation("basket item persisted succesfully"); - return await GetBasket(basket.BuyerId); + return await GetBasketAsync(basket.BuyerId); } private async Task GetDatabase() diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs index 3a6bcede9..8b286b1df 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs +++ b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs @@ -29,6 +29,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Repositor { if (buyer.IsTransient()) { + //TODO: when migrating to ef core 1.1.1 change Add by AddAsync-. A bug in ef core 1.1.0 does not allow to do it https://github.com/aspnet/EntityFramework/issues/7298 return _context.Buyers .Add(buyer) .Entity; diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs index 89a63e028..cba5c131b 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs +++ b/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs @@ -24,6 +24,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Repositor public Order Add(Order order) { + //TODO: when migrating to ef core 1.1.1 change Add by AddAsync-. A bug in ef core 1.1.0 does not allow to do it https://github.com/aspnet/EntityFramework/issues/7298 return _context.Orders.Add(order) .Entity; } diff --git a/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs b/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs index 5bac70c04..aa763e4bb 100644 --- a/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs +++ b/test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs @@ -25,7 +25,7 @@ namespace IntegrationTests.Services.Basket { var redisBasketRepository = BuildBasketRepository(); - var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId") + var basket = await redisBasketRepository.UpdateBasketAsync(new CustomerBasket("customerId") { BuyerId = "buyerId", Items = BuildBasketItems() @@ -40,15 +40,15 @@ namespace IntegrationTests.Services.Basket { var redisBasketRepository = BuildBasketRepository(); - var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId") + var basket = await redisBasketRepository.UpdateBasketAsync(new CustomerBasket("customerId") { BuyerId = "buyerId", Items = BuildBasketItems() }); - var deleteResult = await redisBasketRepository.DeleteBasket("buyerId"); + var deleteResult = await redisBasketRepository.DeleteBasketAsync("buyerId"); - var result = await redisBasketRepository.GetBasket(basket.BuyerId); + var result = await redisBasketRepository.GetBasketAsync(basket.BuyerId); Assert.True(deleteResult); Assert.Null(result); diff --git a/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs b/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs index f6ceae12d..6c5f116bd 100644 --- a/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs +++ b/test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs @@ -24,7 +24,7 @@ namespace UnitTest.Basket.Application var fakeCustomerId = "1"; var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId); - _basketRepositoryMock.Setup(x => x.GetBasket(It.IsAny())) + _basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny())) .Returns(Task.FromResult(fakeCustomerBasket)); //Act @@ -43,7 +43,7 @@ namespace UnitTest.Basket.Application var fakeCustomerId = "1"; var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId); - _basketRepositoryMock.Setup(x => x.UpdateBasket(It.IsAny())) + _basketRepositoryMock.Setup(x => x.UpdateBasketAsync(It.IsAny())) .Returns(Task.FromResult(fakeCustomerBasket)); //Act