fix: reverse query with where enum criteria

Author: igdianov

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/QraphQLJpaBaseDataFetcher.java

@@ -284,7 +284,7 @@ protected Predicate getPredicate(CriteriaBuilder cb, Root<?> from, From<?,?> pat
                     .getArgumentValues(fieldDef.getArguments(), Collections.singletonList(where), variables)
                     .get("where");
 
-                return getWherePredicate(cb, from, join, new WherePredicateEnvironment(environment, arguments), where);
+                return getWherePredicate(cb, from, join, new WherePredicateEnvironment(environment, fieldDef, arguments), where);
             }
         }
     }
@@ -451,15 +451,15 @@ public ArgumentEnvironment(DataFetchingEnvironment environment, String argumentN
 
     class WherePredicateEnvironment extends DataFetchingEnvironmentImpl {
 
-        public WherePredicateEnvironment(DataFetchingEnvironment environment, Map<String, Object> arguments) {
+        public WherePredicateEnvironment(DataFetchingEnvironment environment, GraphQLFieldDefinition fieldDefinition, Map<String, Object> arguments) {
             super(
                 environment.getSource(),
                 arguments,
                 environment.getContext(),
                 environment.getRoot(),
-                environment.getFieldDefinition(),
+                fieldDefinition, 			//environment.getFieldDefinition(),
                 environment.getFields(),
-                environment.getFieldType(),
+                fieldDefinition.getType(), 	//	environment.getFieldType(),
                 environment.getParentType(),
                 environment.getGraphQLSchema(),
                 environment.getFragmentsByName(),

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java

@@ -328,6 +328,22 @@ public void queryForEnumNin() {
         assertThat(result.toString()).isEqualTo(expected);
     }
 
+    @Test
+    public void queryForParentWithEnum() {
+        //given
+        String query = "{ Books { select { id title, author( where: { genre: { EQ: NOVEL } }) { name } } } }";
+        
+        String expected = "{Books={select=["
+        		+ "{id=2, title=War and Peace, author={name=Leo Tolstoy}}, "
+        		+ "{id=3, title=Anna Karenina, author={name=Leo Tolstoy}}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
 
 
     // https://github.com/introproventures/graphql-jpa-query/issues/30

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/model/book/Author.java

@@ -24,6 +24,8 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
@@ -53,4 +55,6 @@ public class Author {
 	@Column(name = "phone_number")
 	private Set<String> phoneNumbers = new HashSet<>();	
 
+	@Enumerated(EnumType.STRING)
+    Genre genre;	
 }

graphql-jpa-query-schema/src/test/resources/data.sql

@@ -107,10 +107,10 @@ insert into thing (id, type) values
     ('2D1EBC5B7D2741979CF0E84451C5BBB1', 'Thing1');
 
 -- Books
-insert into author (id, name) values (1, 'Leo Tolstoy');
+insert into author (id, name, genre) values (1, 'Leo Tolstoy', 'NOVEL');
 insert into book (id, title, author_id, genre) values (2, 'War and Peace', 1, 'NOVEL');
 insert into book (id, title, author_id, genre) values (3, 'Anna Karenina', 1, 'NOVEL');
-insert into author (id, name) values (4, 'Anton Chekhov');
+insert into author (id, name, genre) values (4, 'Anton Chekhov', 'PLAY');
 insert into book (id, title, author_id, genre) values (5, 'The Cherry Orchard', 4, 'PLAY');
 insert into book (id, title, author_id, genre) values (6, 'The Seagull', 4, 'PLAY');
 insert into book (id, title, author_id, genre) values (7, 'Three Sisters', 4, 'PLAY');