From 04e67ea20a7b1fbb866640251f2d72b617b1ab96 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Sun, 14 Nov 2021 18:43:45 +0100 Subject: [PATCH] fix(dossier): add instructeur email to traitements when available --- app/models/dossier.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 6468af3d1..391a2fa0d 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -83,14 +83,16 @@ class Dossier < ApplicationRecord has_many :avis, inverse_of: :dossier, dependent: :destroy has_many :experts, through: :avis has_many :traitements, -> { order(:processed_at) }, inverse_of: :dossier, dependent: :destroy do - def passer_en_construction(processed_at: Time.zone.now) + def passer_en_construction(instructeur: nil, processed_at: Time.zone.now) build(state: Dossier.states.fetch(:en_construction), + instructeur_email: instructeur&.email, process_expired: false, processed_at: processed_at) end - def passer_en_instruction(processed_at: Time.zone.now) + def passer_en_instruction(instructeur: nil, processed_at: Time.zone.now) build(state: Dossier.states.fetch(:en_instruction), + instructeur_email: instructeur&.email, process_expired: false, processed_at: processed_at) end @@ -735,7 +737,7 @@ class Dossier < ApplicationRecord self.en_construction_close_to_expiration_notice_sent_at = nil self.conservation_extension = 0.days self.en_instruction_at = self.traitements - .passer_en_instruction + .passer_en_instruction(instructeur: instructeur) .processed_at save! @@ -759,7 +761,7 @@ class Dossier < ApplicationRecord self.en_construction_close_to_expiration_notice_sent_at = nil self.conservation_extension = 0.days self.en_construction_at = self.traitements - .passer_en_construction + .passer_en_construction(instructeur: instructeur) .processed_at save! log_dossier_operation(instructeur, :repasser_en_construction) @@ -770,7 +772,7 @@ class Dossier < ApplicationRecord self.termine_close_to_expiration_notice_sent_at = nil self.conservation_extension = 0.days self.en_instruction_at = self.traitements - .passer_en_instruction + .passer_en_instruction(instructeur: instructeur) .processed_at attestation&.destroy