ETQ Usager, je veux qu'on supprime mon brouillon après 3 mois d'inactivité (correction)

app/controllers/champs/carte_controller.rb

@@ -35,7 +35,7 @@
 
   def destroy
     @champ.geo_areas.find(params[:id]).destroy!
-    @champ.touch
+    propagate_touch_champs_changed
 
     head :no_content
   end
@@ -78,7 +78,7 @@
       geo_area.properties.merge!(feature[:properties])
     end
     if geo_area.save
-      @champ.touch
+      propagate_touch_champs_changed
       true
     end
   end

app/controllers/champs/champ_controller.rb

@@ -23,4 +23,9 @@
   def set_champ
     @champ = find_champ
   end
+
+  def propagate_touch_champs_changed
+    @champ.touch
+    @champ.dossier.touch_champs_changed([:last_champ_updated_at])
+  end
 end

app/controllers/champs/piece_justificative_controller.rb

@@ -32,7 +32,7 @@ def attach_piece_justificative
     end
 
     if save_succeed && dossier.brouillon?
-      dossier.touch(:last_champ_updated_at, :last_champ_piece_jointe_updated_at)
+      dossier.touch_champs_changed([:last_champ_updated_at, :last_champ_piece_jointe_updated_at])
     end
 
     save_succeed

app/controllers/champs/repetition_controller.rb

@@ -5,12 +5,14 @@ def add
     @row_id = @champ.add_row(updated_by: current_user.email)
     @first_champ_id = @champ.focusable_input_id
     @row_number = @row_id.nil? ? 0 : @champ.row_ids.find_index(@row_id) + 1
+    @champ.dossier.touch_champs_changed([:last_champ_updated_at])
   end
 
   def remove
     @champ.remove_row(params[:row_id], updated_by: current_user.email)
     @to_remove = "safe-row-selector-#{params[:row_id]}"
     @to_focus = @champ.focusable_input_id || helpers.dom_id(@champ, :create_repetition)
+    @champ.dossier.touch_champs_changed([:last_champ_updated_at])
   end
 
   private

app/controllers/champs/rna_controller.rb

@@ -8,5 +8,6 @@
     unless @champ.fetch_association!(rna)
       @error = @champ.association_fetch_error_key
     end
+    @champ.dossier.touch_champs_changed([:last_champ_updated_at])
   end
 end

app/controllers/champs/siret_controller.rb

@@ -10,5 +10,6 @@ def show
     else
       @siret = @champ.etablissement_fetch_error_key
     end
+    @champ.dossier.touch_champs_changed([:last_champ_updated_at])
   end
 end

app/controllers/users/dossiers_controller.rb

@@ -544,7 +544,7 @@ def update_dossier_and_compute_errors
       # requests it, we ask for field validation errors.
       if dossier.save
         if dossier.brouillon? && updated_champs.present?
-          dossier.touch(:last_champ_updated_at)
+          dossier.touch_champs_changed([:last_champ_updated_at])
           if updated_champs.any?(&:used_by_routing_rules?)
             @update_contact_information = true
             RoutingEngine.compute(dossier)

app/mailers/dossier_mailer.rb

@@ -217,26 +217,6 @@ def notify_transfer
     end
   end
 
-  def notify_old_brouillon_after_deletion(dossier)
-    @dossier = dossier
-    configure_defaults_for_user(dossier.user)
-
-    I18n.with_locale(dossier.user_locale) do
-      @subject = default_i18n_subject(dossier_id: dossier.id)
-      mail(to: dossier.user_email_for(:notification), subject: @subject)
-    end
-  end
-
-  def notify_old_brouillon_soon_deleted(dossier)
-    @dossier = dossier
-    configure_defaults_for_user(dossier.user)
-
-    I18n.with_locale(dossier.user_locale) do
-      @subject = default_i18n_subject(dossier_id: dossier.id)
-      mail(to: dossier.user_email_for(:notification), subject: @subject)
-    end
-  end
-
   def self.critical_email?(action_name)
     false
   end

app/models/concerns/dossier_clone_concern.rb

@@ -76,8 +76,11 @@ def merge_fork(editing_fork)
       rebase!
       diff = make_diff(editing_fork)
       apply_diff(diff)
-      touch(:last_champ_updated_at)
-      touch(:last_champ_piece_jointe_updated_at) if diff[:updated].any? { |c| c.class.in?([Champs::PieceJustificativeChamp, Champs::TitreIdentiteChamp]) }
+
+      attributes_to_touch = [:last_champ_updated_at]
+      attributes_to_touch << :last_champ_piece_jointe_updated_at if diff[:updated].any? { |c| c.class.in?([Champs::PieceJustificativeChamp, Champs::TitreIdentiteChamp]) }
+
+      touch_champs_changed(attributes_to_touch)
     end
     reload
     index_search_terms_later

app/models/dossier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Dossier < ApplicationRecord
-  self.ignored_columns += [:search_terms, :private_search_terms]
+  self.ignored_columns += [:search_terms, :private_search_terms, :notified_soon_deleted_sent_at]
 
   include DossierCloneConcern
   include DossierCorrectableConcern
@@ -288,7 +288,7 @@
   scope :interval_brouillon_close_to_expiration, -> do
     state_brouillon
       .visible_by_user
-      .where("dossiers.created_at + dossiers.conservation_extension + (procedures.duree_conservation_dossiers_dans_ds * INTERVAL '1 month') - INTERVAL :expires_in < :now", { now: Time.zone.now, expires_in: INTERVAL_BEFORE_EXPIRATION })
+      .where("dossiers.updated_at + dossiers.conservation_extension + (LEAST(procedures.duree_conservation_dossiers_dans_ds, #{Expired::MONTHS_BEFORE_BROUILLON_EXPIRATION}) * INTERVAL '1 month') - INTERVAL :expires_in < :now", { now: Time.zone.now, expires_in: INTERVAL_BEFORE_EXPIRATION })
   end
   scope :interval_en_construction_close_to_expiration, -> do
     state_en_construction
