DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

update state date in aasm after callbacks

Browse source 
call aasm event methods, not state methods directly
This commit is contained in:
Christophe Robillard 2020-07-01 17:31:08 +02:00
parent 161b63f487
commit f631acd118
5 changed files with 52 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/models/dossier.rb
View file

@ -282,7 +282,6 @@ class Dossier < ApplicationRecord
delegate :types_de_champ, to: :procedure
delegate :france_connect_information, to: :user
before_validation :update_state_dates, if: -> { state_changed? }
before_save :build_default_champs, if: Proc.new { groupe_instructeur_id_was.nil? }
before_save :update_search_terms
@ -508,20 +507,23 @@ class Dossier < ApplicationRecord
end
end
def after_passer_en_construction
update!(en_construction_at: Time.zone.now) if self.en_construction_at.nil?
end
def after_passer_en_instruction(instructeur)
instructeur.follow(self)
update!(en_instruction_at: Time.zone.now) if self.en_instruction_at.nil?
log_dossier_operation(instructeur, :passer_en_instruction)
end
def after_passer_automatiquement_en_instruction
update!(en_instruction_at: Time.zone.now) if self.en_instruction_at.nil?
log_automatic_dossier_operation(:passer_en_instruction)
end
def after_repasser_en_construction(instructeur)
self.en_instruction_at = nil
save!
log_dossier_operation(instructeur, :repasser_en_construction)
end
@ -529,6 +531,7 @@ class Dossier < ApplicationRecord
self.archived = false
self.processed_at = nil
self.motivation = nil
self.en_instruction_at = Time.zone.now
attestation&.destroy
save!
@ -543,6 +546,8 @@ class Dossier < ApplicationRecord
self.justificatif_motivation.attach(justificatif)
end
self.processed_at = Time.zone.now
if attestation.nil?
self.attestation = build_attestation
end
@ -559,6 +564,7 @@ class Dossier < ApplicationRecord
self.attestation = build_attestation
end
self.processed_at = Time.zone.now
save!
NotificationMailer.send_closed_notification(self).deliver_later
log_automatic_dossier_operation(:accepter, self)
@ -571,6 +577,7 @@ class Dossier < ApplicationRecord
self.justificatif_motivation.attach(justificatif)
end
self.processed_at = Time.zone.now
save!
NotificationMailer.send_refused_notification(self).deliver_later
log_dossier_operation(instructeur, :refuser, self)
@ -583,6 +590,7 @@ class Dossier < ApplicationRecord
self.justificatif_motivation.attach(justificatif)
end
self.processed_at = Time.zone.now
save!
NotificationMailer.send_without_continuation_notification(self).deliver_later
log_dossier_operation(instructeur, :classer_sans_suite, self)
@ -766,16 +774,6 @@ class Dossier < ApplicationRecord
end
end
def update_state_dates
if en_construction? && !self.en_construction_at
self.en_construction_at = Time.zone.now
elsif en_instruction? && !self.en_instruction_at
self.en_instruction_at = Time.zone.now
elsif TERMINE.include?(state) && !self.processed_at
self.processed_at = Time.zone.now
end
end
def send_dossier_received
if saved_change_to_state? && en_instruction? && !procedure.declarative_accepte?
NotificationMailer.send_dossier_received(self).deliver_later