Merge pull request #13185 from colinux/perf/discarded-dossiers-deletion-job-memory

Tech: réduction de l’empreinte mémoire du job de suppression des dossiers expirés

Author: colinux

app/jobs/cron/discarded_brouillon_dossiers_deletion_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Cron::DiscardedBrouillonDossiersDeletionJob < Cron::DiscardedDossiersDeletionBaseJob
+  self.schedule_expression = 'every day at 02:00'
+
+  private
+
+  def scope = Dossier.en_brouillon_expired_to_delete
+end

app/jobs/cron/discarded_dossiers_deletion_base_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Cron::DiscardedDossiersDeletionBaseJob < Cron::CronJob
+  MAX_DOSSIERS_PER_RUN = 100
+
+  # Classe abstraite : empêche `rake jobs:schedule` de tenter d'enregistrer
+  # cette base (qui n'a pas de schedule_expression) dans Sidekiq Cron.
+  def self.schedulable?
+    schedule_expression.present? && super
+  end
+
+  def perform
+    scope.limit(MAX_DOSSIERS_PER_RUN).each(&:purge_discarded)
+    self.class.perform_later if scope.exists?
+  end
+
+  private
+
+  def scope = raise NotImplementedError
+end

app/jobs/cron/discarded_dossiers_deletion_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Cron::DiscardedEnConstructionDossiersDeletionJob < Cron::DiscardedDossiersDeletionBaseJob
+  self.schedule_expression = 'every day at 03:10'
+
+  private
+
+  def scope = Dossier.en_construction_expired_to_delete
+end

app/jobs/cron/discarded_en_construction_dossiers_deletion_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Cron::DiscardedTermineDossiersDeletionJob < Cron::DiscardedDossiersDeletionBaseJob
+  self.schedule_expression = 'every day at 04:20'
+
+  private
+
+  def scope = Dossier.termine_expired_to_delete
+end

app/jobs/cron/discarded_termine_dossiers_deletion_job.rb

@@ -8,7 +8,7 @@ module DossierSearchableConcern
   LIGHT_USER_DOSSIERS_THRESHOLD = 5
 
   included do
-    after_commit :index_search_terms_later, if: -> { previously_new_record? || user_previously_changed? || mandataire_first_name_previously_changed? || mandataire_last_name_previously_changed? }
+    after_commit :index_search_terms_later, on: [:create, :update], if: -> { previously_new_record? || user_previously_changed? || mandataire_first_name_previously_changed? || mandataire_last_name_previously_changed? }
 
     kredis_flag :debounce_index_search_terms_flag
   end

app/models/concerns/dossier_searchable_concern.rb

@@ -1097,18 +1097,20 @@ def purge_discarded
     transaction do
       DeletedDossier.create_from_dossier(self, hidden_by_reason)
       dossier_operation_logs.purge_discarded
+      # Vider les champs par lots libère leur cascade (geo_areas, etablissement,
+      # AS attachments) avant le destroy du dossier, évitant le pic mémoire dû
+      # au chargement complet de la cascade dependent: :destroy.
+      # Important: destroy_all (et non delete_all) preserve les callbacks Rails.
+      champs.in_batches(of: 50).each(&:destroy_all)
       destroy
     rescue => e
       Sentry.capture_exception(e, extra: { dossier: id })
+      # Rollback explicite : sans cela, le rescue avale l'erreur et la transaction
+      # commit un état partiel (champs deja batch-destroy, dossier intact).
+      raise ActiveRecord::Rollback
     end
   end
 
-  def self.purge_discarded
-    en_brouillon_expired_to_delete.find_each(&:purge_discarded)
-    en_construction_expired_to_delete.find_each(&:purge_discarded)
-    termine_expired_to_delete.find_each(&:purge_discarded)
-  end
-
   def skip_user_notification_email?
     return true if brouillon? && procedure.declarative?
     return true if for_procedure_preview?

app/models/dossier.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+RSpec.describe Cron::DiscardedBrouillonDossiersDeletionJob, type: :job do
+  describe '#perform' do
+    let(:brouillon_dossier) { create(:dossier, :brouillon, hidden_by_user_at: 5.weeks.ago, hidden_by_reason: 'user_request') }
+    let(:en_construction_dossier) { create(:dossier, :en_construction, hidden_by_user_at: 5.weeks.ago, hidden_by_reason: 'user_request') }
+
+    it 'purges only brouillon dossiers' do
+      brouillon_dossier
+      en_construction_dossier
+      described_class.perform_now
+      expect { brouillon_dossier.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { en_construction_dossier.reload }.not_to raise_error
+    end
+  end
+end

spec/jobs/cron/discarded_brouillon_dossiers_deletion_job_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+RSpec.describe Cron::DiscardedDossiersDeletionBaseJob, type: :job do
+  describe '.schedulable?' do
+    it 'is false so rake jobs:schedule skips this abstract base class' do
+      expect(described_class.schedulable?).to be false
+    end
+  end
+
+  describe '#perform with MAX_DOSSIERS_PER_RUN drainage' do
+    let(:dossier_ids) { create_list(:dossier, 3).map(&:id) }
+    let(:job_class) do
+      ids = dossier_ids
+      Class.new(described_class).tap do |klass|
+        klass.define_singleton_method(:name) { 'TestDrainJob' }
+        klass.define_method(:scope) { Dossier.where(id: ids) }
+      end
+    end
+
+    before do
+      stub_const("#{described_class}::MAX_DOSSIERS_PER_RUN", 2)
+    end
+
+    it 'processes exactly MAX_DOSSIERS_PER_RUN dossiers and re-enqueues self when more remain' do
+      expect {
+        job_class.perform_now
+      }.to change { Dossier.where(id: dossier_ids).count }.from(3).to(1)
+        .and have_enqueued_job(job_class)
+    end
+
+    it 'does not re-enqueue when the scope is drained exactly at MAX_DOSSIERS_PER_RUN' do
+      drainage_ids = create_list(:dossier, 2).map(&:id)
+      drainage_class = Class.new(described_class).tap do |klass|
+        klass.define_singleton_method(:name) { 'TestDrainExactJob' }
+        klass.define_method(:scope) { Dossier.where(id: drainage_ids) }
+      end
+
+      expect { drainage_class.perform_now }
+        .to change { Dossier.where(id: drainage_ids).count }.from(2).to(0)
+        .and have_enqueued_job(drainage_class).exactly(0).times
+    end
+  end
+end