Merge and replace multiple preloads ourselves

Signed-off-by: Jordan Hollinger <[email protected]>
procore-oss · May 14, 2024 · 4eefeaf · 4eefeaf
1 parent 493f1d8
commit 4eefeaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/blueprinter-activerecord/preloader.rb b/lib/blueprinter-activerecord/preloader.rb
@@ -41,8 +41,9 @@ def pre_render(object, blueprint, view, options)
         if object.preload_blueprint_method || auto || auto_proc&.call(object, blueprint, view, options) == true
           object.before_preload_blueprint = extract_preloads object
           blueprint_preloads = self.class.preloads(blueprint, view, object.model)
+          unified_preloads = merge_values([*object.values[use], blueprint_preloads])
           loader = object.preload_blueprint_method || use
-          object.public_send(loader, blueprint_preloads)
+          object.except(loader).public_send(loader, unified_preloads)
         else
           object
         end

diff --git a/lib/blueprinter-activerecord/query_methods.rb b/lib/blueprinter-activerecord/query_methods.rb
@@ -43,8 +43,9 @@ def preload_blueprint!(blueprint = nil, view = :default, use: :preload)
 
       if blueprint and view
         # preload right now
-        preloads = Preloader.preloads(blueprint, view, model)
-        public_send(use, preloads)
+        blueprint_preloads = Preloader.preloads(blueprint, view, model)
+        unified_preloads = Helpers.merge_values([*values[use], blueprint_preloads])
+        except(use).public_send(use, unified_preloads)
       else
         # preload during render
         @values[:preload_blueprint_method] = use