Merge pull request #5400 from rmosolgo/dataloader-batch-integration

Support dataloader calls after batched lazy resolve

Author: rmosolgo

lib/graphql/execution/interpreter/resolve.rb

@@ -23,9 +23,9 @@ def self.resolve_each_depth(lazies_at_depth, dataloader)
           if smallest_depth
             lazies = lazies_at_depth.delete(smallest_depth)
             if !lazies.empty?
-              dataloader.append_job {
-                lazies.each(&:value) # resolve these Lazy instances
-              }
+              lazies.each do |l|
+                dataloader.append_job { l.value }
+              end
               # Run lazies _and_ dataloader, see if more are enqueued
               dataloader.run
               resolve_each_depth(lazies_at_depth, dataloader)

spec/graphql/dataloader_spec.rb

@@ -182,6 +182,14 @@ def slow_ingredients
       end
     end
 
+    class Cookbook < GraphQL::Schema::Object
+      field :featured_recipe, Recipe
+
+      def featured_recipe
+        -> { Database.mget([object[:featured_recipe]]).first }
+      end
+    end
+
     class Query < GraphQL::Schema::Object
       field :recipes, [Recipe], null: false
 
@@ -357,11 +365,19 @@ class LookaheadInput < GraphQL::Schema::InputObject
         argument :input, LookaheadInput
       end
 
-
       def lookahead_ingredient(input:, lookahead:)
         lookahead.arguments # forces a dataloader.run_isolated call
         dataloader.with(CustomBatchKeySource, input[:batch_key]).load(input[:id])
       end
+
+      field :cookbooks, [Cookbook]
+
+      def cookbooks
+        [
+          { featured_recipe: "5" },
+          { featured_recipe: "6" },
+        ]
+      end
     end
 
     query(Query)
@@ -434,6 +450,7 @@ def self.resolve_type(type, obj, ctx)
 
     orphan_types(Grain, Dairy, Recipe, LeaveningAgent)
     use GraphQL::Dataloader
+    lazy_resolve Proc, :call
 
     class FieldTestError < StandardError; end
 
@@ -919,6 +936,14 @@ def self.included(child_class)
           assert_equal 1, context[:batched_calls_counter].count
         end
 
+        it "batches nested object calls in .authorized? after using lazy_resolve" do
+          query_str = "{ cookbooks { featuredRecipe { name } } }"
+          context = { batched_calls_counter: BatchedCallsCounter.new }
+          result = schema.execute(query_str, context: context)
+          refute result.key?("errors")
+          assert_equal 1, context[:batched_calls_counter].count
+        end
+
         it "works when passing nil into source" do
           query_str = <<-GRAPHQL
           query($id: ID) {