Merge pull request #6108 from tchak/enable-user-destruction
Enable user destruction
This commit is contained in:
Paul Chavard
GitHub
commit
71a48c99bb
22 changed files with 246 additions and 157 deletions
|
|
@ -41,7 +41,7 @@ module Manager
|
|||
|
||||
def export_mail_brouillons
|
||||
dossiers = procedure.dossiers.state_brouillon.includes(:user)
|
||||
emails = dossiers.map { |d| d.user.email }.sort.uniq
|
||||
emails = dossiers.map { |dossier| dossier.user_email_for(:display) }.sort.uniq
|
||||
date = Time.zone.now.strftime('%d-%m-%Y')
|
||||
send_data(emails.join("\n"), :filename => "brouillons-#{procedure.id}-au-#{date}.csv")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ module Users
|
|||
|
||||
if passage_en_construction? && errors.blank?
|
||||
@dossier.passer_en_construction!
|
||||
NotificationMailer.send_initiated_notification(@dossier).deliver_later
|
||||
NotificationMailer.send_en_construction_notification(@dossier).deliver_later
|
||||
@dossier.groupe_instructeur.instructeurs.with_instant_email_dossier_notifications.each do |instructeur|
|
||||
DossierMailer.notify_new_dossier_depose_to_instructeur(@dossier, instructeur.email).deliver_later
|
||||
end
|
||||
|
|
|
|||
|
|
@ -54,7 +54,11 @@ module Types
|
|||
end
|
||||
|
||||
def usager
|
||||
Loaders::Record.for(User).load(object.user_id)
|
||||
if object.user_deleted?
|
||||
{ email: object.user_email_for(:display), id: -1 }
|
||||
else
|
||||
Loaders::Record.for(User).load(object.user_id)
|
||||
end
|
||||
end
|
||||
|
||||
def groupe_instructeur
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class DossierMailer < ApplicationMailer
|
|||
|
||||
subject = "Retrouvez votre brouillon pour la démarche « #{dossier.procedure.libelle} »"
|
||||
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user.email, subject: subject) do |format|
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user_email_for(:notification), subject: subject) do |format|
|
||||
format.html { render layout: 'mailers/notifications_layout' }
|
||||
end
|
||||
end
|
||||
|
|
@ -25,7 +25,7 @@ class DossierMailer < ApplicationMailer
|
|||
|
||||
subject = "Nouveau message pour votre dossier nº #{dossier.id} (#{dossier.procedure.libelle})"
|
||||
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user.email, subject: subject) do |format|
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user_email_for(:notification), subject: subject) do |format|
|
||||
format.html { render layout: 'mailers/notifications_layout' }
|
||||
end
|
||||
end
|
||||
|
|
@ -49,7 +49,7 @@ class DossierMailer < ApplicationMailer
|
|||
|
||||
subject = "Votre dossier nº #{@dossier.id} est en train d'être réexaminé"
|
||||
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user.email, subject: subject) do |format|
|
||||
mail(from: NO_REPLY_EMAIL, to: dossier.user_email_for(:notification), subject: subject) do |format|
|
||||
format.html { render layout: 'mailers/notifications_layout' }
|
||||
end
|
||||
end
|
||||
|
|
@ -139,7 +139,7 @@ class DossierMailer < ApplicationMailer
|
|||
@subject = "Attention : votre dossier n'est pas déposé."
|
||||
@dossier = dossier
|
||||
|
||||
mail(to: dossier.user.email, subject: @subject)
|
||||
mail(to: dossier.user_email_for(:notification), subject: @subject)
|
||||
end
|
||||
|
||||
protected
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
# Preview all emails at http://localhost:3000/rails/mailers/new_attestation_mailer
|
||||
class NewAttestationMailer < ApplicationMailer
|
||||
include Rails.application.routes.url_helpers
|
||||
|
||||
def new_attestation(dossier)
|
||||
to = dossier.user.email
|
||||
subject = "Nouvelle attestation pour votre dossier nº #{dossier.id}"
|
||||
|
||||
mail(to: to, subject: subject, body: body(dossier))
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def body(dossier)
|
||||
<<~HEREDOC
|
||||
Bonjour,
|
||||
|
||||
Votre dossier nº #{dossier.id} (démarche "#{dossier.procedure.libelle}") a subi, à un moment, un "aller-retour" :
|
||||
- Acceptation de votre dossier
|
||||
- Passage en instruction du dossier car besoin de le modifier
|
||||
- Seconde acceptation de votre dossier
|
||||
|
||||
Suite à cette opération, l'attestation liée à votre dossier n'a pas été regénérée.
|
||||
Ce problème est désormais reglé, votre nouvelle attestation est disponible à l'adresse suivante :
|
||||
#{attestation_dossier_url(dossier)}
|
||||
|
||||
Cordialement,
|
||||
|
||||
L’équipe #{APPLICATION_NAME}
|
||||
HEREDOC
|
||||
end
|
||||
end
|
||||
|
|
@ -8,54 +8,63 @@
|
|||
class NotificationMailer < ApplicationMailer
|
||||
include ActionView::Helpers::SanitizeHelper
|
||||
|
||||
before_action :set_dossier
|
||||
after_action :create_commentaire_for_notification
|
||||
|
||||
helper ServiceHelper
|
||||
helper MailerHelper
|
||||
|
||||
layout 'mailers/notifications_layout'
|
||||
default from: NO_REPLY_EMAIL
|
||||
|
||||
def send_dossier_received(dossier)
|
||||
send_notification(dossier, dossier.procedure.received_mail_template)
|
||||
def send_notification
|
||||
@service = @dossier.procedure.service
|
||||
@logo_url = attach_logo(@dossier.procedure)
|
||||
@rendered_template = sanitize(@body)
|
||||
|
||||
mail(subject: @subject, to: @email, template_name: 'send_notification')
|
||||
end
|
||||
|
||||
def send_initiated_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.initiated_mail_template)
|
||||
def self.send_en_construction_notification(dossier)
|
||||
with(dossier: dossier, state: Dossier.states.fetch(:en_construction)).send_notification
|
||||
end
|
||||
|
||||
def send_closed_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.closed_mail_template)
|
||||
def self.send_en_instruction_notification(dossier)
|
||||
with(dossier: dossier, state: Dossier.states.fetch(:en_instruction)).send_notification
|
||||
end
|
||||
|
||||
def send_refused_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.refused_mail_template)
|
||||
def self.send_accepte_notification(dossier)
|
||||
with(dossier: dossier, state: Dossier.states.fetch(:accepte)).send_notification
|
||||
end
|
||||
|
||||
def send_without_continuation_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.without_continuation_mail_template)
|
||||
def self.send_refuse_notification(dossier)
|
||||
with(dossier: dossier, state: Dossier.states.fetch(:refuse)).send_notification
|
||||
end
|
||||
|
||||
def self.send_sans_suite_notification(dossier)
|
||||
with(dossier: dossier, state: Dossier.states.fetch(:sans_suite)).send_notification
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def send_notification(dossier, mail_template)
|
||||
email = dossier.user.email
|
||||
def set_dossier
|
||||
@dossier = params[:dossier]
|
||||
|
||||
subject = mail_template.subject_for_dossier(dossier)
|
||||
body = mail_template.body_for_dossier(dossier)
|
||||
if @dossier.user_deleted?
|
||||
mail.perform_deliveries = false
|
||||
else
|
||||
mail_template = @dossier.procedure.mail_template_for(params[:state])
|
||||
|
||||
create_commentaire_for_notification(dossier, subject, body)
|
||||
|
||||
@dossier = dossier
|
||||
@service = dossier.procedure.service
|
||||
@logo_url = attach_logo(dossier.procedure)
|
||||
@rendered_template = sanitize(body)
|
||||
@actions = mail_template.actions_for_dossier(dossier)
|
||||
|
||||
mail(subject: subject, to: email, template_name: 'send_notification')
|
||||
@email = @dossier.user_email_for(:notification)
|
||||
@subject = mail_template.subject_for_dossier(@dossier)
|
||||
@body = mail_template.body_for_dossier(@dossier)
|
||||
@actions = mail_template.actions_for_dossier(@dossier)
|
||||
end
|
||||
end
|
||||
|
||||
def create_commentaire_for_notification(dossier, subject, body)
|
||||
params = { body: ["[#{subject}]", body].join("<br><br>") }
|
||||
commentaire = CommentaireService.build_with_email(CONTACT_EMAIL, dossier, params)
|
||||
def create_commentaire_for_notification
|
||||
body = ["[#{@subject}]", @body].join("<br><br>")
|
||||
commentaire = CommentaireService.build_with_email(CONTACT_EMAIL, @dossier, body: body)
|
||||
commentaire.save!
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
# autorisation_donnees :boolean
|
||||
# brouillon_close_to_expiration_notice_sent_at :datetime
|
||||
# conservation_extension :interval default(0 seconds)
|
||||
# deleted_user_email_never_send :string
|
||||
# en_construction_at :datetime
|
||||
# en_construction_close_to_expiration_notice_sent_at :datetime
|
||||
# en_construction_conservation_extension :interval default(0 seconds)
|
||||
|
|
@ -137,9 +138,9 @@ class Dossier < ApplicationRecord
|
|||
end
|
||||
|
||||
event :repasser_en_instruction, after: :after_repasser_en_instruction do
|
||||
transitions from: :refuse, to: :en_instruction
|
||||
transitions from: :sans_suite, to: :en_instruction
|
||||
transitions from: :accepte, to: :en_instruction
|
||||
transitions from: :refuse, to: :en_instruction, guard: :can_repasser_en_instruction?
|
||||
transitions from: :sans_suite, to: :en_instruction, guard: :can_repasser_en_instruction?
|
||||
transitions from: :accepte, to: :en_instruction, guard: :can_repasser_en_instruction?
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -249,6 +250,7 @@ class Dossier < ApplicationRecord
|
|||
states = opts[:notify_on_closed] ? [:publiee, :close, :depubliee] : [:publiee, :depubliee]
|
||||
joins(:procedure)
|
||||
.where(procedures: { aasm_state: states })
|
||||
.where.not(user_id: nil)
|
||||
end
|
||||
|
||||
scope :brouillon_close_to_expiration, -> do
|
||||
|
|
@ -342,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
|
||||
|
||||
|
|
@ -350,6 +352,22 @@ class Dossier < ApplicationRecord
|
|||
validates :individual, presence: true, if: -> { revision.procedure.for_individual? }
|
||||
validates :groupe_instructeur, presence: true, if: -> { !brouillon? }
|
||||
|
||||
def user_deleted?
|
||||
user_id.nil?
|
||||
end
|
||||
|
||||
def user_email_for(use)
|
||||
if user_deleted?
|
||||
if use == :display
|
||||
deleted_user_email_never_send
|
||||
else
|
||||
raise "Can not send email to discarded user"
|
||||
end
|
||||
else
|
||||
user.email
|
||||
end
|
||||
end
|
||||
|
||||
def motivation
|
||||
return nil if !termine?
|
||||
traitements.any? ? traitements.last.motivation : read_attribute(:motivation)
|
||||
|
|
@ -416,6 +434,10 @@ class Dossier < ApplicationRecord
|
|||
brouillon? && procedure.dossier_can_transition_to_en_construction?
|
||||
end
|
||||
|
||||
def can_repasser_en_instruction?
|
||||
termine? && !user_deleted?
|
||||
end
|
||||
|
||||
def can_be_updated_by_user?
|
||||
brouillon? || en_construction?
|
||||
end
|
||||
|
|
@ -429,7 +451,7 @@ class Dossier < ApplicationRecord
|
|||
end
|
||||
|
||||
def messagerie_available?
|
||||
!brouillon? && !archived
|
||||
!brouillon? && !user_deleted? && !archived
|
||||
end
|
||||
|
||||
def en_construction_close_to_expiration?
|
||||
|
|
@ -590,13 +612,18 @@ class Dossier < ApplicationRecord
|
|||
administration_emails.each do |email|
|
||||
DossierMailer.notify_deletion_to_administration(deleted_dossier, email).deliver_later
|
||||
end
|
||||
DossierMailer.notify_deletion_to_user(deleted_dossier, user.email).deliver_later
|
||||
|
||||
if !user_deleted?
|
||||
DossierMailer.notify_deletion_to_user(deleted_dossier, user_email_for(:notification)).deliver_later
|
||||
end
|
||||
|
||||
log_dossier_operation(author, :supprimer, self)
|
||||
elsif termine?
|
||||
deleted_dossier = DeletedDossier.create_from_dossier(self, reason)
|
||||
|
||||
DossierMailer.notify_instructeur_deletion_to_user(deleted_dossier, user.email).deliver_later
|
||||
if !user_deleted?
|
||||
DossierMailer.notify_instructeur_deletion_to_user(deleted_dossier, user_email_for(:notification)).deliver_later
|
||||
end
|
||||
|
||||
log_dossier_operation(author, :supprimer, self)
|
||||
end
|
||||
|
|
@ -663,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
|
||||
|
|
@ -678,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
|
||||
|
||||
|
|
@ -691,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
|
||||
|
|
@ -705,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
|
||||
|
|
@ -751,7 +778,7 @@ class Dossier < ApplicationRecord
|
|||
def spreadsheet_columns(with_etablissement: false, types_de_champ:, types_de_champ_private:)
|
||||
columns = [
|
||||
['ID', id.to_s],
|
||||
['Email', user.email]
|
||||
['Email', user_email_for(:display)]
|
||||
]
|
||||
|
||||
if procedure.for_individual?
|
||||
|
|
@ -922,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
|
||||
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -170,18 +170,24 @@ class User < ApplicationRecord
|
|||
end
|
||||
|
||||
def can_be_deleted?
|
||||
!administrateur? && !instructeur? && !expert? && dossiers.with_discarded.state_instruction_commencee.empty?
|
||||
!administrateur? && !instructeur? && !expert?
|
||||
end
|
||||
|
||||
def delete_and_keep_track_dossiers(administration)
|
||||
if !can_be_deleted?
|
||||
raise "Cannot delete this user because instruction has started for some dossiers"
|
||||
raise "Cannot delete this user because they are also instructeur, expert or administrateur"
|
||||
end
|
||||
|
||||
dossiers.each do |dossier|
|
||||
Invite.where(dossier: dossiers.with_discarded).destroy_all
|
||||
dossiers.state_en_construction.each do |dossier|
|
||||
dossier.discard_and_keep_track!(administration, :user_removed)
|
||||
end
|
||||
dossiers.with_discarded.destroy_all
|
||||
DossierOperationLog
|
||||
.where(dossier: dossiers.with_discarded.discarded)
|
||||
.where.not(operation: DossierOperationLog.operations.fetch(:supprimer))
|
||||
.destroy_all
|
||||
dossiers.with_discarded.discarded.destroy_all
|
||||
dossiers.update_all(deleted_user_email_never_send: email, user_id: nil)
|
||||
destroy!
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ def add_message(pdf, message)
|
|||
if message.sent_by_system?
|
||||
sender = 'Email automatique'
|
||||
elsif message.sent_by?(@dossier.user)
|
||||
sender = @dossier.user.email
|
||||
sender = @dossier.user_email_for(:display)
|
||||
end
|
||||
|
||||
format_in_2_lines(pdf, "#{sender}, #{try_format_date(message.created_at)}",
|
||||
|
|
@ -233,7 +233,7 @@ prawn_document(page_size: "A4") do |pdf|
|
|||
format_in_2_columns(pdf, 'Informations France Connect', "Le dossier a été déposé par le compte de #{@dossier.france_connect_information.given_name} #{@dossier.france_connect_information.family_name}, authentifié par France Connect le #{@dossier.france_connect_information.updated_at.strftime('%d/%m/%Y')}")
|
||||
end
|
||||
|
||||
format_in_2_columns(pdf, "Email", @dossier.user.email)
|
||||
format_in_2_columns(pdf, "Email", @dossier.user_email_for(:display))
|
||||
|
||||
if @dossier.individual.present?
|
||||
add_identite_individual(pdf, @dossier.individual)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
= link_to(instructeur_avis_path(avis.procedure, avis), class: 'cell-link') do
|
||||
%span.icon.folder
|
||||
#{avis.dossier.id}
|
||||
%td= link_to(avis.dossier.user.email, instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
%td= link_to(avis.dossier.user_email_for(:display), instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
%td= link_to(avis.procedure.libelle, instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
= paginate(@avis)
|
||||
- else
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
= link_to(instructeur_avis_path(avis.procedure, avis), class: 'cell-link') do
|
||||
%span.icon.folder
|
||||
#{avis.dossier.id}
|
||||
%td= link_to(avis.dossier.user.email, instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
%td= link_to(avis.dossier.user_email_for(:display), instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
%td= link_to(avis.procedure.libelle, instructeur_avis_path(avis.procedure, avis), class: 'cell-link')
|
||||
= paginate(@avis)
|
||||
- else
|
||||
|
|
|
|||
|
|
@ -99,17 +99,24 @@
|
|||
%h4 Voir l’attestation
|
||||
%p Cette attestation a été envoyée automatiquement au demandeur.
|
||||
|
||||
%li
|
||||
= link_to repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), method: :post, data: { remote:true, confirm: "Voulez vous remettre le dossier #{dossier.id} en instruction ?" } do
|
||||
%span.icon.in-progress
|
||||
.dropdown-description
|
||||
%h4 Repasser en instruction
|
||||
L’usager sera notifié que son dossier est réexaminé.
|
||||
- if dossier.termine?
|
||||
- if dossier.can_repasser_en_instruction?
|
||||
%li
|
||||
= link_to supprimer_dossier_instructeur_dossier_path(dossier.procedure, dossier), method: :patch, data: { confirm: "Voulez vous vraiment supprimer le dossier #{dossier.id} ? Cette action est irréversible. \nNous vous suggérons de télécharger le dossier au format PDF au préalable." } do
|
||||
%span.icon.delete
|
||||
= link_to repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), method: :post, data: { remote:true, confirm: "Voulez vous remettre le dossier #{dossier.id} en instruction ?" } do
|
||||
%span.icon.in-progress
|
||||
.dropdown-description
|
||||
%h4 Supprimer le dossier
|
||||
L’usager sera notifié que son dossier est supprimé.
|
||||
%h4 Repasser en instruction
|
||||
L’usager sera notifié que son dossier est réexaminé.
|
||||
- elsif dossier.user_deleted?
|
||||
%li
|
||||
%span.icon.info
|
||||
.dropdown-description
|
||||
%h4 En attente d‘archivage
|
||||
L'usager a supprimé son compte. Vous pouvez archiver puis supprimer le dossier.
|
||||
|
||||
%li
|
||||
= link_to supprimer_dossier_instructeur_dossier_path(dossier.procedure, dossier), method: :patch, data: { confirm: "Voulez vous vraiment supprimer le dossier #{dossier.id} ? Cette action est irréversible. \nNous vous suggérons de télécharger le dossier au format PDF au préalable." } do
|
||||
%span.icon.delete
|
||||
.dropdown-description
|
||||
%h4 Supprimer le dossier
|
||||
L’usager sera notifié que son dossier est supprimé.
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
= link_to(dossier_linked_path(current_instructeur, dossier), class: 'cell-link') do
|
||||
= dossier.id
|
||||
%td= link_to(dossier.procedure.libelle, dossier_linked_path(current_instructeur, dossier), class: 'cell-link')
|
||||
%td= link_to(dossier.user.email, dossier_linked_path(current_instructeur, dossier), class: 'cell-link')
|
||||
%td= link_to(dossier.user_email_for(:display), dossier_linked_path(current_instructeur, dossier), class: 'cell-link')
|
||||
%td.status-col
|
||||
= link_to(dossier_linked_path(current_instructeur, dossier), class: 'cell-link') do
|
||||
= status_badge(dossier.state)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
class AddDeletedUserEmailNeverSendToDossiers < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :dossiers, :deleted_user_email_never_send, :string
|
||||
end
|
||||
end
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 2021_04_28_104228) do
|
||||
ActiveRecord::Schema.define(version: 2021_04_28_114228) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
|
@ -275,6 +275,7 @@ ActiveRecord::Schema.define(version: 2021_04_28_104228) do
|
|||
t.datetime "last_commentaire_updated_at"
|
||||
t.string "api_entreprise_job_exceptions", array: true
|
||||
t.interval "conservation_extension", default: "PT0S"
|
||||
t.string "deleted_user_email_never_send"
|
||||
t.index "to_tsvector('french'::regconfig, (search_terms || private_search_terms))", name: "index_dossiers_on_search_terms_private_search_terms", using: :gin
|
||||
t.index "to_tsvector('french'::regconfig, search_terms)", name: "index_dossiers_on_search_terms", using: :gin
|
||||
t.index ["archived"], name: "index_dossiers_on_archived"
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ describe Instructeurs::DossiersController, type: :controller do
|
|||
end
|
||||
|
||||
it 'Notification email is sent' do
|
||||
expect(NotificationMailer).to receive(:send_refused_notification)
|
||||
expect(NotificationMailer).to receive(:send_refuse_notification)
|
||||
.with(dossier).and_return(NotificationMailer)
|
||||
expect(NotificationMailer).to receive(:deliver_later)
|
||||
|
||||
|
|
@ -250,7 +250,7 @@ describe Instructeurs::DossiersController, type: :controller do
|
|||
end
|
||||
|
||||
it 'Notification email is sent' do
|
||||
expect(NotificationMailer).to receive(:send_without_continuation_notification)
|
||||
expect(NotificationMailer).to receive(:send_sans_suite_notification)
|
||||
.with(dossier).and_return(NotificationMailer)
|
||||
expect(NotificationMailer).to receive(:deliver_later)
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ describe Instructeurs::DossiersController, type: :controller do
|
|||
dossier.passer_en_instruction!(instructeur)
|
||||
sign_in(instructeur.user)
|
||||
|
||||
expect(NotificationMailer).to receive(:send_closed_notification)
|
||||
expect(NotificationMailer).to receive(:send_accepte_notification)
|
||||
.with(dossier)
|
||||
.and_return(NotificationMailer)
|
||||
|
||||
|
|
|
|||
|
|
@ -476,12 +476,12 @@ describe Users::DossiersController, type: :controller do
|
|||
delivery = double
|
||||
expect(delivery).to receive(:deliver_later).with(no_args)
|
||||
|
||||
expect(NotificationMailer).to receive(:send_initiated_notification)
|
||||
expect(NotificationMailer).to receive(:send_en_construction_notification)
|
||||
.and_return(delivery)
|
||||
|
||||
subject
|
||||
|
||||
expect(NotificationMailer).not_to receive(:send_initiated_notification)
|
||||
expect(NotificationMailer).not_to receive(:send_en_construction_notification)
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
@ -499,7 +499,7 @@ describe Users::DossiersController, type: :controller do
|
|||
it { expect(flash.alert).to eq(['nop']) }
|
||||
|
||||
it 'does not send an email' do
|
||||
expect(NotificationMailer).not_to receive(:send_initiated_notification)
|
||||
expect(NotificationMailer).not_to receive(:send_en_construction_notification)
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
@ -687,7 +687,7 @@ describe Users::DossiersController, type: :controller do
|
|||
end
|
||||
|
||||
it 'does not send an email' do
|
||||
expect(NotificationMailer).not_to receive(:send_initiated_notification)
|
||||
expect(NotificationMailer).not_to receive(:send_en_construction_notification)
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
RSpec.describe NotificationMailer, type: :mailer do
|
||||
let(:administrateur) { create(:administrateur) }
|
||||
let(:user) { create(:user) }
|
||||
let(:procedure) { create(:simple_procedure) }
|
||||
let(:dossier) { create(:dossier, :en_construction, :with_individual, :with_service, user: user, procedure: procedure) }
|
||||
|
||||
describe '.send_dossier_received' do
|
||||
describe 'send_en_instruction_notification' do
|
||||
let(:dossier) { create(:dossier, :en_construction, :with_individual, :with_service, user: user, procedure: procedure) }
|
||||
let(:email_template) { create(:received_mail, subject: 'Email subject', body: 'Your dossier was processed. Thanks.') }
|
||||
|
||||
before do
|
||||
dossier.procedure.received_mail = email_template
|
||||
end
|
||||
|
||||
subject(:mail) { described_class.send_dossier_received(dossier) }
|
||||
subject(:mail) { described_class.send_en_instruction_notification(dossier) }
|
||||
|
||||
it 'creates a commentaire in the messagerie' do
|
||||
expect { subject.deliver_now }.to change { Commentaire.count }.by(1)
|
||||
expect(subject.perform_deliveries).to be_truthy
|
||||
|
||||
commentaire = Commentaire.last
|
||||
expect(commentaire.body).to include(email_template.subject_for_dossier(dossier), email_template.body_for_dossier(dossier))
|
||||
|
|
@ -59,4 +61,27 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
expect(subject.from.first).to eq(Mail::Address.new(NO_REPLY_EMAIL).address)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'send_accepte_notification' do
|
||||
let(:dossier) { create(:dossier, :en_instruction, :with_individual, :with_service, user: user, procedure: procedure) }
|
||||
let(:email_template) { create(:closed_mail, subject: 'Email subject', body: 'Your dossier was accepted. Thanks.') }
|
||||
|
||||
before do
|
||||
dossier.procedure.closed_mail = email_template
|
||||
end
|
||||
|
||||
subject(:mail) { described_class.send_accepte_notification(dossier) }
|
||||
|
||||
context 'when dossier user is deleted' do
|
||||
before do
|
||||
dossier.user.delete_and_keep_track_dossiers(administrateur)
|
||||
dossier.reload
|
||||
end
|
||||
|
||||
it 'should not send notification' do
|
||||
expect { subject.deliver_now }.not_to change { Commentaire.count }
|
||||
expect(subject.perform_deliveries).to be_falsey
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,23 +1,36 @@
|
|||
class NotificationMailerPreview < ActionMailer::Preview
|
||||
def send_initiated_notification
|
||||
p = Procedure.where(id: Mails::InitiatedMail.where("body like ?", "%<img%").pluck(:procedure_id).uniq).order("RANDOM()").first
|
||||
NotificationMailer.send_initiated_notification(p.dossiers.last)
|
||||
def send_en_construction_notification
|
||||
NotificationMailer.send_en_construction_notification(dossier_with_image)
|
||||
end
|
||||
|
||||
def send_dossier_received
|
||||
NotificationMailer.send_dossier_received(Dossier.last)
|
||||
def send_en_instruction_notification
|
||||
NotificationMailer.send_en_instruction_notification(dossier)
|
||||
end
|
||||
|
||||
def send_closed_notification
|
||||
NotificationMailer.send_closed_notification(Dossier.last)
|
||||
def send_accepte_notification
|
||||
NotificationMailer.send_accepte_notification(dossier)
|
||||
end
|
||||
|
||||
def send_refused_notification
|
||||
dossier = Dossier.last.tap { |d| d.assign_attributes(motivation: 'Le montant demandé dépasse le plafond autorisé') }
|
||||
NotificationMailer.send_refused_notification(dossier)
|
||||
def send_refuse_notification
|
||||
NotificationMailer.send_refuse_notification(dossier_with_motivation)
|
||||
end
|
||||
|
||||
def send_without_continuation_notification
|
||||
NotificationMailer.send_without_continuation_notification(Dossier.last)
|
||||
def send_sans_suite_notification
|
||||
NotificationMailer.send_sans_suite_notification(dossier)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def dossier
|
||||
Dossier.last
|
||||
end
|
||||
|
||||
def dossier_with_image
|
||||
procedure = Procedure.where(id: Mails::InitiatedMail.where("body like ?", "%<img%").pluck(:procedure_id).uniq).order("RANDOM()").first
|
||||
procedure.dossiers.last
|
||||
end
|
||||
|
||||
def dossier_with_motivation
|
||||
Dossier.last.tap { |d| d.assign_attributes(motivation: 'Le montant demandé dépasse le plafond autorisé') }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -512,17 +512,17 @@ describe Dossier do
|
|||
let(:instructeur) { create(:instructeur) }
|
||||
|
||||
before do
|
||||
allow(NotificationMailer).to receive(:send_dossier_received).and_return(double(deliver_later: nil))
|
||||
allow(NotificationMailer).to receive(:send_en_instruction_notification).and_return(double(deliver_later: nil))
|
||||
end
|
||||
|
||||
it "sends an email when the dossier becomes en_instruction" do
|
||||
dossier.passer_en_instruction!(instructeur)
|
||||
expect(NotificationMailer).to have_received(:send_dossier_received).with(dossier)
|
||||
expect(NotificationMailer).to have_received(:send_en_instruction_notification).with(dossier)
|
||||
end
|
||||
|
||||
it "does not an email when the dossier becomes accepte" do
|
||||
dossier.accepte!
|
||||
expect(NotificationMailer).to_not have_received(:send_dossier_received)
|
||||
expect(NotificationMailer).to_not have_received(:send_en_instruction_notification)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -935,7 +935,7 @@ describe Dossier do
|
|||
let(:attestation) { Attestation.new }
|
||||
|
||||
before do
|
||||
allow(NotificationMailer).to receive(:send_closed_notification).and_return(double(deliver_later: true))
|
||||
allow(NotificationMailer).to receive(:send_accepte_notification).and_return(double(deliver_later: true))
|
||||
allow(dossier).to receive(:build_attestation).and_return(attestation)
|
||||
|
||||
Timecop.freeze(now)
|
||||
|
|
@ -957,7 +957,7 @@ describe Dossier do
|
|||
it { expect(operation_serialized['operation']).to eq('accepter') }
|
||||
it { expect(operation_serialized['dossier_id']).to eq(dossier.id) }
|
||||
it { expect(operation_serialized['executed_at']).to eq(last_operation.executed_at.iso8601) }
|
||||
it { expect(NotificationMailer).to have_received(:send_closed_notification).with(dossier) }
|
||||
it { expect(NotificationMailer).to have_received(:send_accepte_notification).with(dossier) }
|
||||
it { expect(dossier.attestation).to eq(attestation) }
|
||||
end
|
||||
|
||||
|
|
@ -968,7 +968,7 @@ describe Dossier do
|
|||
let(:attestation) { Attestation.new }
|
||||
|
||||
before do
|
||||
allow(NotificationMailer).to receive(:send_closed_notification).and_return(double(deliver_later: true))
|
||||
allow(NotificationMailer).to receive(:send_accepte_notification).and_return(double(deliver_later: true))
|
||||
allow(dossier).to receive(:build_attestation).and_return(attestation)
|
||||
|
||||
Timecop.freeze(now)
|
||||
|
|
@ -984,7 +984,7 @@ describe Dossier do
|
|||
it { expect(dossier.state).to eq('accepte') }
|
||||
it { expect(last_operation.operation).to eq('accepter') }
|
||||
it { expect(last_operation.automatic_operation?).to be_truthy }
|
||||
it { expect(NotificationMailer).to have_received(:send_closed_notification).with(dossier) }
|
||||
it { expect(NotificationMailer).to have_received(:send_accepte_notification).with(dossier) }
|
||||
it { expect(dossier.attestation).to eq(attestation) }
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -263,13 +263,16 @@ describe User, type: :model do
|
|||
|
||||
describe '#can_be_deleted?' do
|
||||
let(:user) { create(:user) }
|
||||
let(:administrateur) { create(:administrateur) }
|
||||
let(:instructeur) { create(:instructeur) }
|
||||
let(:expert) { create(:expert) }
|
||||
|
||||
subject { user.can_be_deleted? }
|
||||
|
||||
context 'when the user has a dossier in instruction' do
|
||||
let!(:dossier) { create(:dossier, :en_instruction, user: user) }
|
||||
|
||||
it { is_expected.to be false }
|
||||
it { is_expected.to be true }
|
||||
end
|
||||
|
||||
context 'when the user has no dossier in instruction' do
|
||||
|
|
@ -278,19 +281,19 @@ describe User, type: :model do
|
|||
|
||||
context 'when the user is an administrateur' do
|
||||
it 'cannot be deleted' do
|
||||
administrateur = create(:administrateur)
|
||||
user = administrateur.user
|
||||
|
||||
expect(user.can_be_deleted?).to be_falsy
|
||||
expect(administrateur.user.can_be_deleted?).to be_falsy
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the user is an instructeur' do
|
||||
it 'cannot be deleted' do
|
||||
instructeur = create(:instructeur)
|
||||
user = instructeur.user
|
||||
expect(instructeur.user.can_be_deleted?).to be_falsy
|
||||
end
|
||||
end
|
||||
|
||||
expect(user.can_be_deleted?).to be_falsy
|
||||
context 'when the user is an expert' do
|
||||
it 'cannot be deleted' do
|
||||
expect(expert.user.can_be_deleted?).to be_falsy
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -299,14 +302,7 @@ describe User, type: :model do
|
|||
let(:super_admin) { create(:super_admin) }
|
||||
let(:user) { create(:user) }
|
||||
|
||||
context 'with a dossier in instruction' do
|
||||
let!(:dossier_en_instruction) { create(:dossier, :en_instruction, user: user) }
|
||||
it 'raises' do
|
||||
expect { user.delete_and_keep_track_dossiers(super_admin) }.to raise_error(RuntimeError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'without a dossier in instruction' do
|
||||
context 'without a dossier with processing strted' do
|
||||
let!(:dossier_en_construction) { create(:dossier, :en_construction, user: user) }
|
||||
let!(:dossier_brouillon) { create(:dossier, user: user) }
|
||||
|
||||
|
|
@ -321,28 +317,39 @@ describe User, type: :model do
|
|||
end
|
||||
|
||||
context 'with a discarded dossier' do
|
||||
let!(:dossier_cache) do
|
||||
create(:dossier, :en_construction, user: user)
|
||||
end
|
||||
let!(:dossier_from_another_user) do
|
||||
create(:dossier, :en_construction, user: create(:user))
|
||||
end
|
||||
let(:dossier_to_discard) { create(:dossier, :en_construction, user: user) }
|
||||
let!(:dossier_from_another_user) { create(:dossier, :en_construction, user: create(:user)) }
|
||||
|
||||
it "keep track of dossiers and delete user" do
|
||||
dossier_cache.discard_and_keep_track!(super_admin, :user_request)
|
||||
dossier_to_discard.discard_and_keep_track!(super_admin, :user_request)
|
||||
user.delete_and_keep_track_dossiers(super_admin)
|
||||
|
||||
expect(DeletedDossier.find_by(dossier_id: dossier_en_construction)).to be_present
|
||||
expect(DeletedDossier.find_by(dossier_id: dossier_brouillon)).to be_nil
|
||||
expect(Dossier.find_by(id: dossier_from_another_user.id)).to be_present
|
||||
expect(User.find_by(id: user.id)).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it "doesn't destroy dossiers of another user" do
|
||||
dossier_cache.discard_and_keep_track!(super_admin, :user_request)
|
||||
user.delete_and_keep_track_dossiers(super_admin)
|
||||
context 'with dossiers with processing strted' do
|
||||
let!(:dossier_en_instruction) { create(:dossier, :en_instruction, user: user) }
|
||||
let!(:dossier_termine) { create(:dossier, :accepte, user: user) }
|
||||
|
||||
expect(Dossier.find_by(id: dossier_from_another_user.id)).to be_present
|
||||
end
|
||||
it "keep track of dossiers and delete user" do
|
||||
user.delete_and_keep_track_dossiers(super_admin)
|
||||
|
||||
expect(dossier_en_instruction.reload).to be_present
|
||||
expect(dossier_en_instruction.user).to be_nil
|
||||
expect(dossier_en_instruction.user_email_for(:display)).to eq(user.email)
|
||||
expect { dossier_en_instruction.user_email_for(:notification) }.to raise_error(RuntimeError)
|
||||
|
||||
expect(dossier_termine.reload).to be_present
|
||||
expect(dossier_termine.user).to be_nil
|
||||
expect(dossier_termine.user_email_for(:display)).to eq(user.email)
|
||||
expect { dossier_termine.user_email_for(:notification) }.to raise_error(RuntimeError)
|
||||
|
||||
expect(User.find_by(id: user.id)).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue