Switching to NuGet Ardalis.Specifications (dotnet-architecture#389)

- updating to use Ardalis.Specifications package as it is maintained and has a more robust implementation - Removing all custom specification implementation - Updating unit tests
smurawski · Jun 8, 2020 · 70a919e · 70a919e
1 parent 1b5b12e
commit 70a919e
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 310 deletions.
diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj
@@ -7,6 +7,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Ardalis.GuardClauses" Version="1.5.0" />
+		<PackageReference Include="Ardalis.Specification" Version="3.0.0" />
 		<PackageReference Include="System.Security.Claims" Version="4.3.0" />
 	</ItemGroup>
 

diff --git a/src/ApplicationCore/Helpers/Query/IncludeAggregator.cs b/src/ApplicationCore/Helpers/Query/IncludeAggregator.cs
diff --git a/src/ApplicationCore/Helpers/Query/IncludeQuery.cs b/src/ApplicationCore/Helpers/Query/IncludeQuery.cs
diff --git a/src/ApplicationCore/Helpers/Query/IncludeQueryExtensions.cs b/src/ApplicationCore/Helpers/Query/IncludeQueryExtensions.cs
diff --git a/src/ApplicationCore/Helpers/Query/IncludeVisitor.cs b/src/ApplicationCore/Helpers/Query/IncludeVisitor.cs
diff --git a/src/ApplicationCore/Interfaces/IAsyncRepository.cs b/src/ApplicationCore/Interfaces/IAsyncRepository.cs
@@ -1,4 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 

diff --git a/src/ApplicationCore/Interfaces/IIncludeQuery.cs b/src/ApplicationCore/Interfaces/IIncludeQuery.cs
diff --git a/src/ApplicationCore/Interfaces/ISpecification.cs b/src/ApplicationCore/Interfaces/ISpecification.cs
diff --git a/src/ApplicationCore/Specifications/BaseSpecification.cs b/src/ApplicationCore/Specifications/BaseSpecification.cs
diff --git a/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs b/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs
@@ -1,16 +1,15 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Specifications
 {
     public sealed class BasketWithItemsSpecification : BaseSpecification<Basket>
     {
-        public BasketWithItemsSpecification(int basketId)
-            :base(b => b.Id == basketId)
+        public BasketWithItemsSpecification(int basketId) : base(b => b.Id == basketId)
         {
             AddInclude(b => b.Items);
         }
-        public BasketWithItemsSpecification(string buyerId)
-            :base(b => b.BuyerId == buyerId)
+        public BasketWithItemsSpecification(string buyerId) : base(b => b.BuyerId == buyerId)
         {
             AddInclude(b => b.Items);
         }

diff --git a/src/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs b/src/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs
@@ -1,4 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Specifications
 {

diff --git a/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs b/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs
@@ -1,4 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Specifications
 {

diff --git a/src/ApplicationCore/Specifications/CatalogItemsSpecification.cs b/src/ApplicationCore/Specifications/CatalogItemsSpecification.cs
@@ -1,4 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 using System;
 using System.Linq;
 

diff --git a/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs b/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs
@@ -1,5 +1,6 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-using Microsoft.eShopWeb.ApplicationCore.Helpers.Query;
+using Ardalis.Specification;
+using Ardalis.Specification.QueryExtensions.Include;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Specifications
 {
@@ -8,7 +9,8 @@ public class CustomerOrdersWithItemsSpecification : BaseSpecification<Order>
         public CustomerOrdersWithItemsSpecification(string buyerId)
             : base(o => o.BuyerId == buyerId)
         {
-            AddIncludes(query => query.Include(o => o.OrderItems).ThenInclude(i => i.ItemOrdered));
+            AddIncludes(query => query.Include(o => o.OrderItems)
+            .ThenInclude(i => i.ItemOrdered));
         }
     }
 }
diff --git a/src/Infrastructure/Data/EfRepository.cs b/src/Infrastructure/Data/EfRepository.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Ardalis.Specification;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System.Collections.Generic;
@@ -33,12 +34,14 @@ public async Task<IReadOnlyList<T>> ListAllAsync()
 
         public async Task<IReadOnlyList<T>> ListAsync(ISpecification<T> spec)
         {
-            return await ApplySpecification(spec).ToListAsync();
+            var specificationResult = await ApplySpecification(spec);
+            return await specificationResult.ToListAsync();
         }
 
         public async Task<int> CountAsync(ISpecification<T> spec)
         {
-            return await ApplySpecification(spec).CountAsync();
+            var specificationResult = await ApplySpecification(spec);
+            return await specificationResult.CountAsync();
         }
 
         public async Task<T> AddAsync(T entity)
@@ -63,17 +66,19 @@ public async Task DeleteAsync(T entity)
 
         public async Task<T> FirstAsync(ISpecification<T> spec)
         {
-            return await ApplySpecification(spec).FirstAsync();
+            var specificationResult = await ApplySpecification(spec);
+            return await specificationResult.FirstAsync();
         }
 
         public async Task<T> FirstOrDefaultAsync(ISpecification<T> spec)
         {
-            return await ApplySpecification(spec).FirstOrDefaultAsync();
+            var specificationResult = await ApplySpecification(spec);
+            return await specificationResult.FirstOrDefaultAsync();
         }
 
-        private IQueryable<T> ApplySpecification(ISpecification<T> spec)
+        private async Task<IQueryable<T>> ApplySpecification(ISpecification<T> spec)
         {
-            return SpecificationEvaluator<T>.GetQuery(_dbContext.Set<T>().AsQueryable(), spec);
+            return await EfSpecificationEvaluator<T>.GetQuery(_dbContext.Set<T>().AsQueryable(), spec);
         }
     }
 }
diff --git a/src/Infrastructure/Data/OrderRepository.cs b/src/Infrastructure/Data/OrderRepository.cs
@@ -2,6 +2,7 @@
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
+using Ardalis.Specification;
 
 namespace Microsoft.eShopWeb.Infrastructure.Data
 {