Backport fix variable value conversion for array of values (#428) (#431)

Author: igdianov

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

@@ -53,6 +53,7 @@
 import graphql.language.StringValue;
 import graphql.language.Value;
 import graphql.language.VariableReference;
+import graphql.schema.Coercing;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLFieldDefinition;
@@ -1507,22 +1508,30 @@ protected Object convertValue(DataFetchingEnvironment environment, Argument argu
                 // Return provided StringValue
                 return ((StringValue) value).getValue();
             }
-        } else if (value instanceof VariableReference) {
+        } else if (value instanceof VariableReference variableReference) {
             Class javaType = getJavaType(environment, argument);
-            Object argumentValue = environment.getVariables().get(VariableReference.class.cast(value).getName());
+            Object argumentValue = environment.getVariables().get(variableReference.getName());
+
             if (javaType.isEnum()) {
-                if (argumentValue instanceof Collection) {
+                if (argumentValue instanceof Collection argumentValues) {
                     List<Enum> values = new ArrayList<>();
 
-                    Collection.class.cast(argumentValue)
-                        .forEach(it -> values.add(Enum.valueOf(javaType, it.toString())));
+                    argumentValues.forEach(it -> values.add(Enum.valueOf(javaType, it.toString())));
+
                     return values;
                 } else {
                     return Enum.valueOf(javaType, argumentValue.toString());
                 }
             } else {
-                // Get resolved variable in environment arguments
-                return argumentValue;
+                Coercing<?, ?> coercing = JavaScalars.of(javaType).getCoercing();
+                Function<Object, Object> valueConverter = it -> javaType.isInstance(it) ? it : coercing.parseValue(it);
+
+                if (argumentValue instanceof Collection<?> argumentValues) {
+                    return argumentValues.stream().map(valueConverter).toList();
+                } else {
+                    // Get resolved variable in environment arguments
+                    return valueConverter.apply(argumentValue);
+                }
             }
         } else if (value instanceof ArrayValue) {
             Collection arrayValue = environment.getArgument(argument.getName());

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

@@ -794,7 +794,7 @@ private Predicate getTypedPredicate(From<?, ?> from, Path<?> field, PredicateFil
         Class<?> type = filter.getJavaType();
         Object value = filter.getValue();
         Set<Criteria> criterias = filter.getCriterias();
-        Attribute attribute = filter.getAttribute();
+        Attribute<?, ?> attribute = filter.getAttribute();
 
         if (value == null) {
             return cb.disjunction();

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

@@ -195,6 +195,25 @@ public void queryForThingByIdViaWhereIN() {
         assertThat(result.toString()).isEqualTo(expected);
     }
 
+    @Test
+    public void queryForThingByIdViaWhereINVariables() {
+        //given:
+
+        String query = "query things($ids: [UUID]!){ Things(where: {id: {IN: $ids}}) { select { id }}}";
+        String expected = "{Things={select=[{id=2d1ebc5b-7d27-4197-9cf0-e84451c5bbb1}]}}";
+
+        //when:
+        Object result = executor
+            .execute(
+                query,
+                Map.of("ids", List.of("2d1ebc5b-7d27-4197-9cf0-e84451c5bbb1", "2d1ebc5b-7d27-4197-9cf0-e84451c5bbb1"))
+            )
+            .getData();
+
+        //then:
+        assertThat(result.toString()).isEqualTo(expected);
+    }
+
     @SuppressWarnings({ "rawtypes", "unchecked", "serial" })
     @Test
     public void queryForThingByIdViaWhereNE() {