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

Move email sending in delete method

Browse source
This commit is contained in:
Mathieu Magnin 2018-06-13 13:59:02 +02:00
parent e05fb2d0ae
commit 89f82ba92e
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/new_user/dossiers_controller.rb
View file

@ -103,9 +103,7 @@ module NewUser
dossier = current_user.dossiers.includes(:user, procedure: :administrateur).find(params[:id]) dossier = current_user.dossiers.includes(:user, procedure: :administrateur).find(params[:id])
if !dossier.instruction_commencee? if !dossier.instruction_commencee?
deleted_dossier = dossier.delete_and_keep_track dossier.delete_and_keep_track
DossierMailer.notify_deletion_to_user(deleted_dossier, dossier.user.email).deliver_later
DossierMailer.notify_deletion_to_administration(deleted_dossier, dossier.procedure.administrateur.email).deliver_later
flash.notice = 'Votre dossier a bien été supprimé.' flash.notice = 'Votre dossier a bien été supprimé.'
redirect_to users_dossiers_path redirect_to users_dossiers_path
else else

3
app/models/dossier.rb
View file

@ -280,7 +280,8 @@ class Dossier < ApplicationRecord
now = Time.now now = Time.now
deleted_dossier = DeletedDossier.create!(dossier_id: id, procedure: procedure, state: state, deleted_at: now) deleted_dossier = DeletedDossier.create!(dossier_id: id, procedure: procedure, state: state, deleted_at: now)
update(hidden_at: now) update(hidden_at: now)
deleted_dossier DossierMailer.notify_deletion_to_user(deleted_dossier, user.email).deliver_later
DossierMailer.notify_deletion_to_administration(deleted_dossier, procedure.administrateur.email).deliver_later
end end
private private