@@ -568,10 +568,7 @@
   end
 
   def can_be_deleted_by_automatic?(reason)
-    return true if reason == :expired && !en_instruction?
-    return true if reason == :not_modified_for_a_long_time && brouillon?
-
-    false
+    reason == :expired && !en_instruction?
   end
 
   def can_terminer_automatiquement_by_sva_svr?
@@ -599,7 +596,7 @@
 
   def expiration_date_reference
     if brouillon?
-      created_at
+      updated_at
     elsif en_construction?
       en_construction_at
     elsif termine?
@@ -610,7 +607,7 @@
   end
 
   def expiration_date_with_extension
-    expiration_date_reference + conservation_extension + procedure.duree_conservation_dossiers_dans_ds.months
+    expiration_date_reference + duree_totale_conservation_in_months.months
   end
 
   def expiration_notification_date
@@ -622,6 +619,12 @@
     expiration_notification_date < Time.zone.now && Expired::REMAINING_WEEKS_BEFORE_EXPIRATION.weeks.ago < expiration_notification_date
   end
 
+  def duree_totale_conservation_in_months
+    duree_conservation_dossier = brouillon? ? [procedure.duree_conservation_dossiers_dans_ds, Expired::MONTHS_BEFORE_BROUILLON_EXPIRATION].min : procedure.duree_conservation_dossiers_dans_ds
+
+    duree_conservation_dossier + (conservation_extension / 1.month.to_i)
+  end
+
   def has_expired?
     return false if en_instruction?
     expiration_notification_date < Expired::REMAINING_WEEKS_BEFORE_EXPIRATION.weeks.ago
@@ -717,10 +720,6 @@
     parts.join
   end
 
-  def duree_totale_conservation_in_months
-    procedure.duree_conservation_dossiers_dans_ds + (conservation_extension / 1.month.to_i)
-  end
-
   def avis_for_expert(expert)
     Avis
       .where(dossier_id: id, confidentiel: false)
@@ -1025,6 +1024,12 @@
     procedure.accuse_lecture? && termine?
   end
 
+  def touch_champs_changed(attributes)
+    update_columns(attributes.each_with_object({ brouillon_close_to_expiration_notice_sent_at: nil }) do |attribute, hash|
+      hash[attribute] = Time.zone.now
+    end)
+  end
+
   private
 
   def build_default_champs

app/services/expired.rb

@@ -18,6 +18,9 @@ module Expired
   # User are always reminded two weeks prior expiracy (for their account as well as their dossier)
   REMAINING_WEEKS_BEFORE_EXPIRATION = 2
 
+  # A dossier is considered expired after 3 months max of inactivity
+  MONTHS_BEFORE_BROUILLON_EXPIRATION = 3
+
   # Expiracy jobs are run daily.
   #   it send a lot o email, so we spread our jobs through the day
   def self.schedule_at(caller)

app/services/expired/dossiers_deletion_service.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Expired::DossiersDeletionService < Expired::MailRateLimiter
+  MAX_BROUILLON_DELETION_EMAILS_TO_PROCESS_PER_DAY = 10000
+
   def process_expired_dossiers_brouillon
     send_brouillon_expiration_notices
     delete_expired_brouillons_and_notify
@@ -20,17 +22,19 @@
     dossiers_close_to_expiration = Dossier
       .brouillon_close_to_expiration
       .without_brouillon_expiration_notice_sent
+      .limit(MAX_BROUILLON_DELETION_EMAILS_TO_PROCESS_PER_DAY)
 
     user_notifications = group_by_user_email(dossiers_close_to_expiration)
 
-    dossiers_close_to_expiration.in_batches.update_all(brouillon_close_to_expiration_notice_sent_at: Time.zone.now)
-
     user_notifications.each do |(email, dossiers)|
+      all_user_dossiers = all_user_dossiers_brouillon_close_to_expiration(dossiers.first.user).to_a
       mail = DossierMailer.notify_brouillon_near_deletion(
-        dossiers,
+        all_user_dossiers,
         email
       )
+
       send_with_delay(mail)
+      Dossier.where(id: all_user_dossiers.map(&:id)).update_all(brouillon_close_to_expiration_notice_sent_at: Time.zone.now)
     end
   end
 
@@ -141,4 +145,13 @@
       end
       .map { |(email, dossiers)| [email, dossiers.to_a] }
   end
+
+  def all_user_dossiers_brouillon_close_to_expiration(user)
+    user.dossiers
+      .brouillon_close_to_expiration
+      .without_brouillon_expiration_notice_sent
+      .visible_by_user
+      .with_notifiable_procedure(notify_on_closed: true)
+      .includes(:user, :procedure)
+  end
 end

config/locales/shared.fr.yml

@@ -10,7 +10,7 @@ fr:
         refused_by_svr: "Le service traitant n’a pas été en mesure de traiter votre demande dans le délai imparti par la règle du Silence Vaut Rejet."
       header:
         expires_at:
-          brouillon: "Expirera le %{date} (%{duree_conservation_totale} mois après la création du dossier)"
+          brouillon: "Expirera le %{date} (%{duree_conservation_totale} mois après la dernière modification du dossier)"
           en_construction: "Expirera le %{date} (%{duree_conservation_totale} mois après le dépôt du dossier)"
           en_instruction: "Ce dossier est en instruction, il n’expirera pas"
           accepte: "Expirera le %{date}  (%{duree_conservation_totale} mois après le traitement du dossier)"