Merge pull request #33 from codepb/QueryMethodsNoTracking

Fixing issue with tracking on Query methods, and adding a query with …

Author: codepb

src/DDDToolkit.ApplicationLayer/ApplicationService.cs

@@ -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);
         }

src/DDDToolkit.Core/Repositories/IReadableRepository.cs

@@ -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));

src/DDDToolkit.Repository.Sql/ReadableRepository.cs

@@ -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))
         {
@@ -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);
-
-
     }
 }

src/DDDToolkit.Validation/DDDToolkit.Validation.csproj

@@ -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>