Merge pull request #498 from json-api-dotnet/fix/#475

maurei · web-flow · commit 0416df760719 · 2019-04-29T22:23:57.000+02:00
fix: sparse fields set not applied to query
diff --git a/JsonApiDotnetCore.sln b/JsonApiDotnetCore.sln
@@ -204,6 +204,7 @@ Global
 		{09C0C8D8-B721-4955-8889-55CB149C3B5C}.Release|x86.ActiveCfg = Release|Any CPU
 		{09C0C8D8-B721-4955-8889-55CB149C3B5C}.Release|x86.Build.0 = Release|Any CPU
 		{DF9BFD82-D937-4907-B0B4-64670417115F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF9BFD82-D937-4907-B0B4-64670417115F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs
@@ -140,15 +140,15 @@ public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQ
         /// <inheritdoc />
         public virtual async Task<TEntity> GetAsync(TId id)
         {
-            return await GetQueryable().SingleOrDefaultAsync(e => e.Id.Equals(id));
+            return await Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id));
         }
 
         /// <inheritdoc />
         public virtual async Task<TEntity> GetAndIncludeAsync(TId id, string relationshipName)
         {
             _logger?.LogDebug($"[JADN] GetAndIncludeAsync({id}, {relationshipName})");
 
-            var includedSet = Include(GetQueryable(), relationshipName);
+            var includedSet = Include(Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields), relationshipName);
             var result = await includedSet.SingleOrDefaultAsync(e => e.Id.Equals(id));
 
             return result;
diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs
@@ -108,8 +108,7 @@ public virtual async Task<IEnumerable<TResource>> GetAsync()
             if (_jsonApiContext.Options.IncludeTotalRecordCount)
                 _jsonApiContext.PageManager.TotalRecords = await _entities.CountAsync(entities);
 
-            if (_jsonApiContext.QuerySet?.Fields?.Count > 0)
-                entities = _entities.Select(entities, _jsonApiContext.QuerySet.Fields);
+            entities = _entities.Select(entities, _jsonApiContext.QuerySet?.Fields);
 
             // pagination should be done last since it will execute the query
             var pagedEntities = await ApplyPageQueryAsync(entities);
@@ -243,7 +242,7 @@ protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> e
 
         private async Task<TResource> GetWithRelationshipsAsync(TId id)
         {
-            var query = _entities.GetQueryable().Where(e => e.Id.Equals(id));
+            var query = _entities.Select(_entities.GetQueryable(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id));
 
             _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>
             {

Original file line number	Diff line number	Diff line change
`@@ -140,15 +140,15 @@ public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQ`
`140`	`140`	`/// <inheritdoc />`
`141`	`141`	`public virtual async Task<TEntity> GetAsync(TId id)`
`142`	`142`	`{`
`143`		`- return await GetQueryable().SingleOrDefaultAsync(e => e.Id.Equals(id));`
	`143`	`+ return await Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`/// <inheritdoc />`
`147`	`147`	`public virtual async Task<TEntity> GetAndIncludeAsync(TId id, string relationshipName)`
`148`	`148`	`{`
`149`	`149`	`_logger?.LogDebug($"[JADN] GetAndIncludeAsync({id}, {relationshipName})");`
`150`	`150`
`151`		`- var includedSet = Include(GetQueryable(), relationshipName);`
	`151`	`+ var includedSet = Include(Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields), relationshipName);`
`152`	`152`	`var result = await includedSet.SingleOrDefaultAsync(e => e.Id.Equals(id));`
`153`	`153`
`154`	`154`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,7 @@ public virtual async Task<IEnumerable<TResource>> GetAsync()`
`108`	`108`	`if (_jsonApiContext.Options.IncludeTotalRecordCount)`
`109`	`109`	`_jsonApiContext.PageManager.TotalRecords = await _entities.CountAsync(entities);`
`110`	`110`
`111`		`- if (_jsonApiContext.QuerySet?.Fields?.Count > 0)`
`112`		`- entities = _entities.Select(entities, _jsonApiContext.QuerySet.Fields);`
	`111`	`+ entities = _entities.Select(entities, _jsonApiContext.QuerySet?.Fields);`
`113`	`112`
`114`	`113`	`// pagination should be done last since it will execute the query`
`115`	`114`	`var pagedEntities = await ApplyPageQueryAsync(entities);`
`@@ -243,7 +242,7 @@ protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> e`
`243`	`242`
`244`	`243`	`private async Task<TResource> GetWithRelationshipsAsync(TId id)`
`245`	`244`	`{`
`246`		`- var query = _entities.GetQueryable().Where(e => e.Id.Equals(id));`
	`245`	`+ var query = _entities.Select(_entities.GetQueryable(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id));`
`247`	`246`
`248`	`247`	`_jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>`
`249`	`248`	`{`