fix: Support Enum types in EQ, NE, IN, NIN criteria expressions (#50)

* fix: ignore .classpath

* fix: add support for Enum predicate builder expressions: EQ, NE, IN, NIN

Author: igdianov

.gitignore

@@ -23,3 +23,11 @@ target/
 .springBeans
 
 
+
+graphql-jpa-query-schema/\.classpath
+
+graphql-jpa-query-annotations/\.classpath
+
+graphql-jpa-query-example/\.classpath
+
+graphql-jpa-query-boot-starter/\.classpath

graphql-jpa-query-annotations/.classpath

@@ -24,7 +24,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.From;
@@ -286,6 +285,34 @@ private Predicate getUuidPredicate(Path<UUID> field, PredicateFilter filter) {
         }
         return null;
     }
+    
+    private Predicate getEnumPredicate(Path<? extends Enum> field, PredicateFilter filter) {
+        if (filter.getValue() == null) {
+            return null;
+        }
+        final Predicate arrayPredicate = mayBeArrayValuePredicate(field, filter);
+        
+        if (arrayPredicate != null) {
+            return arrayPredicate;
+        }
+        final Enum<?> compareValue = (Enum<?>) filter.getValue();
+
+        if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
+            return cb.equal(field, compareValue);
+        }
+        if (filter.getCriterias().contains(PredicateFilter.Criteria.IN)) {
+            final CriteriaBuilder.In<Object> in = cb.in(field);
+            return in.value(compareValue);
+        }
+        if (filter.getCriterias().contains(PredicateFilter.Criteria.NIN)) {
+            final CriteriaBuilder.In<Object> in = cb.in(field);
+            return cb.not(in.value(compareValue));
+        }
+        if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
+            return cb.notEqual(field, compareValue);
+        }
+        return null;
+    }    
 
     @SuppressWarnings("unchecked")
     private Predicate getTypedPredicate(From<?,?> from, Path<?> field, PredicateFilter filter) {
@@ -334,6 +361,8 @@ else if (type.equals(UUID.class)) {
         else if(Collection.class.isAssignableFrom(type)) {
             if(field.getModel() == null)
                 return from.join(filter.getField()).in(value);
+        } else if(type.isEnum()) {
+        	return getEnumPredicate((Path<Enum<?>>) field, predicateFilter);
         }
 
         throw new IllegalArgumentException("Unsupported field type " + type + " for field " + predicateFilter.getField());

graphql-jpa-query-boot-starter/.classpath

@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.HashMap;
-import java.util.UUID;
 
 import javax.persistence.EntityManager;
 
@@ -57,10 +56,8 @@ public GraphQLSchemaBuilder graphQLSchemaBuilder(final EntityManager entityManag
 
     }
 
-
     @Autowired
     private GraphQLExecutor executor;
-
 
     @Test
     public void contextLoads() {
@@ -222,6 +219,115 @@ public void queryForElementCollection() {
         assertThat(result.toString()).isEqualTo(expected);
     }
 
+    @Test
+    public void queryForEnumIn() {
+        //given
+        String query = "{ Books(where: {genre: {IN: PLAY}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=5, title=The Cherry Orchard, genre=PLAY}, "
+        		+ "{id=6, title=The Seagull, genre=PLAY}, "
+        		+ "{id=7, title=Three Sisters, genre=PLAY}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+    
+    @Test
+    public void queryForEnumInArray() {
+        //given
+        String query = "{ Books(where: {genre: {IN: [NOVEL, PLAY]}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=2, title=War and Peace, genre=NOVEL}, "
+        		+ "{id=3, title=Anna Karenina, genre=NOVEL}, "
+        		+ "{id=5, title=The Cherry Orchard, genre=PLAY}, "
+        		+ "{id=6, title=The Seagull, genre=PLAY}, "
+        		+ "{id=7, title=Three Sisters, genre=PLAY}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
+    @Test
+    public void queryForEnumNinArray() {
+        //given
+        String query = "{ Books(where: {genre: {NIN: [NOVEL]}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=5, title=The Cherry Orchard, genre=PLAY}, "
+        		+ "{id=6, title=The Seagull, genre=PLAY}, "
+        		+ "{id=7, title=Three Sisters, genre=PLAY}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+    
+    @Test
+    public void queryForEnumEq() {
+        //given
+        String query = "{ Books(where: {genre: {EQ: NOVEL}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=2, title=War and Peace, genre=NOVEL}, "
+        		+ "{id=3, title=Anna Karenina, genre=NOVEL}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
+    @Test
+    public void queryForEnumNe() {
+        //given
+        String query = "{ Books(where: {genre: {NE: PLAY}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=2, title=War and Peace, genre=NOVEL}, "
+        		+ "{id=3, title=Anna Karenina, genre=NOVEL}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+    
+    @Test
+    public void queryForEnumNin() {
+        //given
+        String query = "{ Books(where: {genre: {NIN: PLAY}}) { select { id title, genre } }}";
+        
+        String expected = "{Books={select=["
+        		+ "{id=2, title=War and Peace, genre=NOVEL}, "
+        		+ "{id=3, title=Anna Karenina, genre=NOVEL}"
+        		+ "]}}";
+
+        //when
+        Object result = executor.execute(query).getData();
+
+        // then
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+        
+    
+    
     // https://github.com/introproventures/graphql-jpa-query/issues/30
     @Test
     public void queryForEntityWithMappedSuperclass() {