Merge pull request #10899 from mfo/US/fix-n-plus-one-on-instructeur-d…

…emande tech: ETQ instructeur, ma page pour visualiser un dossier se charge plus vite
demarches-simplifiees · Oct 8, 2024 · 29500eb · 29500eb
2 parents c072ee7 + 5cba847
commit 29500eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/dossier_preloader.rb b/app/models/dossier_preloader.rb
@@ -39,7 +39,7 @@ def self.load_one(dossier, pj_template: false)
 
   def revisions(pj_template: false)
     @revisions ||= ProcedureRevision.where(id: @dossiers.pluck(:revision_id).uniq)
-      .includes(types_de_champ_public: [], types_de_champ_private: [], types_de_champ: pj_template ? { piece_justificative_template_attachment: :blob } : [])
+      .includes(revision_types_de_champ: { parent: :type_de_champ }, types_de_champ_public: [], types_de_champ_private: [], types_de_champ: pj_template ? { piece_justificative_template_attachment: :blob } : [])
       .index_by(&:id)
   end
 

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
@@ -526,7 +526,8 @@ def current_section_level(revision)
   end
 
   def level_for_revision(revision)
-    rtdc = revision.revision_types_de_champ.includes(:type_de_champ, parent: :type_de_champ).find { |rtdc| rtdc.stable_id == stable_id }
+    rtdc = revision.revision_types_de_champ.find { |rtdc| rtdc.stable_id == stable_id }
+
     if rtdc.child?
       header_section_level_value.to_i + rtdc.parent.type_de_champ.current_section_level(revision)
     elsif header_section_level_value