fix(inclusion): include relationships for id requests

Author: jaredcnance

src/JsonApiDotNetCore/Controllers/JsonApiController.cs

@@ -7,6 +7,7 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
@@ -56,22 +57,39 @@ public virtual IActionResult Get()
         {
             var entities = _entities.Get();
 
-            entities = ApplyQuery(entities);
+            entities = ApplySortAndFilterQuery(entities);
+
+            if(_jsonApiContext.QuerySet != null)
+                entities = IncludeRelationships(entities, _jsonApiContext.QuerySet.IncludedRelationships);
 
             return Ok(entities);
         }
 
         [HttpGet("{id}")]
         public virtual async Task<IActionResult> GetAsync(TId id)
         {
-            var entity = await _entities.GetAsync(id);
+            T entity;
+            if(_jsonApiContext.QuerySet?.IncludedRelationships != null)
+                entity = await _getWithRelationshipsAsync(id);
+            else
+                entity = await _entities.GetAsync(id);
 
             if (entity == null)
                 return NotFound();
 
             return Ok(entity);
         }
 
+        private async Task<T> _getWithRelationshipsAsync(TId id)
+        {
+            var query = _entities.Get();
+            _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>
+            {
+                query = _entities.Include(query, r.ToProperCase());
+            });
+            return await query.FirstOrDefaultAsync(e => e.Id.Equals(id));
+        }
+
         [HttpGet("{id}/relationships/{relationshipName}")]
         public virtual async Task<IActionResult> GetRelationshipsAsync(TId id, string relationshipName)
         {
@@ -148,19 +166,16 @@ public virtual async Task<IActionResult> DeleteAsync(TId id)
         //     return Ok("Delete Id/relationship");
         // }
 
-        private IQueryable<T> ApplyQuery(IQueryable<T> entities)
+        private IQueryable<T> ApplySortAndFilterQuery(IQueryable<T> entities)
         {
-            if(!HttpContext.Request.Query.Any())
-                return entities;
-            
-            var querySet = new QuerySet<T>(_jsonApiContext);
+            var query = _jsonApiContext.QuerySet;
 
-            entities = _entities.Filter(entities, querySet.Filter);
+            if(_jsonApiContext.QuerySet == null)
+                return entities;
 
-            entities = _entities.Sort(entities, querySet.SortParameters);
+            entities = _entities.Filter(entities, query.Filter);
 
-            if(querySet != null)
-                entities = IncludeRelationships(entities, querySet.IncludedRelationships);
+            entities = _entities.Sort(entities, query.SortParameters);
 
             return entities;
         }

src/JsonApiDotNetCore/Internal/Query/QuerySet.cs

@@ -1,27 +1,28 @@
 using System.Collections.Generic;
 using System.Linq;
-using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Services;
+using Microsoft.AspNetCore.Http;
 
 namespace JsonApiDotNetCore.Internal.Query
 {
-    public class QuerySet<T>
+    public class QuerySet
     {
         IJsonApiContext _jsonApiContext;
 
-        public QuerySet(IJsonApiContext jsonApiContext)
+        public QuerySet(IJsonApiContext jsonApiContext, IQueryCollection query)
         {
             _jsonApiContext = jsonApiContext;
-            BuildQuerySet();
+            BuildQuerySet(query);
         }
 
         public FilterQuery Filter { get; set; }
         public List<SortQuery> SortParameters { get; set; }
         public List<string> IncludedRelationships { get; set; }
 
-        private void BuildQuerySet()
+        private void BuildQuerySet(IQueryCollection query)
         {
-            foreach (var pair in _jsonApiContext.Query)
+            foreach (var pair in query)
             {
                 if (pair.Key.StartsWith("filter"))
                 {
@@ -78,7 +79,10 @@ private List<SortQuery> ParseSortParameters(string value)
 
         private List<string> ParseIncludedRelationships(string value)
         {
-            return value.Split(',').ToList();
+            return value
+                .Split(',')
+                .Select(s => s.ToProperCase())
+                .ToList();
         }
 
         private AttrAttribute GetAttribute(string propertyName)

src/JsonApiDotNetCore/Services/IJsonApiContext.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Models;
-using Microsoft.AspNetCore.Http;
+using JsonApiDotNetCore.Internal.Query;
 
 namespace JsonApiDotNetCore.Services
 {
@@ -11,7 +10,7 @@ public interface IJsonApiContext
         IContextGraph ContextGraph { get; set; }
         ContextEntity RequestEntity { get; set; }
         string BasePath { get; set; }
-        IQueryCollection Query { get; set; }
+        QuerySet QuerySet { get; set; }
         bool IsRelationshipData { get; set; }
         List<string> IncludedRelationships { get; set; }
     }

src/JsonApiDotNetCore/Services/JsonApiContext.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using System.Linq;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Internal.Query;
 using Microsoft.AspNetCore.Http;
 
 namespace JsonApiDotNetCore.Services
@@ -20,7 +21,7 @@ public JsonApiContext(
         public IContextGraph ContextGraph { get; set; }
         public ContextEntity RequestEntity { get; set; }
         public string BasePath { get; set; }
-        public IQueryCollection Query { get; set; }
+        public QuerySet QuerySet { get; set; }
         public bool IsRelationshipData { get; set; }
         public List<string> IncludedRelationships { get; set; }
 
@@ -30,7 +31,11 @@ public IJsonApiContext ApplyContext<T>()
 
             RequestEntity = ContextGraph.GetContextEntity(typeof(T));
 
-            Query = context.Request.Query;
+            if(context.Request.Query.Any())
+            {
+                QuerySet = new QuerySet(this, context.Request.Query);
+                IncludedRelationships = QuerySet.IncludedRelationships;
+            }                
 
             var linkBuilder = new LinkBuilder(this);
             BasePath = linkBuilder.GetBasePath(context, RequestEntity.EntityName);