Merge pull request #11752 from demarches-simplifiees/add-expired-at-to-dossiers

ETQ Tech je veux que la date d'expiration d'un dossier soit persistée en base

Author: E-L-T

app/jobs/reset_expiring_dossiers_job.rb

@@ -11,6 +11,7 @@ def perform(procedure)
           dossier.update(brouillon_close_to_expiration_notice_sent_at: nil,
                         en_construction_close_to_expiration_notice_sent_at: nil,
                         termine_close_to_expiration_notice_sent_at: nil)
+          dossier.update_expired_at
         end
       end
     end

app/models/concerns/dossier_state_concern.rb

@@ -19,6 +19,7 @@ def after_passer_en_construction
     self.depose_at = self.en_construction_at = self.traitements
       .passer_en_construction
       .processed_at
+    self.expired_at = expiration_date
 
     save!
 
@@ -52,6 +53,8 @@ def after_passer_en_instruction(h)
     self.en_instruction_at = self.traitements
       .passer_en_instruction(instructeur: instructeur)
       .processed_at
+    self.expired_at = nil
+
     save!
 
     reset_user_buffer_stream!
@@ -77,6 +80,7 @@ def after_passer_automatiquement_en_instruction
     self.en_construction_close_to_expiration_notice_sent_at = nil
     self.conservation_extension = 0.days
     self.en_instruction_at = traitements.passer_en_instruction.processed_at
+    self.expired_at = nil
 
     if procedure.declarative_en_instruction?
       self.declarative_triggered_at = en_instruction_at
@@ -109,6 +113,7 @@ def after_repasser_en_construction(h)
     self.en_construction_at = self.traitements
       .passer_en_construction(instructeur: instructeur)
       .processed_at
+    self.expired_at = expiration_date
 
     save!
 
@@ -126,6 +131,8 @@ def after_accepter(h)
     self.processed_at = self.traitements
       .accepter(motivation: motivation, instructeur: instructeur)
       .processed_at
+    self.expired_at = expiration_date
+
     save!
 
     if justificatif
@@ -161,6 +168,7 @@ def after_commit_accepter(h)
 
   def after_accepter_automatiquement
     self.processed_at = traitements.accepter_automatiquement.processed_at
+    self.expired_at = expiration_date
 
     if procedure.declarative_accepte?
       self.en_instruction_at = self.processed_at
@@ -202,6 +210,8 @@ def after_refuser(h)
     self.processed_at = self.traitements
       .refuser(motivation: motivation, instructeur: instructeur)
       .processed_at
+    self.expired_at = expiration_date
+
     save!
 
     if justificatif
@@ -239,6 +249,7 @@ def after_refuser_automatiquement
 
     self.processed_at = traitements.refuser_automatiquement(motivation:).processed_at
     self.sva_svr_decision_triggered_at = self.processed_at
+    self.expired_at = expiration_date
 
     save!
 
@@ -267,6 +278,8 @@ def after_classer_sans_suite(h)
     self.processed_at = self.traitements
       .classer_sans_suite(motivation: motivation, instructeur: instructeur)
       .processed_at
+    self.expired_at = expiration_date
+
     save!
 
     if justificatif
@@ -308,6 +321,7 @@ def after_repasser_en_instruction(h)
     self.en_instruction_at = self.traitements
       .passer_en_instruction(instructeur: instructeur)
       .processed_at
+    self.expired_at = nil
     attestation&.destroy
 
     self.sva_svr_decision_on = nil

app/models/dossier.rb

@@ -429,6 +429,7 @@ def classer_sans_suite(motivation: nil, instructeur: nil, processed_at: Time.zon
   delegate :france_connected_with_one_identity?, to: :user, allow_nil: true
 
   after_save :send_web_hook
+  after_save :update_expired_at, if: :brouillon?
 
   validates :user, presence: true, if: -> { deleted_user_email_never_send.nil? }, unless: -> { prefilled }
   validates :individual, presence: true, if: -> { revision.procedure.for_individual? }
@@ -669,6 +670,7 @@ def extend_conservation(conservation_extension)
       brouillon_close_to_expiration_notice_sent_at: nil,
       en_construction_close_to_expiration_notice_sent_at: nil,
       termine_close_to_expiration_notice_sent_at: nil)
+    update_expired_at
   end
 
   def extend_conservation_and_restore(conservation_extension, author)
@@ -1053,6 +1055,8 @@ def update_champs_timestamps(changed_champs)
     update_columns(attributes)
   end
 
