Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding guards and more tests (#68)

Browse Source 
* Adding single entity by spec method to repository

* Adding guards and more unit tests
This commit is contained in:
Steve Smith
2017-10-30 11:53:29 -07:00
committed by GitHub
parent 3d46c80cff
commit b864be9265
10 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ApplicationCore/ApplicationCore.csproj
View File

@@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="1.1.1" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
</ItemGroup>

23
src/ApplicationCore/Exceptions/BasketNotFoundException.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
namespace ApplicationCore.Exceptions
{
public class BasketNotFoundException : Exception
{
public BasketNotFoundException(int basketId) : base($"No basket found with id {basketId}")
{
}
protected BasketNotFoundException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
{
}
public BasketNotFoundException(string message) : base(message)
{
}
public BasketNotFoundException(string message, Exception innerException) : base(message, innerException)
{
}
}
}

14
src/ApplicationCore/Exceptions/GuardExtensions.cs Normal file
View File

@@ -0,0 +1,14 @@
using ApplicationCore.Exceptions;
using Microsoft.eShopWeb.ApplicationCore.Entities;
namespace Ardalis.GuardClauses
{
public static class FooGuard
{
public static void NullBasket(this IGuardClause guardClause, int basketId, Basket basket)
{
if (basket == null)
throw new BasketNotFoundException(basketId);
}
}
}

2
src/ApplicationCore/Interfaces/IRepository.cs
View File

@@ -1,12 +1,12 @@
using Microsoft.eShopWeb.ApplicationCore.Entities;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace ApplicationCore.Interfaces
{
public interface IRepository<T> where T : BaseEntity
{
T GetById(int id);
T GetSingleBySpec(ISpecification<T> spec);
IEnumerable<T> ListAll();
IEnumerable<T> List(ISpecification<T> spec);
T Add(T entity);

6
src/ApplicationCore/Services/BasketService.cs
View File

@@ -4,6 +4,7 @@ using System.Collections.Generic;
using ApplicationCore.Specifications;
using Microsoft.eShopWeb.ApplicationCore.Entities;
using System.Linq;
using Ardalis.GuardClauses;
namespace ApplicationCore.Services
{
@@ -43,6 +44,7 @@ namespace ApplicationCore.Services
public async Task<int> GetBasketItemCountAsync(string userName)
{
Guard.Against.NullOrEmpty(userName, nameof(userName));
var basketSpec = new BasketWithItemsSpecification(userName);
var basket = (await _basketRepository.ListAsync(basketSpec)).FirstOrDefault();
if (basket == null)
@@ -57,7 +59,9 @@ namespace ApplicationCore.Services
public async Task SetQuantities(int basketId, Dictionary<string, int> quantities)
{
Guard.Against.Null(quantities, nameof(quantities));
var basket = await _basketRepository.GetByIdAsync(basketId);
Guard.Against.NullBasket(basketId, basket);
foreach (var item in basket.Items)
{
if (quantities.TryGetValue(item.Id.ToString(), out var quantity))
@@ -71,6 +75,8 @@ namespace ApplicationCore.Services
public async Task TransferBasketAsync(string anonymousId, string userName)
{
Guard.Against.NullOrEmpty(anonymousId, nameof(anonymousId));
Guard.Against.NullOrEmpty(userName, nameof(userName));
var basketSpec = new BasketWithItemsSpecification(anonymousId);
var basket = (await _basketRepository.ListAsync(basketSpec)).FirstOrDefault();
if (basket == null) return;

2
src/ApplicationCore/Services/OrderService.cs
View File

@@ -3,6 +3,7 @@ using ApplicationCore.Entities.OrderAggregate;
using System.Threading.Tasks;
using Microsoft.eShopWeb.ApplicationCore.Entities;
using System.Collections.Generic;
using Ardalis.GuardClauses;
namespace ApplicationCore.Services
{
@@ -24,6 +25,7 @@ namespace ApplicationCore.Services
public async Task CreateOrderAsync(int basketId, Address shippingAddress)
{
var basket = await _basketRepository.GetByIdAsync(basketId);
Guard.Against.NullBasket(basketId, basket);
var items = new List<OrderItem>();
foreach (var item in basket.Items)
{

6
src/Infrastructure/Data/EfRepository.cs
View File

@@ -26,6 +26,12 @@ namespace Infrastructure.Data
return _dbContext.Set<T>().Find(id);
}
public T GetSingleBySpec(ISpecification<T> spec)
{
return List(spec).FirstOrDefault();
}
public virtual async Task<T> GetByIdAsync(int id)
{
return await _dbContext.Set<T>().FindAsync(id);

1
src/Infrastructure/Logging/LoggerAdapter.cs
View File

@@ -15,6 +15,7 @@ namespace Infrastructure.Logging
{
_logger.LogWarning(message, args);
}
public void LogInformation(string message, params object[] args)
{
_logger.LogInformation(message, args);

40
tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs Normal file
View File

@@ -0,0 +1,40 @@
using ApplicationCore.Exceptions;
using ApplicationCore.Interfaces;
using ApplicationCore.Services;
using Microsoft.eShopWeb.ApplicationCore.Entities;
using Moq;
using System;
using Xunit;
namespace UnitTests.ApplicationCore.Services.BasketServiceTests
{
public class SetQuantities
{
private int _invalidId = -1;
private Mock<IAsyncRepository<Basket>> _mockBasketRepo;
public SetQuantities()
{
_mockBasketRepo = new Mock<IAsyncRepository<Basket>>();
}
[Fact]
public async void ThrowsGivenInvalidBasketId()
{
var basketService = new BasketService(_mockBasketRepo.Object, null, null, null);
await Assert.ThrowsAsync<BasketNotFoundException>(async () =>
await basketService.SetQuantities(_invalidId, new System.Collections.Generic.Dictionary<string, int>()));
}
[Fact]
public async void ThrowsGivenNullQuantities()
{
var basketService = new BasketService(null, null, null, null);
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
await basketService.SetQuantities(123, null));
}
}
}

25
tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs Normal file
View File

@@ -0,0 +1,25 @@
using ApplicationCore.Services;
using System;
using Xunit;
namespace UnitTests.ApplicationCore.Services.BasketServiceTests
{
public class TransferBasket
{
[Fact]
public async void ThrowsGivenNullAnonymousId()
{
var basketService = new BasketService(null, null, null, null);
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync(null, "steve"));
}
[Fact]
public async void ThrowsGivenNullUserId()
{
var basketService = new BasketService(null, null, null, null);
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync("abcdefg", null));
}
}
}