- handle batchKey with root resolvers only.

tailcallhq · Dec 9, 2024 · 0c55ae2 · 0c55ae2
1 parent bfb5572
commit 0c55ae2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/core/blueprint/operators/http.rs b/src/core/blueprint/operators/http.rs
@@ -14,6 +14,7 @@ pub fn compile_http(
     config_module: &config::ConfigModule,
     http: &config::Http,
     field: &Field,
+    container_type: &str,
 ) -> Valid<IR, BlueprintError> {
     let is_list = field.type_of.is_list();
     let dedupe = http.dedupe.unwrap_or_default();
@@ -26,7 +27,11 @@ pub fn compile_http(
         .when(|| !http.batch_key.is_empty() && http.method != Method::GET)
         .and(
             Valid::<(), BlueprintError>::fail(BlueprintError::BatchKeyListConflict)
-                .when(|| !http.batch_key.is_empty() && is_list)
+                .when(|| {
+                    !http.batch_key.is_empty()
+                        && is_list
+                        && config_module.is_root_operation_type(container_type)
+                })
                 .trace("batchKey"),
         )
         .and(

diff --git a/src/core/blueprint/operators/resolver.rs b/src/core/blueprint/operators/resolver.rs
@@ -18,11 +18,11 @@ pub fn compile_resolver(
     inputs: &CompileResolver,
     resolver: &Resolver,
 ) -> Valid<Option<IR>, BlueprintError> {
-    let CompileResolver { config_module, field, operation_type, object_name } = inputs;
+    let CompileResolver { config_module, field, operation_type, object_name: container_type } = inputs;
 
     match resolver {
         Resolver::Http(http) => {
-            compile_http(config_module, http, field).trace(config::Http::trace_name().as_str())
+            compile_http(config_module, http, field, container_type).trace(config::Http::trace_name().as_str())
         }
         Resolver::Grpc(grpc) => compile_grpc(super::CompileGrpc {
             config_module,
@@ -36,7 +36,7 @@ pub fn compile_resolver(
             compile_graphql(config_module, operation_type, field.type_of.name(), graphql)
                 .trace(config::GraphQL::trace_name().as_str())
         }
-        Resolver::Call(call) => compile_call(config_module, call, operation_type, object_name)
+        Resolver::Call(call) => compile_call(config_module, call, operation_type, container_type)
             .trace(config::Call::trace_name().as_str()),
         Resolver::Js(js) => {
             compile_js(super::CompileJs { js, script: &config_module.extensions().script })