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

Refactor NotificationMailer

Browse source
This commit is contained in:
Paul Chavard 2021-04-29 19:10:22 +02:00
parent a4fd629f4a
commit f6508899de
9 changed files with 128 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/dossier.rb
View file

@ -344,7 +344,7 @@ class Dossier < ApplicationRecord
before_save :build_default_champs, if: Proc.new { revision_id_was.nil? }
before_save :update_search_terms
after_save :send_dossier_received
after_save :send_dossier_en_instruction
after_save :send_web_hook
after_create_commit :send_draft_notification_email
@ -690,7 +690,7 @@ class Dossier < ApplicationRecord
save!
remove_titres_identite!
NotificationMailer.send_closed_notification(self).deliver_later
NotificationMailer.send_accepte_notification(self).deliver_later
send_dossier_decision_to_experts(self)
log_dossier_operation(instructeur, :accepter, self)
end
@ -705,7 +705,7 @@ class Dossier < ApplicationRecord
save!
remove_titres_identite!
NotificationMailer.send_closed_notification(self).deliver_later
NotificationMailer.send_accepte_notification(self).deliver_later
log_automatic_dossier_operation(:accepter, self)
end
@ -718,7 +718,7 @@ class Dossier < ApplicationRecord
save!
remove_titres_identite!
NotificationMailer.send_refused_notification(self).deliver_later
NotificationMailer.send_refuse_notification(self).deliver_later
send_dossier_decision_to_experts(self)
log_dossier_operation(instructeur, :refuser, self)
end
@ -732,7 +732,7 @@ class Dossier < ApplicationRecord
save!
remove_titres_identite!
NotificationMailer.send_without_continuation_notification(self).deliver_later
NotificationMailer.send_sans_suite_notification(self).deliver_later
send_dossier_decision_to_experts(self)
log_dossier_operation(instructeur, :classer_sans_suite, self)
end
@ -949,9 +949,9 @@ class Dossier < ApplicationRecord
end
end
def send_dossier_received
def send_dossier_en_instruction
if saved_change_to_state? && en_instruction? && !procedure.declarative_accepte?
NotificationMailer.send_dossier_received(self).deliver_later
NotificationMailer.send_en_instruction_notification(self).deliver_later
end
end

17
app/models/procedure.rb
View file

@ -500,6 +500,23 @@ class Procedure < ApplicationRecord
without_continuation_mail || Mails::WithoutContinuationMail.default_for_procedure(self)
end
def mail_template_for(state)
case state
when Dossier.states.fetch(:en_construction)
initiated_mail_template
when Dossier.states.fetch(:en_instruction)
received_mail_template
when Dossier.states.fetch(:accepte)
closed_mail_template
when Dossier.states.fetch(:refuse)
refused_mail_template
when Dossier.states.fetch(:sans_suite)
without_continuation_mail_template
else
raise "Unknown dossier state: #{state}"
end
end
def self.default_sort
{
'table' => 'self',