Skip to content

Commit de8aded

Browse files
committed
Fix dotnet-architecture#61 Async suffix for namig convention.
1 parent 5432936 commit de8aded

7 files changed

Lines changed: 18 additions & 16 deletions

File tree

src/Services/Basket/Basket.API/Controllers/BasketController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public BasketController(IBasketRepository repository)
2626
[HttpGet("{id}")]
2727
public async Task<IActionResult> Get(string id)
2828
{
29-
var basket = await _repository.GetBasket(id);
29+
var basket = await _repository.GetBasketAsync(id);
3030

3131
return Ok(basket);
3232
}
@@ -35,7 +35,7 @@ public async Task<IActionResult> Get(string id)
3535
[HttpPost]
3636
public async Task<IActionResult> Post([FromBody]CustomerBasket value)
3737
{
38-
var basket = await _repository.UpdateBasket(value);
38+
var basket = await _repository.UpdateBasketAsync(value);
3939

4040
return Ok(basket);
4141
}
@@ -44,7 +44,7 @@ public async Task<IActionResult> Post([FromBody]CustomerBasket value)
4444
[HttpDelete("{id}")]
4545
public void Delete(string id)
4646
{
47-
_repository.DeleteBasket(id);
47+
_repository.DeleteBasketAsync(id);
4848
}
4949
}
5050
}

src/Services/Basket/Basket.API/Model/IBasketRepository.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
77
{
88
public interface IBasketRepository
99
{
10-
Task<CustomerBasket> GetBasket(string customerId);
11-
Task<CustomerBasket> UpdateBasket(CustomerBasket basket);
12-
Task<bool> DeleteBasket(string id);
10+
Task<CustomerBasket> GetBasketAsync(string customerId);
11+
Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket);
12+
Task<bool> DeleteBasketAsync(string id);
1313
}
1414
}

src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public RedisBasketRepository(IOptionsSnapshot<BasketSettings> options, ILoggerFa
2525

2626
}
2727

28-
public async Task<bool> DeleteBasket(string id)
28+
public async Task<bool> DeleteBasketAsync(string id)
2929
{
3030
var database = await GetDatabase();
3131
return await database.KeyDeleteAsync(id.ToString());
3232
}
3333

34-
public async Task<CustomerBasket> GetBasket(string customerId)
34+
public async Task<CustomerBasket> GetBasketAsync(string customerId)
3535
{
3636
var database = await GetDatabase();
3737

@@ -44,7 +44,7 @@ public async Task<CustomerBasket> GetBasket(string customerId)
4444
return JsonConvert.DeserializeObject<CustomerBasket>(data);
4545
}
4646

47-
public async Task<CustomerBasket> UpdateBasket(CustomerBasket basket)
47+
public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket)
4848
{
4949
var database = await GetDatabase();
5050

@@ -56,7 +56,7 @@ public async Task<CustomerBasket> UpdateBasket(CustomerBasket basket)
5656
}
5757

5858
_logger.LogInformation("basket item persisted succesfully");
59-
return await GetBasket(basket.BuyerId);
59+
return await GetBasketAsync(basket.BuyerId);
6060
}
6161

6262
private async Task<IDatabase> GetDatabase()

src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public Buyer Add(Buyer buyer)
2929
{
3030
if (buyer.IsTransient())
3131
{
32+
//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
3233
return _context.Buyers
3334
.Add(buyer)
3435
.Entity;

src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public OrderRepository(OrderingContext context)
2424

2525
public Order Add(Order order)
2626
{
27+
//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
2728
return _context.Orders.Add(order)
2829
.Entity;
2930
}

test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task UpdateBasket_return_and_add_basket()
2525
{
2626
var redisBasketRepository = BuildBasketRepository();
2727

28-
var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId")
28+
var basket = await redisBasketRepository.UpdateBasketAsync(new CustomerBasket("customerId")
2929
{
3030
BuyerId = "buyerId",
3131
Items = BuildBasketItems()
@@ -40,15 +40,15 @@ public async Task Delete_Basket_return_null()
4040
{
4141
var redisBasketRepository = BuildBasketRepository();
4242

43-
var basket = await redisBasketRepository.UpdateBasket(new CustomerBasket("customerId")
43+
var basket = await redisBasketRepository.UpdateBasketAsync(new CustomerBasket("customerId")
4444
{
4545
BuyerId = "buyerId",
4646
Items = BuildBasketItems()
4747
});
4848

49-
var deleteResult = await redisBasketRepository.DeleteBasket("buyerId");
49+
var deleteResult = await redisBasketRepository.DeleteBasketAsync("buyerId");
5050

51-
var result = await redisBasketRepository.GetBasket(basket.BuyerId);
51+
var result = await redisBasketRepository.GetBasketAsync(basket.BuyerId);
5252

5353
Assert.True(deleteResult);
5454
Assert.Null(result);

test/Services/UnitTest/Basket/Application/BasketWebApiTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task Get_customer_basket_success()
2424
var fakeCustomerId = "1";
2525
var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId);
2626

27-
_basketRepositoryMock.Setup(x => x.GetBasket(It.IsAny<string>()))
27+
_basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny<string>()))
2828
.Returns(Task.FromResult(fakeCustomerBasket));
2929

3030
//Act
@@ -43,7 +43,7 @@ public async Task Post_customer_basket_success()
4343
var fakeCustomerId = "1";
4444
var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId);
4545

46-
_basketRepositoryMock.Setup(x => x.UpdateBasket(It.IsAny<CustomerBasket>()))
46+
_basketRepositoryMock.Setup(x => x.UpdateBasketAsync(It.IsAny<CustomerBasket>()))
4747
.Returns(Task.FromResult(fakeCustomerBasket));
4848

4949
//Act

0 commit comments

Comments
 (0)