+  def update_expired_at = update_column(:expired_at, expiration_date)
+
   private
 
   def build_default_champs

app/tasks/maintenance/t20250611backfill_dossiers_expired_at_task.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Maintenance
+  class T20250611backfillDossiersExpiredAtTask < MaintenanceTasks::Task
+    # Documentation: cette tâche modifie les données pour remplir
+    # le nouvel attribut expired_at de la table dossiers.
+
+    include RunnableOnDeployConcern
+    include StatementsHelpersConcern
+
+    def collection
+      Dossier
+        .where.not(state: Dossier.states.fetch(:en_instruction))
+        .where(expired_at: nil)
+    end
+
+    def process(dossier)
+      dossier.update_column(:expired_at, dossier.expiration_date)
+    end
+  end
+end

db/migrate/20250606140238_add_expired_at_to_dossiers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddExpiredAtToDossiers < ActiveRecord::Migration[7.1]
+  def change
+    add_column :dossiers, :expired_at, :datetime
+  end
+end

db/schema.rb

@@ -503,6 +503,7 @@
     t.datetime "en_construction_at", precision: nil
     t.datetime "en_construction_close_to_expiration_notice_sent_at", precision: nil
     t.datetime "en_instruction_at", precision: nil
+    t.datetime "expired_at"
     t.boolean "for_procedure_preview", default: false, null: false
     t.boolean "for_tiers", default: false, null: false
     t.boolean "forced_groupe_instructeur", default: false, null: false

spec/controllers/users/dossiers_controller_spec.rb

@@ -2001,7 +2001,7 @@
 
   describe '#extend_conservation' do
     let(:procedure) { create(:procedure, duree_conservation_dossiers_dans_ds: 3) }
-    let(:dossier) { create(:dossier, procedure: procedure, user: user) }
+    let(:dossier) { create(:dossier, :en_construction, procedure:, user:) }
     subject { post :extend_conservation, params: { dossier_id: dossier.id } }
     context 'when user logged in' do
       before { sign_in(user) }
@@ -2014,6 +2014,12 @@
         expect(dossier.reload.conservation_extension).to eq(procedure.duree_conservation_dossiers_dans_ds.months)
       end
 
+      it 'updates expired_at' do
+        expired_at = dossier.expired_at
+        subject
+        expect(dossier.reload.expired_at).to be_within(1.hour).of(expired_at + 3.months)
+      end
+
       it 'flashed notice success' do
         subject
         expect(flash[:notice]).to eq(I18n.t('views.users.dossiers.archived_dossier', duree_conservation_dossiers_dans_ds: procedure.duree_conservation_dossiers_dans_ds))

spec/jobs/reset_expiring_dossiers_job_spec.rb

@@ -16,6 +16,9 @@
       expect(expiring_dossier_brouillon.reload.brouillon_close_to_expiration_notice_sent_at).to eq(nil)
       expect(expiring_dossier_en_construction.reload.en_construction_close_to_expiration_notice_sent_at).to eq(nil)
       expect(expiring_dossier_en_termine.reload.termine_close_to_expiration_notice_sent_at).to eq(nil)
+      expect(expiring_dossier_brouillon.expired_at).to be_within(1.hour).of(2.months.from_now)
+      expect(expiring_dossier_en_construction.expired_at).to be_within(1.hour).of(2.months.from_now)
+      expect(expiring_dossier_en_termine.expired_at).to be_within(1.hour).of(2.months.from_now)
     end
   end
 end

spec/models/dossier_spec.rb

@@ -495,6 +495,7 @@
           expect(dossier.depose_at).to eq(beginning_of_day)
           expect(dossier.traitement.state).to eq(Dossier.states.fetch(:en_construction))
           expect(dossier.traitement.processed_at).to eq(beginning_of_day)
+          expect(dossier.expired_at).to eq(dossier.expiration_date)
         end
 
         it 'should keep first en_construction_at date' do
@@ -592,10 +593,13 @@
         dossier.reload
       end
 
