Skip to content

Move the selector checks to the evaluators. #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardalis merged 1 commit into from
Jan 12, 2022
Merged

Move the selector checks to the evaluators. #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...ramework6/src/Ardalis.Specification.EntityFramework6/Evaluators/SpecificationEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;

namespace Ardalis.Specification.EntityFramework6
Expand Down Expand Up @@ -31,6 +32,9 @@ public SpecificationEvaluator(IEnumerable<IEvaluator> evaluators)
/// <inheritdoc/>
public virtual IQueryable<TResult> GetQuery<T, TResult>(IQueryable<T> query, ISpecification<T, TResult> specification) where T : class
{
if (specification is null) throw new ArgumentNullException("Specification is required");
if (specification.Selector is null) throw new SelectorNotFoundException();

query = GetQuery(query, (ISpecification<T>)specification);

return query.Select(specification.Selector);
Expand All @@ -39,6 +43,8 @@ public virtual IQueryable<TResult> GetQuery<T, TResult>(IQueryable<T> query, ISp
/// <inheritdoc/>
public virtual IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification, bool evaluateCriteriaOnly = false) where T : class
{
if (specification is null) throw new ArgumentNullException("Specification is required");

var evaluators = evaluateCriteriaOnly ? this.evaluators.Where(x => x.IsCriteriaEvaluator) : this.evaluators;

foreach (var evaluator in evaluators)
Expand Down
3 changes: 0 additions & 3 deletions ...fication.EntityFramework6/src/Ardalis.Specification.EntityFramework6/RepositoryBaseOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ protected virtual IQueryable<T> ApplySpecification(ISpecification<T> specificati
/// <returns>The filtered projected entities as an <see cref="IQueryable{T}"/>.</returns>
protected virtual IQueryable<TResult> ApplySpecification<TResult>(ISpecification<T, TResult> specification)
{
if (specification is null) throw new ArgumentNullException("Specification is required");
if (specification.Selector is null) throw new SelectorNotFoundException();

return specificationEvaluator.GetQuery(dbContext.Set<T>().AsQueryable(), specification);
}
}
Expand Down
8 changes: 7 additions & 1 deletion ...rkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/SpecificationEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;

namespace Ardalis.Specification.EntityFrameworkCore
Expand Down Expand Up @@ -45,6 +46,9 @@ public SpecificationEvaluator(IEnumerable<IEvaluator> evaluators)
/// <inheritdoc/>
public virtual IQueryable<TResult> GetQuery<T, TResult>(IQueryable<T> query, ISpecification<T, TResult> specification) where T : class
{
if (specification is null) throw new ArgumentNullException("Specification is required");
if (specification.Selector is null) throw new SelectorNotFoundException();

query = GetQuery(query, (ISpecification<T>)specification);

return query.Select(specification.Selector);
Expand All @@ -53,6 +57,8 @@ public virtual IQueryable<TResult> GetQuery<T, TResult>(IQueryable<T> query, ISp
/// <inheritdoc/>
public virtual IQueryable<T> GetQuery<T>(IQueryable<T> query, ISpecification<T> specification, bool evaluateCriteriaOnly = false) where T : class
{
if (specification is null) throw new ArgumentNullException("Specification is required");

var evaluators = evaluateCriteriaOnly ? this.evaluators.Where(x => x.IsCriteriaEvaluator) : this.evaluators;

foreach (var evaluator in evaluators)
Expand Down
3 changes: 0 additions & 3 deletions ...on.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ protected virtual IQueryable<T> ApplySpecification(ISpecification<T> specificati
/// <returns>The filtered projected entities as an <see cref="IQueryable{T}"/>.</returns>
protected virtual IQueryable<TResult> ApplySpecification<TResult>(ISpecification<T, TResult> specification)
{
if (specification is null) throw new ArgumentNullException("Specification is required");
if (specification.Selector is null) throw new SelectorNotFoundException();

return specificationEvaluator.GetQuery(dbContext.Set<T>().AsQueryable(), specification);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...sts/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/RepositoryOfT_GetBySpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public virtual async Task ReturnsUntrackedCompany_GivenCompanyByIdAsUntrackedSpe

result.Should().NotBeNull();
result?.Name.Should().Be(CompanySeed.VALID_COMPANY_NAME);
dbContext.Entry(result).State.Should().Be(Microsoft.EntityFrameworkCore.EntityState.Detached);
dbContext.Entry(result!).State.Should().Be(Microsoft.EntityFrameworkCore.EntityState.Detached);
}

[Fact]
Expand Down