Skip to content

Bug fix to add no tracking on queries #34

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.

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
merged 3 commits into from
Feb 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/DDDToolkit.ApplicationLayer/ApplicationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ public class ApplicationService<T, TId> : IApplicationService<T, TId>
private IReadableApplicationService<T, TId> _readableApplicationService;
private IWritableApplicationService<T, TId> _writableApplicationService;

protected readonly IUnitOfWork _unitOfWork;

public ApplicationService(IUnitOfWork unitOfWork)
{
_unitOfWork = unitOfWork;
_readableApplicationService = new ReadableApplicationService<T, TId>(unitOfWork);
_writableApplicationService = new WritableApplicationService<T, TId>(unitOfWork);
}
Expand Down
2 changes: 2 additions & 0 deletions src/DDDToolkit.Core/Repositories/IReadableRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public interface IReadableRepository<T, TId>
Task<IReadOnlyCollection<T>> GetAll(CancellationToken cancellationToken = default(CancellationToken));
Task<IReadOnlyCollection<T>> Query(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken));
Task<IReadOnlyCollection<T>> Query(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken));
Task<IReadOnlyCollection<T>> QueryWithChildren(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken));
Task<IReadOnlyCollection<T>> QueryWithChildren(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken));
Task<T> FirstOrDefault(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken));
Task<T> FirstOrDefault(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken));
Task<T> GetById(TId id, CancellationToken cancellationToken = default(CancellationToken));
Expand Down
15 changes: 11 additions & 4 deletions src/DDDToolkit.Repository.Sql/ReadableRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public ReadableRepository(TContext dbContext) : base(dbContext) { }
protected virtual IQueryable<T> ApplyIncludes(IQueryable<T> query) => query.IncludeEverything();
protected virtual IQueryable<T> Queryable => ApplyIncludes(Set.AsNoTracking());

public Task<IReadOnlyCollection<T>> GetAll(CancellationToken cancellationToken = default(CancellationToken)) => Set.ToListAsync(cancellationToken).ToReadOnlyCollection();
public Task<IReadOnlyCollection<T>> GetAll(CancellationToken cancellationToken = default(CancellationToken)) => Set.AsNoTracking().ToListAsync(cancellationToken).ToReadOnlyCollection();

public Task<T> GetById(TId id, CancellationToken cancellationToken = default(CancellationToken))
{
Expand All @@ -38,18 +38,25 @@ public ReadableRepository(TContext dbContext) : base(dbContext) { }
return Queryable.FirstOrDefaultAsync(eLambda, cancellationToken);
}

private Task<IReadOnlyCollection<T>> ExecuteQueryOnQueryable(Expression<Func<T, bool>> query, IQueryable<T> queryable, CancellationToken cancellationToken)
=> queryable.Where(query).ToReadOnlyCollectionAsync(cancellationToken);

public Task<IReadOnlyCollection<T>> Query(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken))
=> Set.Where(query).ToReadOnlyCollectionAsync(cancellationToken);
=> ExecuteQueryOnQueryable(query, Set.AsNoTracking(), cancellationToken);

public Task<IReadOnlyCollection<T>> Query(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken))
=> Query(query.AsExpression(), cancellationToken);

public Task<IReadOnlyCollection<T>> QueryWithChildren(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken))
=> ExecuteQueryOnQueryable(query, Queryable, cancellationToken);

public Task<IReadOnlyCollection<T>> QueryWithChildren(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken))
=> QueryWithChildren(query.AsExpression(), cancellationToken);

public Task<T> FirstOrDefault(Expression<Func<T, bool>> query, CancellationToken cancellationToken = default(CancellationToken))
=> Queryable.FirstOrDefaultAsync(query, cancellationToken);

public Task<T> FirstOrDefault(IQuery<T> query, CancellationToken cancellationToken = default(CancellationToken))
=> FirstOrDefault(query.AsExpression(), cancellationToken);


}
}
10 changes: 10 additions & 0 deletions src/DDDToolkit.Validation/DDDToolkit.Validation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>Paul Burgess</Authors>
<Company>Paul Burgess</Company>
<Product>DDDToolkit</Product>
<Description>Validation rules to create validation classes to validate objects.</Description>
<Copyright>Paul Burgess</Copyright>
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/codepb/DDDToolkit</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/codepb/DDDToolkit/master/logo/logo.png</PackageIconUrl>
<RepositoryUrl>https://github.com/codepb/DDDToolkit</RepositoryUrl>
<PackageTags>DDD, Domain Driven Design, Validation</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down