Removing IRepository
- This also involved cleaning up places where IRepository was still being references in Startup - Removed unused repository from Basket service
This commit is contained in:
@@ -1,10 +0,0 @@
|
|||||||
using Microsoft.eShopWeb.ApplicationCore.Entities;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
|
|
||||||
{
|
|
||||||
public interface IRepository<T> where T : BaseEntity
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,10 +15,8 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services
|
|||||||
private readonly IAsyncRepository<BasketItem> _basketItemRepository;
|
private readonly IAsyncRepository<BasketItem> _basketItemRepository;
|
||||||
private readonly IUriComposer _uriComposer;
|
private readonly IUriComposer _uriComposer;
|
||||||
private readonly IAppLogger<BasketService> _logger;
|
private readonly IAppLogger<BasketService> _logger;
|
||||||
private readonly IRepository<CatalogItem> _itemRepository;
|
|
||||||
|
|
||||||
public BasketService(IAsyncRepository<Basket> basketRepository,
|
public BasketService(IAsyncRepository<Basket> basketRepository,
|
||||||
IRepository<CatalogItem> itemRepository,
|
|
||||||
IUriComposer uriComposer,
|
IUriComposer uriComposer,
|
||||||
IAppLogger<BasketService> logger,
|
IAppLogger<BasketService> logger,
|
||||||
IAsyncRepository<BasketItem> basketItemRepository)
|
IAsyncRepository<BasketItem> basketItemRepository)
|
||||||
@@ -26,7 +24,6 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services
|
|||||||
_basketRepository = basketRepository;
|
_basketRepository = basketRepository;
|
||||||
_uriComposer = uriComposer;
|
_uriComposer = uriComposer;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_itemRepository = itemRepository;
|
|
||||||
_basketItemRepository = basketItemRepository;
|
_basketItemRepository = basketItemRepository;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Microsoft.eShopWeb.Infrastructure.Data
|
|||||||
/// https://blogs.msdn.microsoft.com/pfxteam/2012/04/13/should-i-expose-synchronous-wrappers-for-asynchronous-methods/
|
/// https://blogs.msdn.microsoft.com/pfxteam/2012/04/13/should-i-expose-synchronous-wrappers-for-asynchronous-methods/
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
public class EfRepository<T> : IRepository<T>, IAsyncRepository<T> where T : BaseEntity
|
public class EfRepository<T> : IAsyncRepository<T> where T : BaseEntity
|
||||||
{
|
{
|
||||||
protected readonly CatalogContext _dbContext;
|
protected readonly CatalogContext _dbContext;
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ namespace Microsoft.eShopWeb.Web
|
|||||||
|
|
||||||
CreateIdentityIfNotCreated(services);
|
CreateIdentityIfNotCreated(services);
|
||||||
|
|
||||||
services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>));
|
|
||||||
services.AddScoped(typeof(IAsyncRepository<>), typeof(EfRepository<>));
|
services.AddScoped(typeof(IAsyncRepository<>), typeof(EfRepository<>));
|
||||||
|
|
||||||
services.AddScoped<ICatalogService, CachedCatalogService>();
|
services.AddScoped<ICatalogService, CachedCatalogService>();
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes
|
|||||||
basket.AddItem(2, It.IsAny<decimal>(), It.IsAny<int>());
|
basket.AddItem(2, It.IsAny<decimal>(), It.IsAny<int>());
|
||||||
_mockBasketRepo.Setup(x => x.GetByIdAsync(It.IsAny<int>()))
|
_mockBasketRepo.Setup(x => x.GetByIdAsync(It.IsAny<int>()))
|
||||||
.ReturnsAsync(basket);
|
.ReturnsAsync(basket);
|
||||||
var basketService = new BasketService(_mockBasketRepo.Object, null, null, null, _mockBasketItemRepo.Object);
|
var basketService = new BasketService(_mockBasketRepo.Object, null, null, _mockBasketItemRepo.Object);
|
||||||
|
|
||||||
await basketService.DeleteBasketAsync(It.IsAny<int>());
|
await basketService.DeleteBasketAsync(It.IsAny<int>());
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes
|
|||||||
[Fact]
|
[Fact]
|
||||||
public async void ThrowsGivenInvalidBasketId()
|
public async void ThrowsGivenInvalidBasketId()
|
||||||
{
|
{
|
||||||
var basketService = new BasketService(_mockBasketRepo.Object, null, null, null, null);
|
var basketService = new BasketService(_mockBasketRepo.Object, null, null, null);
|
||||||
|
|
||||||
await Assert.ThrowsAsync<BasketNotFoundException>(async () =>
|
await Assert.ThrowsAsync<BasketNotFoundException>(async () =>
|
||||||
await basketService.SetQuantities(_invalidId, new System.Collections.Generic.Dictionary<string, int>()));
|
await basketService.SetQuantities(_invalidId, new System.Collections.Generic.Dictionary<string, int>()));
|
||||||
@@ -30,7 +30,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes
|
|||||||
[Fact]
|
[Fact]
|
||||||
public async void ThrowsGivenNullQuantities()
|
public async void ThrowsGivenNullQuantities()
|
||||||
{
|
{
|
||||||
var basketService = new BasketService(null, null, null, null, null);
|
var basketService = new BasketService(null, null, null, null);
|
||||||
|
|
||||||
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
|
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
|
||||||
await basketService.SetQuantities(123, null));
|
await basketService.SetQuantities(123, null));
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes
|
|||||||
[Fact]
|
[Fact]
|
||||||
public async void ThrowsGivenNullAnonymousId()
|
public async void ThrowsGivenNullAnonymousId()
|
||||||
{
|
{
|
||||||
var basketService = new BasketService(null, null, null, null, null);
|
var basketService = new BasketService(null, null, null, null);
|
||||||
|
|
||||||
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync(null, "steve"));
|
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync(null, "steve"));
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes
|
|||||||
[Fact]
|
[Fact]
|
||||||
public async void ThrowsGivenNullUserId()
|
public async void ThrowsGivenNullUserId()
|
||||||
{
|
{
|
||||||
var basketService = new BasketService(null, null, null, null, null);
|
var basketService = new BasketService(null, null, null, null);
|
||||||
|
|
||||||
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync("abcdefg", null));
|
await Assert.ThrowsAsync<ArgumentNullException>(async () => await basketService.TransferBasketAsync("abcdefg", null));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user