Merge pull request demarches-simplifiees#9960 from mfo/US/refactor-li…

…ste_documents tech(PiecesJustificativesService): amélioration du services qui liste les fichiers pour les exports/dossiers
adullact · Feb 16, 2024 · 0b3a0d5 · 0b3a0d5
2 parents 4dfb3b8 + 2200310
commit 0b3a0d5
Show file tree

Hide file tree

Showing 41 changed files with 421 additions and 324 deletions.
diff --git a/app/controllers/administrateurs/archives_controller.rb b/app/controllers/administrateurs/archives_controller.rb
@@ -14,7 +14,7 @@ def index
 
     def create
       type = params[:type]
-      archive = Archive.find_or_create_archive(type, year_month, all_groupe_instructeurs)
+      archive = Archive.find_or_create_archive(type, year_month, all_groupe_instructeurs, current_administrateur)
       if archive.pending?
         ArchiveCreationJob.perform_later(@procedure, archive, current_administrateur)
         flash[:notice] = "Votre demande a été prise en compte. Selon le nombre de dossiers, cela peut prendre de quelques minutes à plusieurs heures. Vous recevrez un courriel lorsque le fichier sera disponible."

diff --git a/app/controllers/administrateurs/exports_controller.rb b/app/controllers/administrateurs/exports_controller.rb
@@ -4,7 +4,7 @@ class ExportsController < AdministrateurController
     before_action :ensure_not_super_admin!
 
     def download
-      export = Export.find_or_create_fresh_export(export_format, all_groupe_instructeurs, current_administrateur.instructeur, **export_options)
+      export = Export.find_or_create_fresh_export(export_format, all_groupe_instructeurs, current_administrateur, **export_options)
       @dossiers_count = export.count
 
       if export.available?

diff --git a/app/controllers/experts/avis_controller.rb b/app/controllers/experts/avis_controller.rb
@@ -159,9 +159,7 @@ def bilans_bdf
     end
 
     def telecharger_pjs
-      @dossier = dossier_with_champs
-
-      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id), include_avis_for_expert: current_expert)
+      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(user_profile: current_expert, dossiers: Dossier.where(id: @dossier.id))
       cleaned_files = ActiveStorage::DownloadableFile.cleanup_list_from_dossier(files)
 
       zipline(cleaned_files, "dossier-#{@dossier.id}.zip")

diff --git a/app/controllers/instructeurs/archives_controller.rb b/app/controllers/instructeurs/archives_controller.rb
@@ -13,7 +13,7 @@ def index
 
     def create
       type = params[:type]
-      archive = Archive.find_or_create_archive(type, year_month, groupe_instructeurs)
+      archive = Archive.find_or_create_archive(type, year_month, groupe_instructeurs, current_instructeur)
       if archive.pending?
         ArchiveCreationJob.perform_later(@procedure, archive, current_instructeur)
         flash[:notice] = "Votre demande a été prise en compte. Selon le nombre de dossiers, cela peut prendre de quelques minutes à plusieurs heures. Vous recevrez un courriel lorsque le fichier sera disponible."

diff --git a/app/controllers/instructeurs/dossiers_controller.rb b/app/controllers/instructeurs/dossiers_controller.rb
@@ -49,10 +49,9 @@ def bilans_bdf
     def show
       @demande_seen_at = current_instructeur.follows.find_by(dossier: dossier_with_champs)&.demande_seen_at
       @is_dossier_in_batch_operation = dossier.batch_operation.present?
-
       respond_to do |format|
         format.pdf do
-          @include_infos_administration = true
+          @acls = PiecesJustificativesService.new(user_profile: current_instructeur).acl_for_dossier_export
           render(template: 'dossiers/show', formats: [:pdf])
         end
         format.all
@@ -322,7 +321,7 @@ def annotation
     end
 
     def telecharger_pjs
-      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id), with_champs_private: true, include_infos_administration: true)
+      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(dossiers: Dossier.where(id: dossier.id), user_profile: current_instructeur)
       cleaned_files = ActiveStorage::DownloadableFile.cleanup_list_from_dossier(files)
 
       zipline(cleaned_files, "dossier-#{dossier.id}.zip")

diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb
@@ -88,10 +88,11 @@ def index
     end
 
     def show
+      pj_service = PiecesJustificativesService.new(user_profile: current_user)
       respond_to do |format|
         format.pdf do
           @dossier = dossier_with_champs(pj_template: false)
-          @include_infos_administration = false
+          @acls = pj_service.acl_for_dossier_export
           render(template: 'dossiers/show', formats: [:pdf])
         end
         format.all do

diff --git a/app/lib/active_storage/downloadable_file.rb b/app/lib/active_storage/downloadable_file.rb
@@ -1,15 +1,10 @@
 require 'fog/openstack'
 
 class ActiveStorage::DownloadableFile
