From 5f16b506f53d32108a2b77de655d0732af94f6ef Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Tue, 10 Mar 2026 08:12:32 +0200
Subject: [PATCH] fix n+1

---
 lib/submissions.rb | 14 +-------------
 lib/submitters.rb  |  1 -
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/submissions.rb b/lib/submissions.rb
index 475f0e83..d8394c5b 100644
--- a/lib/submissions.rb
+++ b/lib/submissions.rb
@@ -3,8 +3,6 @@
 module Submissions
   DEFAULT_SUBMITTERS_ORDER = 'random'
 
-  PRELOAD_ALL_PAGES_AMOUNT = 200
-
   module_function
 
   def search(current_user, submissions, keyword, search_values: false, search_template: false)
@@ -81,19 +79,9 @@ module Submissions
   def preload_with_pages(submission)
     ActiveRecord::Associations::Preloader.new(
       records: submission.schema_documents,
-      associations: [:blob]
+      associations: [:blob, { preview_images_attachments: :blob }]
     ).call
 
-    total_pages =
-      submission.schema_documents.sum { |e| e.metadata.dig('pdf', 'number_of_pages').to_i }
-
-    if total_pages < PRELOAD_ALL_PAGES_AMOUNT
-      ActiveRecord::Associations::Preloader.new(
-        records: submission.schema_documents,
-        associations: [{ preview_images_attachments: :blob }]
-      ).call
-    end
-
     submission
   end
 
diff --git a/lib/submitters.rb b/lib/submitters.rb
index 47fbf014..be0690b1 100644
--- a/lib/submitters.rb
+++ b/lib/submitters.rb
@@ -2,7 +2,6 @@
 
 module Submitters
   TRUE_VALUES = ['1', 'true', true].freeze
-  PRELOAD_ALL_PAGES_AMOUNT = 200
 
   FIELD_NAME_WEIGHTS = {
     'email' => 'A',