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

Merge pull request #123 from dotnet/bugs/61-AsyncSuffixNamingConvention

Browse Source 
Fix #61 Async suffix for namig convention.
This commit is contained in:
Cesar De la Torre 2017-03-20 10:59:07 -07:00 committed by GitHub
commit 29dc6b41ca
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
[HttpGet("{id}")]
public async Task<IActionResult> 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<IActionResult> 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);
}
}
}

6
src/Services/Basket/Basket.API/Model/IBasketRepository.cs
View File

@ -7,8 +7,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
{
public interface IBasketRepository
{
Task<CustomerBasket> GetBasket(string customerId);
Task<CustomerBasket> UpdateBasket(CustomerBasket basket);
Task<bool> DeleteBasket(string id);
Task<CustomerBasket> GetBasketAsync(string customerId);
Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket);
Task<bool> DeleteBasketAsync(string id);
}
}

8
src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
View File

@ -25,13 +25,13 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
}
public async Task<bool> DeleteBasket(string id)
public async Task<bool> DeleteBasketAsync(string id)
{
var database = await GetDatabase();
return await database.KeyDeleteAsync(id.ToString());
}
public async Task<CustomerBasket> GetBasket(string customerId)
public async Task<CustomerBasket> GetBasketAsync(string customerId)
{
var database = await GetDatabase();
@ -44,7 +44,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
return JsonConvert.DeserializeObject<CustomerBasket>(data);
}
public async Task<CustomerBasket> UpdateBasket(CustomerBasket basket)
public async Task<CustomerBasket> 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<IDatabase> GetDatabase()

1
src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
View File

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

1
src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
View File

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

8
test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs
View File

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

4
test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs
View File

@ -24,7 +24,7 @@ namespace UnitTest.Basket.Application
var fakeCustomerId = "1";
var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId);
_basketRepositoryMock.Setup(x => x.GetBasket(It.IsAny<string>()))
_basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny<string>()))
.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<CustomerBasket>()))
_basketRepositoryMock.Setup(x => x.UpdateBasketAsync(It.IsAny<CustomerBasket>()))
.Returns(Task.FromResult(fakeCustomerBasket));
//Act