speed up pjs_for_champs * 10

app/services/pieces_justificatives_service.rb

@@ -4,16 +4,14 @@ class PiecesJustificativesService
     pjs_commentaires = pjs_for_commentaires(dossier)
     pjs_dossier = pjs_for_dossier(dossier, for_expert)
 
-    (pjs_champs + pjs_commentaires + pjs_dossier)
+    pjs_champs + (pjs_commentaires + pjs_dossier).filter(&:attached?)
-      .filter(&:attached?)
   end
 
   def self.liste_pieces_justificatives(dossier)
     pjs_champs = pjs_for_champs(dossier)
     pjs_commentaires = pjs_for_commentaires(dossier)
 
-    (pjs_champs + pjs_commentaires)
+    pjs_champs + pjs_commentaires.filter(&:attached?)
-      .filter(&:attached?)
   end
 
   def self.pieces_justificatives_total_size(dossier)
@@ -121,15 +119,17 @@ class PiecesJustificativesService
   private
 
   def self.pjs_for_champs(dossier, for_expert = false)
-    allowed_champs = for_expert ? dossier.champs : dossier.champs + dossier.champs_private
+    champs = Champ
+      .joins(:piece_justificative_file_attachment)
+      .where(type: "Champs::PieceJustificativeChamp", dossier: dossier)
 
-    allowed_child_champs = allowed_champs
+    if for_expert
-      .filter { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:repetition) }
+      champs = champs.where(private: false)
-      .flat_map(&:champs)
+    end
 
-    (allowed_champs + allowed_child_champs)
+    ActiveStorage::Attachment
-      .filter { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:piece_justificative) }
+      .includes(:blob)
-      .map(&:piece_justificative_file)
+      .where(record_type: "Champ", record_id: champs.ids)
   end
 
   def self.pjs_for_commentaires(dossier)