Skip to content

fix(GH-193): Fixed error in GQL Queries when total or pages is included with condition where: NOT_EXISTS or EXISTS #201

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
igdianov merged 2 commits into from
Oct 6, 2019
Merged

fix(GH-193): Fixed error in GQL Queries when total or pages is included with condition where: NOT_EXISTS or EXISTS #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5558e4b
Merge 1d64f1b9fa6fe410e29fb557e63e84770bf81527 into 2a0138237cb639427…
SinaiNIN Sep 26, 2019
c1e4e9e
fix(GH-193): fixed NPE in count query with EXISTS/NOT_EXISTS criteria
igdianov Oct 6, 2019
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
6 changes: 5 additions & 1 deletion ...n/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,14 @@ private TypedQuery<Long> getCountQuery(DataFetchingEnvironment environment, Fiel
CriteriaQuery<Long> query = cb.createQuery(Long.class);
Root<?> root = query.from(entityType);

DataFetchingEnvironment queryEnvironment = DataFetchingEnvironmentBuilder.newDataFetchingEnvironment(environment)
.root(query)
.build();

query.select(cb.count(root));

List<Predicate> predicates = field.getArguments().stream()
.map(it -> getPredicate(cb, root, null, environment, it))
.map(it -> getPredicate(cb, root, null, queryEnvironment, it))
.filter(it -> it != null)
.collect(Collectors.toList());

Expand Down
80 changes: 77 additions & 3 deletions ...ema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ public void queryForAuthorsWithWhereEXISTSBooksLIKETitle() {
" title: {LIKE: \"War\"}" +
" }" +
" }" +
" }) {" +
" }) {" +
" select {" +
" id" +
" name" +
Expand Down Expand Up @@ -835,8 +835,82 @@ public void queryForAuthorsWithWhereBooksNOTEXISTSAuthorLIKENameLeo() {

// then
assertThat(result.toString()).isEqualTo(expected);
}

}

@Test
public void queryTotalForAuthorsWithWhereEXISTSBooksLIKETitleEmpty() {
//given
String query = "query { "
+ "Authors(where: {" +
" EXISTS: {" +
" books: {" +
" author: {name: {LIKE: \"Anton\"}}" +
" title: {LIKE: \"War\"}" +
" }" +
" }" +
" }) {" +
" total" +
" pages" +
" select {" +
" id" +
" name" +
" books {" +
" id" +
" title" +
" }" +
" }" +
" }"+
"}";

String expected = "{Authors={total=0, pages=0, select=[]}}";

//when
Object result = executor.execute(query).getData();

// then
assertThat(result.toString()).isEqualTo(expected);
}

@Test
public void queryTotalForAuthorsWithWhereBooksNOTEXISTSAuthorLIKENameLeo() {
//given
String query = "query { "
+ " Authors(where: {" +
" books: {" +
" NOT_EXISTS: {" +
" author: {" +
" name: {LIKE: \"Leo\"}" +
" }" +
" }" +
" }" +
" }) {" +
" total" +
" pages" +
" select {" +
" id" +
" name" +
" books {" +
" id" +
" title" +
" }" +
" }" +
" }"+
"}";

String expected = "{Authors={total=3, pages=1, select=["
+ "{id=4, name=Anton Chekhov, books=["
+ "{id=5, title=The Cherry Orchard}, "
+ "{id=6, title=The Seagull}, "
+ "{id=7, title=Three Sisters}]}"
+ "]}}";

//when
Object result = executor.execute(query).getData();

// then
assertThat(result.toString()).isEqualTo(expected);
}

@Test
public void queryForAuthorssWithWhereBooksGenreEquals() {
//given
Expand Down