Check strings for matching enum variants which can be passed in from …

…variables
jgautheron · Nov 15, 2023 · b932b1e · b932b1e
1 parent 6b8a9b3
commit b932b1e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/crates/planner/tests/enum_variable.txt b/crates/planner/tests/enum_variable.txt
@@ -0,0 +1,19 @@
+query($sortOrder: UserSortOrder!){
+        users(sortOrder: $sortOrder) {
+            id
+            username
+    }
+}
+---
+{
+    "sortOrder": "CREATED_AT"
+}
+---
+{
+    "type": "fetch",
+    "service": "accounts",
+    "variables": {
+        "sortOrder": "CREATED_AT"
+    },
+    "query": "query($sortOrder: UserSortOrder!)\n{ users(sortOrder: $sortOrder) { id username } }"
+}
diff --git a/crates/planner/tests/test.graphql b/crates/planner/tests/test.graphql
@@ -26,6 +26,12 @@ type Query {
     topProducts: [Product!]! @resolve(service: "products")
     node(id: ID!): Node @resolve(service: "accounts")
     reviews(productId: ID!, limit: Int): [Review!]! @resolve(service: "reviews")
+    users(sortOrder: UserSortOrder!): [User!]! @resolve(service: "accounts")
+}
+
+enum UserSortOrder {
+  NAME
+  CREATED_AT
 }
 
 type Mutation {

diff --git a/crates/validation/src/utils.rs b/crates/validation/src/utils.rs
@@ -5,7 +5,7 @@ use std::{
 
 use graphgate_schema::{ComposedSchema, TypeKind};
 use parser::types::{BaseType, Type};
-use value::ConstValue;
+use value::{ConstValue, Name};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum Scope<'a> {
@@ -119,6 +119,18 @@ pub fn is_valid_input_value(
                                 } else {
                                     None
                                 }
+                            } else if let ConstValue::String(v) = value {
+                                if ty.enum_values.contains_key(&Name::new(v)) {
+                                    None
+                                } else {
+                                    Some(valid_error(
+                                        &path_node,
+                                        format!(
+                                            "enumeration type \"{}\" does not contain the value \"{}\"",
+                                            ty.name, value
+                                        )
+                                    ))
+                                }
                             } else {
                                 Some(valid_error(
                                     &path_node,
@@ -178,7 +190,6 @@ pub fn is_valid_input_value(
             }
         }
     }
-
     if !ty.nullable {
         if matches!(value, ConstValue::Null) {
             Some(valid_error(&path_node, format!("expected type \"{}\"", ty)))