feat: support nested relationships in where criteria expressions

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/Author.java

@@ -16,7 +16,7 @@
 
 package com.introproventures.graphql.jpa.query.example.books;
 
-import java.util.Collection;
+import java.util.Set;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -34,5 +34,5 @@ public class Author {
 	String name;
 
 	@OneToMany(mappedBy="author", fetch=FetchType.LAZY)
-	Collection<Book> books;
+	Set<Book> books;
 }

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/Book.java

@@ -23,18 +23,16 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreFilter;
-import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreOrder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
 @Entity
+@EqualsAndHashCode(exclude="author")
 public class Book {
 	@Id
 	Long id;
 
-	@GraphQLIgnoreOrder
-	@GraphQLIgnoreFilter
 	String title;
 
 	@ManyToOne(fetch=FetchType.LAZY)

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/Droid.java

@@ -17,6 +17,9 @@
 package com.introproventures.graphql.jpa.query.example.starwars;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
 
@@ -30,6 +33,8 @@
 public class Droid extends Character {
 
     @GraphQLDescription("Documents the primary purpose this droid serves")
-    String primaryFunction;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "primary_function")
+    DroidFunction primaryFunction;
 
 }

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/DroidFunction.java

@@ -0,0 +1,27 @@
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Entity(name = "droidFunction")
+@Table(name = "droid_function")
+@GraphQLDescription("Represents the functions a droid can have")
+@Data
+@EqualsAndHashCode()
+public class DroidFunction {
+
+    @Id
+    @GraphQLDescription("Primary Key for the DroidFunction Class")
+    String id;
+
+    String function;
+
+
+
+}

graphql-jpa-query-example-merge/src/main/resources/starwars.sql

@@ -4,10 +4,15 @@ insert into CodeList (id, type, code, description, sequence, active, parent_id)
   (0, 'org.crygier.graphql.model.starwars.Gender', 'Male', 'Male', 1, true, null),
   (1, 'org.crygier.graphql.model.starwars.Gender', 'Female', 'Female', 2, true, null);
 
+-- Insert Droid Functions
+insert into droid_function(id, function) values
+( '1000', 'Protocol'),
+( '1001', 'Astromech');
+
 -- Insert Droids
-insert into Character (id, name, primaryFunction, dtype) values
-    ('2000', 'C-3PO', 'Protocol', 'Droid'),
-    ('2001', 'R2-D2', 'Astromech', 'Droid');
+insert into character (id, name, primary_function, dtype) values
+    ('2000', 'C-3PO', '1000', 'Droid'),
+    ('2001', 'R2-D2', '1001', 'Droid');
 
 -- Insert Humans
 insert into character (id, name, homePlanet, favorite_droid_id, dtype, gender_code_id) values

graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/Droid.java

@@ -17,9 +17,11 @@
 package com.introproventures.graphql.jpa.query.example.starwars;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +31,13 @@
 @EqualsAndHashCode(callSuper=true)
 public class Droid extends Character {
 
-    @GraphQLDescription("Documents the primary purpose this droid serves")
-    String primaryFunction;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "primary_function")
+    DroidFunction primaryFunction;
 
+    //description moved to getter to test it gets picked up
+    @GraphQLDescription("Documents the primary purpose this droid serves")
+    public DroidFunction getPrimaryFunction() {
+        return(primaryFunction);
+    }
 }

graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/DroidFunction.java

@@ -0,0 +1,27 @@
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Entity(name = "droidFunction")
+@Table(name = "droid_function")
+@GraphQLDescription("Represents the functions a droid can have")
+@Data
+@EqualsAndHashCode()
+public class DroidFunction {
+
+    @Id
+    @GraphQLDescription("Primary Key for the DroidFunction Class")
+    String id;
+
+    String function;
+
+
+
+}

graphql-jpa-query-example/src/main/resources/data.sql

