fix: query on nodes with the same type

MedHeikelBouzayene · Nov 1, 2024 · a8c89d8 · a8c89d8
1 parent 2f64c1d
commit a8c89d8
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 16 deletions.
diff --git a/src/core/blueprint/operators/graphql.rs b/src/core/blueprint/operators/graphql.rs
@@ -26,24 +26,28 @@ fn create_related_fields(
         for (name, field) in &type_.fields {
             let mut new_type_names = type_names.clone();
             new_type_names.pop_front();
+            let bool_self = field.type_of.name() == new_type_names.back()?;
             new_type_names.push_back(field.type_of.name().to_string());
             if !field.has_resolver() {
-                if let Some(modify) = &field.modify {
-                    if let Some(modified_name) = &modify.name {
-                        map.insert(
-                            modified_name.clone(),
-                            (
-                                name.clone(),
-                                create_related_fields(config, new_type_names, visited)?,
-                            ),
-                        );
-                    }
+                let used_name = match &field.modify {
+                    Some(modify) => match &modify.name {
+                        Some(modified_name) => Some(modified_name),
+                        _ => None,
+                    },
+                    _ => Some(name),
+                };
+                if bool_self {
+                    map.insert(
+                        used_name?.to_string(),
+                        (name.clone(), RelatedFields(HashMap::new()), true),
+                    );
                 } else {
                     map.insert(
-                        name.clone(),
+                        used_name?.to_string(),
                         (
                             name.clone(),
                             create_related_fields(config, new_type_names, visited)?,
+                            false,
                         ),
                     );
                 }

diff --git a/src/core/ir/eval_context.rs b/src/core/ir/eval_context.rs
@@ -130,8 +130,12 @@ fn format_selection_set<'a>(
     let set = selection_set
         .filter_map(|field| {
             // add to set only related fields that should be resolved with current resolver
-            related_fields.get(field.name()).map(|related_fields| {
-                format_selection_field(field, &related_fields.0, &related_fields.1)
+            related_fields.get(field.name()).map(|new_related_fields| {
+                if new_related_fields.2 {
+                    format_selection_field(field, &new_related_fields.0, related_fields)
+                } else {
+                    format_selection_field(field, &new_related_fields.0, &new_related_fields.1)
+                }
             })
         })
         .collect::<Vec<_>>();

diff --git a/src/core/ir/mod.rs b/src/core/ir/mod.rs
@@ -21,10 +21,10 @@ pub use resolver_context_like::{
 /// resolver i.e. fields that don't have their own resolver and are resolved by
 /// the ancestor
 #[derive(Debug, Default, Clone)]
-pub struct RelatedFields(pub HashMap<String, (String, RelatedFields)>);
+pub struct RelatedFields(pub HashMap<String, (String, RelatedFields, bool)>);
 
 impl Deref for RelatedFields {
-    type Target = HashMap<String, (String, RelatedFields)>;
+    type Target = HashMap<String, (String, RelatedFields, bool)>;
 
     fn deref(&self) -> &Self::Target {
         &self.0

diff --git a/tests/core/snapshots/graphql-conformance-019.md_0.snap b/tests/core/snapshots/graphql-conformance-019.md_0.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/core/spec.rs
 expression: response
+snapshot_kind: text
 ---
 {
   "status": 200,
@@ -16,6 +17,9 @@ expression: response
         },
         "nodeC": {
           "name": "nodeC"
+        },
+        "child": {
+          "name": "nodeA"
         }
       }
     }

diff --git a/tests/core/snapshots/graphql-conformance-019.md_client.snap b/tests/core/snapshots/graphql-conformance-019.md_client.snap
@@ -1,8 +1,10 @@
 ---
 source: tests/core/spec.rs
 expression: formatted
+snapshot_kind: text
 ---
 type NodeA {
+  child: NodeA
   name: String
   nodeB: NodeB
   nodeC: NodeC

diff --git a/tests/core/snapshots/graphql-conformance-019.md_merged.snap b/tests/core/snapshots/graphql-conformance-019.md_merged.snap
@@ -1,13 +1,15 @@
 ---
 source: tests/core/spec.rs
 expression: formatter
+snapshot_kind: text
 ---
 schema @server(hostname: "0.0.0.0", port: 8000) @upstream {
   query: Query
 }
 
 type NodeA {
   name: String
+  nodeA: NodeA @modify(name: "child")
   nodeB: NodeB
   nodeC: NodeC
 }

diff --git a/tests/execution/graphql-conformance-019.md b/tests/execution/graphql-conformance-019.md
@@ -13,6 +13,7 @@ type NodeA {
   name: String
   nodeB: NodeB
   nodeC: NodeC
+  nodeA: NodeA @modify(name: "child")
 }
 
 type NodeB {
@@ -32,7 +33,7 @@ type NodeC {
 - request:
     method: POST
     url: http://upstream/graphql
-    textBody: '{ "query": "query { nodeA { name nodeB { name } nodeC { name } } }" }'
+    textBody: '{ "query": "query { nodeA { name nodeB { name } nodeC { name } nodeA { name } } }" }'
   expectedHits: 1
   response:
     status: 200
@@ -44,6 +45,8 @@ type NodeC {
             name: nodeB
           nodeC:
             name: nodeC
+          nodeA:
+            name: nodeA
 ```
 
 ```yml @test
@@ -60,6 +63,9 @@ type NodeC {
           nodeC {
            name
          }
+         child {
+           name
+         }
         }
       }
 ```