Skip to content

Fix roundtrip of Parse/ToString for include query string parameters #1754

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
Aug 6, 2025
Merged

Fix roundtrip of Parse/ToString for include query string parameters #1754

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public override string ToFullString()
private string InnerToString(bool toFullString)
{
IReadOnlyCollection<ResourceFieldChainExpression> chains = IncludeChainConverter.GetRelationshipChains(this);
return string.Join(",", chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).OrderBy(name => name));
return string.Join(",", chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().OrderBy(name => name));
}

public override bool Equals(object? obj)
Expand Down
38 changes: 22 additions & 16 deletions test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,26 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
}

[Theory]
[InlineData("includes", "", "")]
[InlineData("includes", "owner", "owner")]
[InlineData("includes", "posts", "posts")]
[InlineData("includes", "owner.posts", "owner.posts")]
[InlineData("includes", "posts.author", "posts.author")]
[InlineData("includes", "posts.comments", "posts.comments")]
[InlineData("includes", "posts,posts.comments", "posts.comments")]
[InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels")]
[InlineData("includes", "owner.person.children.husband", "owner.person.children.husband,owner.person.children.husband")]
[InlineData("includes", "owner.person.wife,owner.person.husband", "owner.person.husband,owner.person.wife")]
[InlineData("includes", "owner.person.father.children.wife", "owner.person.father.children.wife,owner.person.father.children.wife")]
[InlineData("includes", "owner.person.friends", "owner.person.friends,owner.person.friends")]
[InlineData("includes", "owner.person.friends.friends",
"owner.person.friends.friends,owner.person.friends.friends,owner.person.friends.friends,owner.person.friends.friends")]
public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
[InlineData("includes", "", "", "")]
[InlineData("includes", "owner", "owner", "blogs:owner")]
[InlineData("includes", "posts", "posts", "blogs:posts")]
[InlineData("includes", "owner.posts", "owner.posts", "blogs:owner.webAccounts:posts")]
[InlineData("includes", "posts.author", "posts.author", "blogs:posts.blogPosts:author")]
[InlineData("includes", "posts.comments", "posts.comments", "blogs:posts.blogPosts:comments")]
[InlineData("includes", "posts,posts.comments", "posts.comments", "blogs:posts.blogPosts:comments")]
[InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels", "blogs:posts.blogPosts:comments,blogs:posts.blogPosts:labels")]
[InlineData("includes", "owner.person.children.husband", "owner.person.children.husband",
"blogs:owner.webAccounts:person.men:children.women:husband,blogs:owner.webAccounts:person.women:children.women:husband")]
[InlineData("includes", "owner.person.wife,owner.person.husband", "owner.person.husband,owner.person.wife",
"blogs:owner.webAccounts:person.men:wife,blogs:owner.webAccounts:person.women:husband")]
[InlineData("includes", "owner.person.father.children.wife", "owner.person.father.children.wife",
"blogs:owner.webAccounts:person.men:father.men:children.men:wife,blogs:owner.webAccounts:person.women:father.men:children.men:wife")]
[InlineData("includes", "owner.person.friends", "owner.person.friends",
"blogs:owner.webAccounts:person.men:friends,blogs:owner.webAccounts:person.women:friends")]
[InlineData("includes", "owner.person.friends.friends", "owner.person.friends.friends",
"blogs:owner.webAccounts:person.men:friends.men:friends,blogs:owner.webAccounts:person.men:friends.women:friends," +
"blogs:owner.webAccounts:person.women:friends.men:friends,blogs:owner.webAccounts:person.women:friends.women:friends")]
public void Reader_Read_Succeeds(string parameterName, string parameterValue, string stringExpected, string fullStringExpected)
{
// Act
_reader.Read(parameterName, parameterValue);
Expand All @@ -111,6 +116,7 @@ public void Reader_Read_Succeeds(string parameterName, string parameterValue, st
scope.Should().BeNull();

QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
value.ToString().Should().Be(valueExpected);
value.ToString().Should().Be(stringExpected);
value.ToFullString().Should().Be(fullStringExpected);
}
}
Loading