@@ -1,104 +1,109 @@
--- Insert Code Lists
-insert into code_list (id, type, code, description, sequence, active, parent_id) values 
-  (0, 'org.crygier.graphql.model.starwars.Gender', 'Male', 'Male', 1, true, null),
-  (1, 'org.crygier.graphql.model.starwars.Gender', 'Female', 'Female', 2, true, null);
-
--- Insert Droids
-insert into character (id, name, primary_function, dtype) values
-    ('2000', 'C-3PO', 'Protocol', 'Droid'),
-    ('2001', 'R2-D2', 'Astromech', 'Droid');
-
--- Insert Humans
-insert into character (id, name, home_planet, favorite_droid_id, dtype, gender_code_id) values
-    ('1000', 'Luke Skywalker', 'Tatooine', '2000', 'Human', 0),
-    ('1001', 'Darth Vader', 'Tatooine', '2001', 'Human', 0),
-    ('1002', 'Han Solo', NULL, NULL, 'Human', 0),
-    ('1003', 'Leia Organa', 'Alderaan', NULL, 'Human', 1),
-    ('1004', 'Wilhuff Tarkin', NULL, NULL, 'Human', 0);
-
--- Luke's friends
-insert into character_friends (source_id, friend_id) values
-    ('1000', '1002'),
-    ('1000', '1003'),
-    ('1000', '2000'),
-    ('1000', '2001');
-
--- Luke Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('1000', 3),
-    ('1000', 4),
-    ('1000', 5),
-    ('1000', 6);
-
--- Vader's friends
-insert into character_friends (source_id, friend_id) values
-    ('1001', '1004');
-
--- Vader Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('1001', 3),
-    ('1001', 4),
-    ('1001', 5);
-
--- Solo's friends
-insert into character_friends (source_id, friend_id) values
-    ('1002', '1000'),
-    ('1002', '1003'),
-    ('1002', '2001');
-
--- Solo Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('1002', 3),
-    ('1002', 4),
-    ('1002', 5),
-    ('1002', 6);
-
--- Leia's friends
-insert into character_friends (source_id, friend_id) values
-    ('1003', '1000'),
-    ('1003', '1002'),
-    ('1003', '2000'),
-    ('1003', '2001');
-
--- Leia Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('1003', 3),
-    ('1003', 4),
-    ('1003', 5),
-    ('1003', 6);
-
--- Wilhuff's friends
-insert into character_friends (source_id, friend_id) values
-    ('1004', '1001');
-
--- Wilhuff Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('1004', 3);
-
--- C3PO's friends
-insert into character_friends (source_id, friend_id) values
-    ('2000', '1000'),
-    ('2000', '1002'),
-    ('2000', '1003'),
-    ('2000', '2001');
-
--- C3PO Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('2000', 3),
-    ('2000', 4),
-    ('2000', 5),
-    ('2000', 6);
-
--- R2's friends
-insert into character_friends (source_id, friend_id) values
-    ('2001', '1000'),
-    ('2001', '1002'),
-    ('2001', '1003');
-
--- R2 Appears in
-insert into character_appears_in (character_id, appears_in) values
-    ('2001', 3),
-    ('2001', 4),
-    ('2001', 5),
-    ('2001', 6);
-
+-- Insert Code Lists
+insert into code_list (id, type, code, description, sequence, active, parent_id) values 
+  (0, 'org.crygier.graphql.model.starwars.Gender', 'Male', 'Male', 1, true, null),
+  (1, 'org.crygier.graphql.model.starwars.Gender', 'Female', 'Female', 2, true, null);
+
+-- Insert Droid Functions
+insert into droid_function(id, function) values
+( '1000', 'Protocol'),
+( '1001', 'Astromech');
+
+-- Insert Droids
+insert into character (id, name, primary_function, dtype) values
+    ('2000', 'C-3PO', '1000', 'Droid'),
+    ('2001', 'R2-D2', '1001', 'Droid');
+
+-- Insert Humans
+insert into character (id, name, home_planet, favorite_droid_id, dtype, gender_code_id) values
+    ('1000', 'Luke Skywalker', 'Tatooine', '2000', 'Human', 0),
+    ('1001', 'Darth Vader', 'Tatooine', '2001', 'Human', 0),
+    ('1002', 'Han Solo', NULL, NULL, 'Human', 0),
+    ('1003', 'Leia Organa', 'Alderaan', NULL, 'Human', 1),
+    ('1004', 'Wilhuff Tarkin', NULL, NULL, 'Human', 0);
+
+-- Luke's friends
+insert into character_friends (source_id, friend_id) values
+    ('1000', '1002'),
+    ('1000', '1003'),
+    ('1000', '2000'),
+    ('1000', '2001');
+
+-- Luke Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('1000', 3),
+    ('1000', 4),
+    ('1000', 5),
+    ('1000', 6);
+
+-- Vader's friends
+insert into character_friends (source_id, friend_id) values
+    ('1001', '1004');
+
+-- Vader Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('1001', 3),
+    ('1001', 4),
+    ('1001', 5);
+
+-- Solo's friends
+insert into character_friends (source_id, friend_id) values
+    ('1002', '1000'),
+    ('1002', '1003'),
+    ('1002', '2001');
+
+-- Solo Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('1002', 3),
+    ('1002', 4),
+    ('1002', 5),
+    ('1002', 6);
+
+-- Leia's friends
+insert into character_friends (source_id, friend_id) values
+    ('1003', '1000'),
+    ('1003', '1002'),
+    ('1003', '2000'),
+    ('1003', '2001');
+
+-- Leia Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('1003', 3),
+    ('1003', 4),
+    ('1003', 5),
+    ('1003', 6);
+
+-- Wilhuff's friends
+insert into character_friends (source_id, friend_id) values
+    ('1004', '1001');
+
+-- Wilhuff Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('1004', 3);
+
+-- C3PO's friends
+insert into character_friends (source_id, friend_id) values
+    ('2000', '1000'),
+    ('2000', '1002'),
+    ('2000', '1003'),
+    ('2000', '2001');
+
+-- C3PO Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('2000', 3),
+    ('2000', 4),
+    ('2000', 5),
+    ('2000', 6);
+
+-- R2's friends
+insert into character_friends (source_id, friend_id) values
+    ('2001', '1000'),
+    ('2001', '1002'),
+    ('2001', '1003');
+
+-- R2 Appears in
+insert into character_appears_in (character_id, appears_in) values
+    ('2001', 3),
+    ('2001', 4),
+    ('2001', 5),
+    ('2001', 6);
+

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

@@ -136,7 +136,7 @@ protected TypedQuery<?> getQuery(DataFetchingEnvironment environment, Field fiel
         // optionally add default ordering 
         mayBeAddDefaultOrderBy(query, join, cb);
 
-        return entityManager.createQuery(query.distinct(true));
+        return entityManager.createQuery(query.distinct(isDistinct));
 
     }