-      it { expect(dossier.state).to eq(Dossier.states.fetch(:en_instruction)) }
-      it { expect(dossier.en_instruction_at).to eq(beginning_of_day) }
-      it { expect(dossier.traitement.state).to eq(Dossier.states.fetch(:en_instruction)) }
-      it { expect(dossier.traitement.processed_at).to eq(beginning_of_day) }
+      it do
+        expect(dossier.state).to eq(Dossier.states.fetch(:en_instruction))
+        expect(dossier.en_instruction_at).to eq(beginning_of_day)
+        expect(dossier.traitement.state).to eq(Dossier.states.fetch(:en_instruction))
+        expect(dossier.traitement.processed_at).to eq(beginning_of_day)
+        expect(dossier.expired_at).to be_nil
+      end
 
       it 'should keep first en_instruction_at date if dossier is set to en_construction again' do
         travel_back
@@ -618,10 +622,13 @@
         dossier.reload
       end
 
-      it { expect(dossier.state).to eq(Dossier.states.fetch(:accepte)) }
-      it { expect(dossier.processed_at).to eq(beginning_of_day) }
-      it { expect(dossier.traitement.state).to eq(Dossier.states.fetch(:accepte)) }
-      it { expect(dossier.traitement.processed_at).to eq(beginning_of_day) }
+      it do
+        expect(dossier.state).to eq(Dossier.states.fetch(:accepte))
+        expect(dossier.processed_at).to eq(beginning_of_day)
+        expect(dossier.traitement.state).to eq(Dossier.states.fetch(:accepte))
+        expect(dossier.traitement.processed_at).to eq(beginning_of_day)
+        expect(dossier.expired_at).to eq(dossier.expiration_date)
+      end
     end
 
     context 'when dossier is refuse' do
@@ -632,10 +639,13 @@
         dossier.reload
       end
 
-      it { expect(dossier.state).to eq(Dossier.states.fetch(:refuse)) }
-      it { expect(dossier.processed_at).to eq(beginning_of_day) }
-      it { expect(dossier.traitement.state).to eq(Dossier.states.fetch(:refuse)) }
-      it { expect(dossier.traitement.processed_at).to eq(beginning_of_day) }
+      it do
+        expect(dossier.state).to eq(Dossier.states.fetch(:refuse))
+        expect(dossier.processed_at).to eq(beginning_of_day)
+        expect(dossier.traitement.state).to eq(Dossier.states.fetch(:refuse))
+        expect(dossier.traitement.processed_at).to eq(beginning_of_day)
+        expect(dossier.expired_at).to eq(dossier.expiration_date)
+      end
     end
 
     context 'when dossier is sans_suite' do
@@ -646,10 +656,13 @@
         dossier.reload
       end
 
-      it { expect(dossier.state).to eq(Dossier.states.fetch(:sans_suite)) }
-      it { expect(dossier.processed_at).to eq(beginning_of_day) }
-      it { expect(dossier.traitement.state).to eq(Dossier.states.fetch(:sans_suite)) }
-      it { expect(dossier.traitement.processed_at).to eq(beginning_of_day) }
+      it do
+        expect(dossier.state).to eq(Dossier.states.fetch(:sans_suite))
+        expect(dossier.processed_at).to eq(beginning_of_day)
+        expect(dossier.traitement.state).to eq(Dossier.states.fetch(:sans_suite))
+        expect(dossier.traitement.processed_at).to eq(beginning_of_day)
+        expect(dossier.expired_at).to eq(dossier.expiration_date)
+      end
     end
   end
 

spec/tasks/maintenance/t20250611backfill_dossiers_expired_at_task_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+module Maintenance
+  RSpec.describe T20250611backfillDossiersExpiredAtTask do
+    describe "#process" do
+      subject(:process) { described_class.process(dossier) }
+
+      context "when dossier is en brouillon" do
+        let(:dossier) { create(:dossier, :brouillon) }
+        before { dossier.update_column(:expired_at, nil) }
+
+        it "updates dossier expired_at attribute" do
+          expect { process }.to change { dossier.reload.expired_at }.from(nil).to be_within(1.second).of(dossier.expiration_date)
+        end
+      end
+
+      context "when dossier is en construction" do
+        let(:dossier) { create(:dossier, :en_construction) }
+        before { dossier.update_column(:expired_at, nil) }
+
+        it "updates dossier expired_at attribute" do
+          expect { process }.to change { dossier.reload.expired_at }.from(nil).to be_within(1.second).of(dossier.expiration_date)
+        end
+      end
+
+      context "when dossier is en instruction" do
+        let(:dossier) { create(:dossier, :en_instruction) }
+        it "raises an error" do
+          expect { process }.to raise_error(RuntimeError, 'expiration_date_reference should not be called in state en_instruction')
+        end
+      end
+    end
+  end
+end