Skip to content

Fixes error when using EagerLoad on a relationship #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2021
Merged

Fixes error when using EagerLoad on a relationship #1000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFi
foreach (EagerLoadAttribute eagerLoad in resourceContext.EagerLoads)
{
var propertySelector = new PropertySelector(eagerLoad.Property);

// When an entity navigation property is decorated with both EagerLoadAttribute and RelationshipAttribute,
// it may already exist with a sub-layer. So do not overwrite in that case.
if (!propertySelectors.ContainsKey(propertySelector.Property))
{
propertySelectors[propertySelector.Property] = propertySelector;
}

propertySelectors[propertySelector.Property] = propertySelector;
}

Expand Down