Skip to content

Commit 19e976b

Browse files
author
Corey Floyd
committed
#218 Defaults data to be included in relationships rather than only when "include" for that relationship is set.
1 parent 906c697 commit 19e976b

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

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

+11-14
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,17 @@ private void AddRelationships(DocumentData data, ContextEntity contextEntity, II
158158
if (r.DocumentLinks.HasFlag(Link.Related))
159159
relationshipData.Links.Related = linkBuilder.GetRelatedRelationLink(contextEntity.EntityName, entity.StringId, r.PublicRelationshipName);
160160
}
161-
162-
if (RelationshipIsIncluded(r.PublicRelationshipName))
163-
{
164-
var navigationEntity = _jsonApiContext.ContextGraph
165-
.GetRelationship(entity, r.InternalRelationshipName);
166-
167-
if (navigationEntity == null)
168-
relationshipData.SingleData = null;
169-
else if (navigationEntity is IEnumerable)
170-
relationshipData.ManyData = GetRelationships((IEnumerable<object>)navigationEntity);
171-
else
172-
relationshipData.SingleData = GetRelationship(navigationEntity);
173-
}
174-
161+
162+
var navigationEntity = _jsonApiContext.ContextGraph
163+
.GetRelationship(entity, r.InternalRelationshipName);
164+
165+
if (navigationEntity == null)
166+
relationshipData.SingleData = null;
167+
else if (navigationEntity is IEnumerable)
168+
relationshipData.ManyData = GetRelationships((IEnumerable<object>)navigationEntity);
169+
else
170+
relationshipData.SingleData = GetRelationship(navigationEntity);
171+
175172
data.Relationships.Add(r.PublicRelationshipName, relationshipData);
176173
});
177174
}

0 commit comments

Comments
 (0)