Merge 70abcd5 into e34709d

Bart Koelman · web-flow · commit 024f1c72dac3 · 2021-05-18T15:54:25.000+02:00
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
@@ -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;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,14 @@ private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFi`
`133`	`133`	`foreach (EagerLoadAttribute eagerLoad in resourceContext.EagerLoads)`
`134`	`134`	`{`
`135`	`135`	`var propertySelector = new PropertySelector(eagerLoad.Property);`
	`136`	`+`
	`137`	`+ // When an entity navigation property is decorated with both EagerLoadAttribute and RelationshipAttribute,`
	`138`	`+ // it may already exist with a sub-layer. So do not overwrite in that case.`
	`139`	`+ if (!propertySelectors.ContainsKey(propertySelector.Property))`
	`140`	`+ {`
	`141`	`+ propertySelectors[propertySelector.Property] = propertySelector;`
	`142`	`+ }`
	`143`	`+`
`136`	`144`	`propertySelectors[propertySelector.Property] = propertySelector;`
`137`	`145`	`}`
`138`	`146`