Add support for IN/NIN, BETWEEN/NOT_BETWEEN predicates for floating point numbers (#305)

Author: rtmkv

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

@@ -313,7 +313,10 @@ protected Predicate mayBeArrayValuePredicate(Path<?> path, PredicateFilter filte
     }
 
     protected Predicate getFloatingPointPredicate(Path<? extends Number> root, PredicateFilter filter) {
-        if (filter.getValue() != null && filter.getValue() instanceof Number) {
+
+        Predicate arrayValuePredicate = mayBeArrayValuePredicate(root, filter);
+
+        if (arrayValuePredicate == null && filter.getValue() != null && filter.getValue() instanceof Number) {
             if (filter.getCriterias().contains(PredicateFilter.Criteria.LT)) {
                 return cb.lt(root, (Number) filter.getValue());
             }
@@ -332,7 +335,7 @@ protected Predicate getFloatingPointPredicate(Path<? extends Number> root, Predi
             // LE or default
             return cb.le(root, (Number) filter.getValue());
         }
-        return null;
+        return arrayValuePredicate;
     }
 
     protected Predicate getDatePredicate(Path<? extends Date> root, PredicateFilter filter) {

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

@@ -2547,6 +2547,110 @@ public void queryWithOperationName() {
 
         // then
         assertThat(result.toString()).isEqualTo(expected);
-    }    
+    }
+
+    @Test
+    public void queryForFloatingThingViaWhereIn() {
+        //given:
+        String query = "{"
+            + "  FloatingThings("
+            + "    where: {"
+            + "      AND: {"
+            + "        floatValue: {IN: [4.55, 5]}"
+            + "        doubleValue: {IN: [4.55, 5]}"
+            + "        bigDecimalValue: {IN: [4.55, 5]}"
+            + "      }"
+            + "    }"
+            + "  ) {"
+            + "    select {"
+            + "      id"
+            + "    }}"
+            + "}";
+        String expected = "{FloatingThings={select=[{id=1}]}}";
+
+        //when:
+        Object result = executor.execute(query).getData();
+
+        //then:
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
+    @Test
+    public void queryForFloatingThingViaWhereNin() {
+        //given:
+        String query = "{"
+            + "  FloatingThings("
+            + "    where: {"
+            + "      AND: {"
+            + "        floatValue: {NIN: [4.55, 5]}"
+            + "        doubleValue: {NIN: [4.55, 5]}"
+            + "        bigDecimalValue: {NIN: [4.55, 5]}"
+            + "      }"
+            + "    }"
+            + "  ) {"
+            + "    select {"
+            + "      id"
+            + "    }}"
+            + "}";
+        String expected = "{FloatingThings={select=[{id=2}]}}";
+
+        //when:
+        Object result = executor.execute(query).getData();
+
+        //then:
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
+    @Test
+    public void queryForFloatingThingViaWhereBetween() {
+        //given:
+        String query = "{"
+            + "  FloatingThings("
+            + "    where: {"
+            + "      AND: {"
+            + "        floatValue: {BETWEEN: [-1, 0]}"
+            + "        doubleValue: {BETWEEN: [-1, 0]}"
+            + "        bigDecimalValue: {BETWEEN: [-1, 0]}"
+            + "      }"
+            + "    }"
+            + "  ) {"
+            + "    select {"
+            + "      id"
+            + "    }}"
+            + "}";
+        String expected = "{FloatingThings={select=[{id=2}]}}";
+
+        //when:
+        Object result = executor.execute(query).getData();
+
+        //then:
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
+    @Test
+    public void queryForFloatingThingViaWhereNotBetween() {
+        //given:
+        String query = "{"
+            + "  FloatingThings("
+            + "    where: {"
+            + "      AND: {"
+            + "        floatValue: {NOT_BETWEEN: [-1, 0]}"
+            + "        doubleValue: {NOT_BETWEEN: [-1, 0]}"
+            + "        bigDecimalValue: {NOT_BETWEEN: [-1, 0]}"
+            + "      }"
+            + "    }"
+            + "  ) {"
+            + "    select {"
+            + "      id"
+            + "    }}"
+            + "}";
+        String expected = "{FloatingThings={select=[{id=1}]}}";
+
+        //when:
+        Object result = executor.execute(query).getData();
+
+        //then:
+        assertThat(result.toString()).isEqualTo(expected);
+    }
 
 }

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/model/floating/FloatingThing.java

@@ -0,0 +1,20 @@
+package com.introproventures.graphql.jpa.query.schema.model.floating;
+
+import java.math.BigDecimal;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import lombok.Data;
+
+@Data
+@Entity
+public class FloatingThing {
+
+  @Id
+  private Long id;
+
+  float floatValue;
+
+  double doubleValue;
+
+  BigDecimal bigDecimalValue;
+}

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

@@ -159,3 +159,8 @@ insert into Boat (id, country, identification) values
 insert into calculated_entity (id, title, info) values
 	(1, 'title 1', 'inf 1'),
 	(2, 'title 2', 'inf 2');
+
+-- FloatingThing
+insert into floating_thing (id, float_value, double_value, big_decimal_value) values
+    (1, 4.55, 4.55, 4.55),
+    (2, -0.44, -0.44, -0.44)