From 8a00269ebd7991022b851ab82dba5c9661035cf2 Mon Sep 17 00:00:00 2001 From: Eric Fleming Date: Fri, 1 Mar 2019 22:21:12 -0500 Subject: [PATCH] Removing IRepository - This also involved cleaning up places where IRepository was still being references in Startup - Removed unused repository from Basket service --- src/ApplicationCore/Interfaces/IRepository.cs | 10 ---------- src/ApplicationCore/Services/BasketService.cs | 3 --- src/Infrastructure/Data/EfRepository.cs | 2 +- src/Web/Startup.cs | 3 +-- .../Services/BasketServiceTests/DeleteBasket.cs | 2 +- .../Services/BasketServiceTests/SetQuantities.cs | 4 ++-- .../Services/BasketServiceTests/TransferBasket.cs | 4 ++-- 7 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 src/ApplicationCore/Interfaces/IRepository.cs diff --git a/src/ApplicationCore/Interfaces/IRepository.cs b/src/ApplicationCore/Interfaces/IRepository.cs deleted file mode 100644 index b4e475e..0000000 --- a/src/ApplicationCore/Interfaces/IRepository.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Microsoft.eShopWeb.ApplicationCore.Entities; -using System.Collections.Generic; - -namespace Microsoft.eShopWeb.ApplicationCore.Interfaces -{ - public interface IRepository where T : BaseEntity - { - - } -} diff --git a/src/ApplicationCore/Services/BasketService.cs b/src/ApplicationCore/Services/BasketService.cs index 7d3011a..1f39f85 100644 --- a/src/ApplicationCore/Services/BasketService.cs +++ b/src/ApplicationCore/Services/BasketService.cs @@ -15,10 +15,8 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services private readonly IAsyncRepository _basketItemRepository; private readonly IUriComposer _uriComposer; private readonly IAppLogger _logger; - private readonly IRepository _itemRepository; public BasketService(IAsyncRepository basketRepository, - IRepository itemRepository, IUriComposer uriComposer, IAppLogger logger, IAsyncRepository basketItemRepository) @@ -26,7 +24,6 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services _basketRepository = basketRepository; _uriComposer = uriComposer; _logger = logger; - _itemRepository = itemRepository; _basketItemRepository = basketItemRepository; } diff --git a/src/Infrastructure/Data/EfRepository.cs b/src/Infrastructure/Data/EfRepository.cs index 6db7096..8688e14 100644 --- a/src/Infrastructure/Data/EfRepository.cs +++ b/src/Infrastructure/Data/EfRepository.cs @@ -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/ /// /// - public class EfRepository : IRepository, IAsyncRepository where T : BaseEntity + public class EfRepository : IAsyncRepository where T : BaseEntity { protected readonly CatalogContext _dbContext; diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs index 2bf29e3..a8c41a8 100644 --- a/src/Web/Startup.cs +++ b/src/Web/Startup.cs @@ -84,8 +84,7 @@ namespace Microsoft.eShopWeb.Web ConfigureCookieSettings(services); CreateIdentityIfNotCreated(services); - - services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>)); + services.AddScoped(typeof(IAsyncRepository<>), typeof(EfRepository<>)); services.AddScoped(); diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/DeleteBasket.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/DeleteBasket.cs index dae2c64..79bdd18 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/DeleteBasket.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/DeleteBasket.cs @@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes basket.AddItem(2, It.IsAny(), It.IsAny()); _mockBasketRepo.Setup(x => x.GetByIdAsync(It.IsAny())) .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()); diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs index 7de18e3..9c5f11d 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs @@ -21,7 +21,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes [Fact] 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(async () => await basketService.SetQuantities(_invalidId, new System.Collections.Generic.Dictionary())); @@ -30,7 +30,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes [Fact] public async void ThrowsGivenNullQuantities() { - var basketService = new BasketService(null, null, null, null, null); + var basketService = new BasketService(null, null, null, null); await Assert.ThrowsAsync(async () => await basketService.SetQuantities(123, null)); diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs index 41e1069..38c0a30 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs @@ -9,7 +9,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes [Fact] public async void ThrowsGivenNullAnonymousId() { - var basketService = new BasketService(null, null, null, null, null); + var basketService = new BasketService(null, null, null, null); await Assert.ThrowsAsync(async () => await basketService.TransferBasketAsync(null, "steve")); } @@ -17,7 +17,7 @@ namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTes [Fact] public async void ThrowsGivenNullUserId() { - var basketService = new BasketService(null, null, null, null, null); + var basketService = new BasketService(null, null, null, null); await Assert.ThrowsAsync(async () => await basketService.TransferBasketAsync("abcdefg", null)); }