-  def self.create_list_from_dossiers(
-    dossiers,
-    with_bills: false,
-    with_champs_private: false,
-    include_infos_administration: false,
-    include_avis_for_expert: false
-  )
-    PiecesJustificativesService.generate_dossier_export(dossiers, include_infos_administration:, include_avis_for_expert:) +
-      PiecesJustificativesService.liste_documents(dossiers, with_bills:, with_champs_private:, with_avis_piece_justificative: include_infos_administration)
+  def self.create_list_from_dossiers(dossiers:, user_profile:)
+    pj_service = PiecesJustificativesService.new(user_profile:)
+
+    pj_service.generate_dossiers_export(dossiers) + pj_service.liste_documents(dossiers)
   end
 
   def self.cleanup_list_from_dossier(files)

diff --git a/app/models/administrateur.rb b/app/models/administrateur.rb
@@ -9,7 +9,8 @@ class Administrateur < ApplicationRecord
   has_many :api_tokens, inverse_of: :administrateur, dependent: :destroy
   has_many :commentaire_groupe_gestionnaires, as: :sender
   has_and_belongs_to_many :default_zones, class_name: 'Zone', join_table: 'default_zones_administrateurs'
-
+  has_many :archives, as: :user_profile
+  has_many :exports, as: :user_profile
   belongs_to :user
   belongs_to :groupe_gestionnaire, optional: true
 

diff --git a/app/models/archive.rb b/app/models/archive.rb
@@ -9,6 +9,7 @@ class Archive < ApplicationRecord
   has_and_belongs_to_many :groupe_instructeurs
 
   has_one_attached :file
