Extract executing batch counting

lib/api/projects.rb

@@ -93,7 +93,12 @@ module API
         )
         options[:with] = Entities::BasicProjectDetails if params[:simple]
 
-        present options[:with].prepare_relation(projects, options), options
+        projects = options[:with].prepare_relation(projects, options)
+
+        # Refresh count caches
+        options[:with].execute_batch_counting(projects)
+
+        present projects, options
       end
 
       def translate_params_for_compatibility(params)

lib/api/projects_relation_builder.rb

@@ -5,10 +5,9 @@ module API
     extend ActiveSupport::Concern
 
     class_methods do
+      # Prepare the given projects relation, e.g. perform preloading.
       def prepare_relation(projects_relation, options = {})
-        projects_relation = preload_relation(projects_relation, options)
-        execute_batch_counting(projects_relation)
-        projects_relation
+        preload_relation(projects_relation, options)
       end
 
       def preload_relation(projects_relation, options = {})