Commit 84106ac

authored

Merge pull request #1162 from json-api-dotnet/fix-definition-sort-in-type-hierarchy

Fixed crash in sort lambda from generic resource definition

2 parents 9af5eda + 174a599 commit 84106acCopy full SHA for 84106ac

File tree

-7

lines changed

src/JsonApiDotNetCore/Resources
- SortExpressionLambdaConverter.cs
test/JsonApiDotNetCoreTests/UnitTests/ResourceDefinitions
- CreateSortExpressionFromLambdaTests.cs

-7

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,12 +114,9 @@ private static (Expression? innerExpression, bool isCount) TryReadCount(Expressi`
`114`	`114`
`115`	`115`	`private Expression? ReadAttribute(Expression expression)`
`116`	`116`	`{`
`117`		`- if (expression is MemberExpression memberExpression)`
	`117`	`+ if (expression is MemberExpression {Expression:{}}memberExpression)`
`118`	`118`	`{`
`119`		`- ResourceType resourceType = memberExpression.Member.Name == nameof(Identifiable<object>.Id) && memberExpression.Expression != null`
`120`		`- ? _resourceGraph.GetResourceType(memberExpression.Expression.Type)`
`121`		`- : _resourceGraph.GetResourceType(memberExpression.Member.DeclaringType!);`
`122`		`-`
	`119`	`+ ResourceType resourceType = _resourceGraph.GetResourceType(memberExpression.Expression.Type);`
`123`	`120`	`AttrAttribute? attribute = resourceType.FindAttributeByPropertyName(memberExpression.Member.Name);`
`124`	`121`
`125`	`122`	`if (attribute != null)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void Can_convert_chain_of_ToOne_relationships_ending_in_attribute()`
`37`	`37`	`string[] expected =`
`38`	`38`	`{`
`39`	`39`	`"-fileEntries:content",`
`40`		`- "fileSystemEntries:name",`
	`40`	`+ "fileEntries:name",`
`41`	`41`	`"fileEntries:length",`
`42`	`42`	`"fileSystemEntries:parent.fileSystemEntries:name",`
`43`	`43`	`"fileSystemEntries:parent.fileSystemEntries:parent.fileSystemEntries:name"`
`@@ -103,7 +103,7 @@ public void Can_convert_chain_with_conversion_to_derived_types()`
`103`	`103`	`"fileSystemEntries:parent.fileEntries:content",`
`104`	`104`	`"count(directoryEntries:subdirectories)",`
`105`	`105`	`"count(fileSystemEntries:parent.directoryEntries:files)",`
`106`		`- "-fileSystemEntries:name"`
	`106`	`+ "-directoryEntries:name"`
`107`	`107`	`};`
`108`	`108`
`109`	`109`	`expression.ToFullString().Should().Be(string.Join(',', expected));`

Comments

(0)