8000 fix issue with isAny on root by hernangm · Pull Request #437 · EntityGraphQL/EntityGraphQL · GitHub
[go: up one dir, main page]
Skip to content

fix issue with isAny on root #437

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
lukemurray merged 1 commit into from
Dec 11, 2024
Merged

fix issue with isAny on root #437

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
10 changes: 7 additions & 3 deletions src/EntityGraphQL/Compiler/EntityQuery/DefaultMethodProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,18 @@ private static Expression MakeIsAnyMethod(Expression context, Expression argCont
ExpectArgsCount(1, args, methodName);
var array = args.First();
var arrayType = array.Type.GetEnumerableOrArrayType() ?? throw new EntityGraphQLCompilerException("Could not get element type from enumerable/array");

var isQueryable = typeof(IQueryable).IsAssignableFrom(array.Type);
if (context.Type.IsNullableType())
{
var call = ExpressionUtil.MakeCallOnQueryable(nameof(Enumerable.Contains), [arrayType], array, Expression.Convert(context, arrayType));
var call = isQueryable ?
ExpressionUtil.MakeCallOnQueryable(nameof(Enumerable.Contains), [arrayType], array, Expression.Convert(context, arrayType)) :
ExpressionUtil.MakeCallOnEnumerable(nameof(Enumerable.Contains), [arrayType], array, Expression.Convert(context, arrayType));
return Expression.Condition(Expression.Equal(context, Expression.Constant(null, context.Type)), Expression.Constant(false), call);
}

return ExpressionUtil.MakeCallOnQueryable(nameof(Enumerable.Contains), [arrayType], array, context);
return isQueryable ?
ExpressionUtil.MakeCallOnQueryable(nameof(Enumerable.Contains), [arrayType], array, Expression.Convert(context, arrayType)) :
ExpressionUtil.MakeCallOnEnumerable(nameof(Enumerable.Contains), [arrayType], array, Expression.Convert(context, arrayType));
}

private static Expression MakeStringContainsMethod(Expression context, Expression argContext, string methodName, Expression[] args) =>
Expand Down
24 changes: 24 additions & 0 deletions src/tests/EntityGraphQL.Tests/EntityQuery/FilterExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,30 @@ public void SupportUseFilterWithnotEqualStatement()
Assert.Equal("2", user.field2);
}

[Fact]
public void SupportUseFilterWithAnyStatement()
{
var schemaProvider = SchemaBuilder.FromObject<TestDataContext>();
schemaProvider.Query().ReplaceField("users", new { filter = EntityQuery<User>() }, (ctx, p) => ctx.Users.WhereWhen(p.filter, p.filter.HasValue), "Return filtered users");
var gql = new QueryRequest
{
Query =
@"query {
users(filter: ""id.isAny([1,5])"") { id field2 }
}",
};
var context = new TestDataContext().FillWithTestData();
context.Users.Add(new User { Id = 1 });
context.Users.Add(new User { Id = 5 });
context.Users.Add(new User { Id = 10 });
var tree = schemaProvider.ExecuteRequestWithContext(gql, context, null, null);
Assert.Null(tree.Errors);
dynamic users = ((IDictionary<string, object>)tree.Data!)["users"];
Assert.Equal(2, Enumerable.Count(users));
var user = Enumerable.First(users);
Assert.Equal(1, user.id);
}

[Fact]
public void SupportUseFilterOnNonRoot()
{
Expand Down
0