+  belongs_to :user_profile, polymorphic: true, optional: true
 
   scope :for_groupe_instructeur, -> (groupe_instructeur) {
     joins(:archives_groupe_instructeurs)
@@ -30,9 +31,9 @@ def filename(procedure)
     end
   end
 
-  def self.find_or_create_archive(time_span_type, month, groupe_instructeurs)
+  def self.find_or_create_archive(time_span_type, month, groupe_instructeurs, user_profile)
     create_with(groupe_instructeurs: groupe_instructeurs)
-      .create_or_find_by(time_span_type: time_span_type, month: month, key: generate_cache_key(groupe_instructeurs))
+      .create_or_find_by(time_span_type:, month:, user_profile:, key: generate_cache_key(groupe_instructeurs))
   end
 
   private

diff --git a/app/models/attestation_template.rb b/app/models/attestation_template.rb
@@ -92,7 +92,7 @@ def unspecified_champs_for_dossier(dossier)
 
   def dup
     attestation_template = AttestationTemplate.new(title: title, body: body, footer: footer, activated: activated)
-    PiecesJustificativesService.clone_attachments(self, attestation_template)
+    ClonePiecesJustificativesService.clone_attachments(self, attestation_template)
     attestation_template
   end
 

diff --git a/app/models/champ.rb b/app/models/champ.rb
@@ -238,7 +238,7 @@ def clone(fork = false)
     relationships = fork || !private? ? [:etablissement, :geo_areas] : []
 
     deep_clone(only: champ_attributes + value_attributes, include: relationships, validate: !fork) do |original, kopy|
-      PiecesJustificativesService.clone_attachments(original, kopy)
+      ClonePiecesJustificativesService.clone_attachments(original, kopy)
     end
   end
 

diff --git a/app/models/concerns/dossier_clone_concern.rb b/app/models/concerns/dossier_clone_concern.rb
@@ -85,7 +85,7 @@ def clone(user: nil, fork: false)
       .transform_values { [_1, _1.clone(fork)] }
 
     cloned_dossier = deep_clone(only: dossier_attributes, include: relationships) do |original, kopy|
-      PiecesJustificativesService.clone_attachments(original, kopy)
+      ClonePiecesJustificativesService.clone_attachments(original, kopy)
 
       if original.is_a?(Dossier)
         if fork

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
@@ -740,17 +740,6 @@ def duree_totale_conservation_in_months
     procedure.duree_conservation_dossiers_dans_ds + (conservation_extension / 1.month.to_i)
   end
 
-  def avis_for_instructeur(instructeur)
-    if instructeur.dossiers.include?(self)
-      avis.order(created_at: :asc)
-    else
-      avis
-        .where(confidentiel: false)
-        .or(avis.where(claimant: instructeur))
-        .order(created_at: :asc)
-    end
-  end
-
   def avis_for_expert(expert)
     Avis
       .where(dossier_id: id, confidentiel: false)

diff --git a/app/models/export.rb b/app/models/export.rb
@@ -30,6 +30,7 @@ class Export < ApplicationRecord
   has_and_belongs_to_many :groupe_instructeurs
   belongs_to :procedure_presentation, optional: true
   belongs_to :instructeur, optional: true
+  belongs_to :user_profile, polymorphic: true, optional: true
 
   has_one_attached :file
 
@@ -65,7 +66,7 @@ def filtered?
     procedure_presentation_id.present?
   end
 
-  def self.find_or_create_fresh_export(format, groupe_instructeurs, instructeur, time_span_type: time_span_types.fetch(:everything), statut: statuts.fetch(:tous), procedure_presentation: nil)
+  def self.find_or_create_fresh_export(format, groupe_instructeurs, user_profile, time_span_type: time_span_types.fetch(:everything), statut: statuts.fetch(:tous), procedure_presentation: nil)
     attributes = {
       format:,
       time_span_type:,
@@ -81,7 +82,7 @@ def self.find_or_create_fresh_export(format, groupe_instructeurs, instructeur, t
     return recent_export if recent_export.present?
 
     create!(**attributes, groupe_instructeurs:,
-                          instructeur:,
+                          user_profile:,
                           procedure_presentation:,
                           procedure_presentation_snapshot: procedure_presentation&.snapshot)
   end
@@ -146,7 +147,7 @@ def dossiers_for_export
   end
 
   def blob
-    service = ProcedureExportService.new(procedure, dossiers_for_export)
+    service = ProcedureExportService.new(procedure, dossiers_for_export, user_profile)
 
     case format.to_sym
     when :csv

diff --git a/app/models/instructeur.rb b/app/models/instructeur.rb
@@ -18,8 +18,9 @@ class Instructeur < ApplicationRecord
   has_many :followed_dossiers, through: :follows, source: :dossier
   has_many :previously_followed_dossiers, -> { distinct }, through: :previous_follows, source: :dossier
   has_many :trusted_device_tokens, dependent: :destroy
-  has_many :archives
   has_many :bulk_messages, dependent: :destroy
+  has_many :exports, as: :user_profile
+  has_many :archives, as: :user_profile
 
   belongs_to :user
 

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
@@ -497,7 +497,7 @@ def clone(admin, from_library)
     }
     include_list[:groupe_instructeurs] = [:instructeurs, :contact_information] if !is_different_admin
     procedure = self.deep_clone(include: include_list) do |original, kopy|
-      PiecesJustificativesService.clone_attachments(original, kopy)
+      ClonePiecesJustificativesService.clone_attachments(original, kopy)
     end
     procedure.path = SecureRandom.uuid
     procedure.aasm_state = :brouillon

diff --git a/app/models/procedure_revision.rb b/app/models/procedure_revision.rb
@@ -414,7 +414,7 @@ def compare_type_de_champ(from_type_de_champ, to_type_de_champ, from_coordinates
 
   def replace_type_de_champ_by_clone(coordinate)
     cloned_type_de_champ = coordinate.type_de_champ.deep_clone do |original, kopy|
-      PiecesJustificativesService.clone_attachments(original, kopy)
+      ClonePiecesJustificativesService.clone_attachments(original, kopy)
     end
     coordinate.update!(type_de_champ: cloned_type_de_champ)
     cloned_type_de_champ

diff --git a/app/serializers/dossier_serializer.rb b/app/serializers/dossier_serializer.rb
@@ -55,7 +55,14 @@ def cerfa
   end
 
   def pieces_justificatives
-    PiecesJustificativesService.serialize_champs_as_pjs(object)
+    object.champs_public.filter { |champ| champ.type_de_champ.old_pj }.map do |champ|
+      {
+        created_at: champ.created_at&.in_time_zone('UTC'),
+        type_de_piece_justificative_id: champ.type_de_champ.old_pj[:stable_id],
+        content_url: champ.for_api,
+        user: champ.dossier.user
+      }
+    end.flatten
   end
 
   def attestation

diff --git a/app/services/clone_pieces_justificatives_service.rb b/app/services/clone_pieces_justificatives_service.rb
@@ -0,0 +1,33 @@
+class ClonePiecesJustificativesService
+  def self.clone_attachments(original, kopy)
+    case original
+    when Champs::PieceJustificativeChamp, Champs::TitreIdentiteChamp
+      clone_many_attachments(original, kopy, :piece_justificative_file)
+    when TypeDeChamp
+      clone_one_attachment(original, kopy, :piece_justificative_template)
+    when Procedure
+      clone_one_attachment(original, kopy, :logo)
+      clone_one_attachment(original, kopy, :notice)
+      clone_one_attachment(original, kopy, :deliberation)
+    when AttestationTemplate
+      clone_one_attachment(original, kopy, :logo)
+      clone_one_attachment(original, kopy, :signature)
+    when Etablissement
+      clone_one_attachment(original, kopy, :entreprise_attestation_sociale)
+      clone_one_attachment(original, kopy, :entreprise_attestation_fiscale)
+    end
+  end
+
+  def self.clone_many_attachments(original, kopy, attachments_name)
+    original.public_send(attachments_name).attachments.each do |attachment|
+      kopy.public_send(attachments_name).attach(attachment.blob)
+    end
+  end
+
+  def self.clone_one_attachment(original, kopy, attachment_name)
+    attachment = original.public_send(attachment_name)
+    if attachment.attached?
+      kopy.public_send(attachment_name).attach(attachment.blob)
+    end
+  end
+end