Skip to content

fix: correct element collection fetch sort order #149

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 2 commits into from
Jun 9, 2019
Merged

fix: correct element collection fetch sort order #149

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
927f484
fix: correct element collection fetch sort order
igdianov Jun 9, 2019
75f4fee
fix: remove @Ignore from queryOrderByFieldsNested
igdianov Jun 9, 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
7 changes: 4 additions & 3 deletions ...src/main/java/com/introproventures/graphql/jpa/query/schema/impl/JpaPredicateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Fetch;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.metamodel.EntityType;
Expand Down Expand Up @@ -420,15 +420,16 @@ else if(Collection.class.isAssignableFrom(type)) {
|| EntityType.class.isInstance(from.getModel())) {
From<?,?> join = null;

for(Fetch<?,?> fetch: from.getFetches()) {
for(Join<?,?> fetch: from.getJoins()) {
if(fetch.getAttribute().getName().equals(filter.getField()))
join = (From<?,?>) fetch;
}

if(join == null) {
join = (From<?,?>) from.fetch(filter.getField());
join = (From<?,?>) from.join(filter.getField());
}


Predicate in = join.in(value);

if(filter.getCriterias().contains(PredicateFilter.Criteria.NIN))
Expand Down
59 changes: 50 additions & 9 deletions ...c/test/java/com/introproventures/graphql/jpa/query/schema/StarwarsQueryExecutorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,9 @@ public void queryByCollectionOfEnumsAtRootLevel() {


String expected = "{Humans={select=["
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}"
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}"
+ "]}}";

//when:
Expand Down Expand Up @@ -684,6 +684,47 @@ public void queryWithWhereInsideOneToManyRelationsNotExisting() {

@Test
public void queryWithWhereInsideCompositeRelationsAndCollectionFiltering() {
//given:
String query = "query {" +
" Characters(where: {\n" +
" friends: {appearsIn: {IN: A_NEW_HOPE}}\n" +
" }) {\n" +
" select {\n" +
" id\n" +
" name\n" +
" appearsIn\n" +
" friends(where: {name: {LIKE: \"Leia\"}}) {\n" +
" id\n" +
" name\n" +
" }\n" +
" }\n" +
" }\n" +
"}";

String expected = "{Characters={select=["
+ "{id=1000, name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=["
+ "{id=1003, name=Leia Organa}"
+ "]}, "
+ "{id=1002, name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=["
+ "{id=1003, name=Leia Organa}"
+ "]}, "
+ "{id=2000, name=C-3PO, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=["
+ "{id=1003, name=Leia Organa}"
+ "]}, "
+ "{id=2001, name=R2-D2, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=["
+ "{id=1003, name=Leia Organa}"
+ "]}"
+ "]}}";

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

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

@Test
public void queryWithWhereInsideCompositeRelationsAndCollectionFiltering2() {
//given:
String query = "query {" +
" Humans(where: {" +
Expand Down Expand Up @@ -1167,11 +1208,11 @@ public void queryWithNestedWhereSearchCriteriaShouldFetchElementCollectionsAttri
"}";

String expected = "{Characters={select=["
+ "{id=1000, name=Luke Skywalker, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{id=1002, name=Han Solo, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{id=1003, name=Leia Organa, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{id=2000, name=C-3PO, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}, "
+ "{id=2001, name=R2-D2, appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]}"
+ "{id=1000, name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{id=1002, name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{id=1003, name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{id=2000, name=C-3PO, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}, "
+ "{id=2001, name=R2-D2, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]}"
+ "]}}";

//when:
Expand Down Expand Up @@ -1207,7 +1248,7 @@ public void queryWithNestedWhereCompoundSearchCriteriaShouldFetchElementCollecti
+ "name=Luke Skywalker, "
+ "homePlanet=Tatooine, "
+ "favoriteDroid={name=C-3PO}, "
+ "appearsIn=[A_NEW_HOPE, THE_FORCE_AWAKENS, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI]"
+ "appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS]"
+ "}]}}";

//when:
Expand Down