Merge pull request #427 from maurei/fix/hasmanythrough-empty-includes

fix(#425): fetching HasManyThrough returns no includes

Author: jaredcnance

Diff for: src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs

@@ -4,6 +4,7 @@ namespace JsonApiDotNetCoreExample.Models
 {
     public class Tag : Identifiable
     {
+        [Attr]
         public string Name { get; set; }
     }
 }

Diff for: src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -217,7 +217,7 @@ private List<ResourceObject> IncludeRelationshipChain(
             if(relationship == null)
                 throw new JsonApiException(400, $"{parentEntity.EntityName} does not contain relationship {requestedRelationship}");
 
-            var navigationEntity = _jsonApiContext.ContextGraph.GetRelationship(parentResource, relationship.InternalRelationshipName);
+            var navigationEntity = _jsonApiContext.ContextGraph.GetRelationshipValue(parentResource, relationship);
             if (navigationEntity is IEnumerable hasManyNavigationEntity)
             {
                 foreach (IIdentifiable includedEntity in hasManyNavigationEntity)

Diff for: src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

@@ -1,10 +1,12 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Bogus;
+using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
@@ -24,25 +26,69 @@ public class ManyToManyTests
         private static readonly Faker<Tag> _tagFaker = new Faker<Tag>().RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10));
 
         private TestFixture<TestStartup> _fixture;
-        public ManyToManyTests(TestFixture<TestStartup> fixture) 
+        public ManyToManyTests(TestFixture<TestStartup> fixture)
         {
             _fixture = fixture;
         }
 
         [Fact]
-        public async Task Can_Fetch_Many_To_Many_Through()
+        public async Task Can_Fetch_Many_To_Many_Through_All()
         {
             // arrange
             var context = _fixture.GetService<AppDbContext>();
             var article = _articleFaker.Generate();
             var tag = _tagFaker.Generate();
-            var articleTag = new ArticleTag { 
+
+            context.Articles.RemoveRange(context.Articles);
+            await context.SaveChangesAsync();
+
+            var articleTag = new ArticleTag
+            {
                 Article = article,
                 Tag = tag
             };
             context.ArticleTags.Add(articleTag);
             await context.SaveChangesAsync();
+
+            var route = $"/api/v1/articles?include=tags";
+
+            // act
+            var response = await _fixture.Client.GetAsync(route);
+
+            // assert
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.True(HttpStatusCode.OK == response.StatusCode, $"{route} returned {response.StatusCode} status code with payload: {body}");
+
+            var document = JsonConvert.DeserializeObject<Documents>(body);
+            Assert.NotEmpty(document.Included);
+
+            var articleResponseList = _fixture.GetService<IJsonApiDeSerializer>().DeserializeList<Article>(body);
+            Assert.NotNull(articleResponseList);
 
+            var articleResponse = articleResponseList.FirstOrDefault(a => a.Id == article.Id);
+            Assert.NotNull(articleResponse);
+            Assert.Equal(article.Name, articleResponse.Name);
+
+            var tagResponse = Assert.Single(articleResponse.Tags);
+            Assert.Equal(tag.Id, tagResponse.Id);
+            Assert.Equal(tag.Name, tagResponse.Name);
+        }
+
+        [Fact]
+        public async Task Can_Fetch_Many_To_Many_Through_GetById()
+        {
+            // arrange
+            var context = _fixture.GetService<AppDbContext>();
+            var article = _articleFaker.Generate();
+            var tag = _tagFaker.Generate();
+            var articleTag = new ArticleTag
+            {
+                Article = article,
+                Tag = tag
+            };
+            context.ArticleTags.Add(articleTag);
+            await context.SaveChangesAsync();
+
             var route = $"/api/v1/articles/{article.Id}?include=tags";
 
             // act
@@ -52,12 +98,16 @@ public async Task Can_Fetch_Many_To_Many_Through()
             var body = await response.Content.ReadAsStringAsync();
             Assert.True(HttpStatusCode.OK == response.StatusCode, $"{route} returned {response.StatusCode} status code with payload: {body}");
 
+            var document = JsonConvert.DeserializeObject<Document>(body);
+            Assert.NotEmpty(document.Included);
+
             var articleResponse = _fixture.GetService<IJsonApiDeSerializer>().Deserialize<Article>(body);
             Assert.NotNull(articleResponse);
             Assert.Equal(article.Id, articleResponse.Id);
-            
+
             var tagResponse = Assert.Single(articleResponse.Tags);
             Assert.Equal(tag.Id, tagResponse.Id);
+            Assert.Equal(tag.Name, tagResponse.Name);
         }
 
         [Fact]