From ec07ced9682ec8a06a395276ab7572d76caf222d Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Thu, 31 Mar 2022 15:33:24 +0200 Subject: [PATCH 1/5] modify avis controller --- app/controllers/experts/avis_controller.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/experts/avis_controller.rb b/app/controllers/experts/avis_controller.rb index 393a18fae..a943523ad 100644 --- a/app/controllers/experts/avis_controller.rb +++ b/app/controllers/experts/avis_controller.rb @@ -6,7 +6,7 @@ module Experts before_action :authenticate_expert!, except: [:sign_up, :update_expert] before_action :check_if_avis_revoked, only: [:show] before_action :redirect_if_no_sign_up_needed, only: [:sign_up, :update_expert] - before_action :set_avis_and_dossier, only: [:show, :instruction, :messagerie, :create_commentaire, :update, :telecharger_pjs] + before_action :set_avis_and_dossier, only: [:show, :instruction, :messagerie, :create_commentaire, :delete_commentaire, :update, :telecharger_pjs] A_DONNER_STATUS = 'a-donner' DONNES_STATUS = 'donnes' @@ -113,6 +113,22 @@ module Experts end end + def delete_commentaire + commentaire = avis.dossier.commentaires.find(params[:commentaire]) + if commentaire.sent_by?(current_expert) + commentaire.piece_jointe.purge_later if commentaire.piece_jointe.attached? + commentaire.discard! + commentaire.update!(body: '') + flash[:notice] = t('views.shared.commentaires.destroy.notice') + else + flash[:alert] = I18n.t('views.shared.commentaires.destroy.alert_reasons.acl') + end + redirect_to(messagerie_expert_avis_path(avis.procedure, avis)) + rescue Discard::RecordNotDiscarded + flash[:alert] = I18n.t('views.shared.commentaires.destroy.alert_reasons.already_discarded') + redirect_to(messagerie_expert_avis_path(avis.procedure, avis)) + end + def bilans_bdf if avis.dossier.etablissement&.entreprise_bilans_bdf.present? extension = params[:format] From e06215281a4da87b556397490405159ee5b0fac1 Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Thu, 31 Mar 2022 15:33:37 +0200 Subject: [PATCH 2/5] modify commentaire model --- app/models/commentaire.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/commentaire.rb b/app/models/commentaire.rb index 76cb151cf..61a48be6d 100644 --- a/app/models/commentaire.rb +++ b/app/models/commentaire.rb @@ -80,7 +80,7 @@ class Commentaire < ApplicationRecord end def soft_deletable?(connected_user) - sent_by?(connected_user) && sent_by_instructeur? && !discarded? + sent_by?(connected_user) && (sent_by_instructeur? || sent_by_expert?) && !discarded? end def file_url @@ -97,10 +97,8 @@ class Commentaire < ApplicationRecord # - If a user or an invited user posted a commentaire, do nothing, # the notification system will properly # - Otherwise, a instructeur posted a commentaire, we need to notify the user - if sent_by_instructeur? + if sent_by_instructeur? || sent_by_expert? notify_user(wait: 5.minutes) - elsif sent_by_expert? - notify_user end end From 10aa9fa4be99254d4267144e10c7134f30ba0654 Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Thu, 31 Mar 2022 15:33:45 +0200 Subject: [PATCH 3/5] layout --- app/views/shared/dossiers/messages/_message.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shared/dossiers/messages/_message.html.haml b/app/views/shared/dossiers/messages/_message.html.haml index 3a84c9b91..dececc1b6 100644 --- a/app/views/shared/dossiers/messages/_message.html.haml +++ b/app/views/shared/dossiers/messages/_message.html.haml @@ -12,7 +12,8 @@ .message-extras.flex.justify-start - if commentaire.soft_deletable?(connected_user) - = button_to instructeur_commentaire_path(commentaire.dossier.procedure, commentaire.dossier, commentaire), method: :delete, class: 'button danger', data: { confirm: t('views.shared.commentaires.destroy.confirm') } do + - path = connected_user.is_a?(Instructeur) ? instructeur_commentaire_path(commentaire.dossier.procedure, commentaire.dossier, commentaire) : delete_commentaire_expert_avis_path(@avis.procedure, @avis, commentaire: commentaire) + = button_to path, method: :delete, class: 'button danger', data: { confirm: t('views.shared.commentaires.destroy.confirm') } do %span.icon.delete = t('views.shared.commentaires.destroy.button') From 1646448629e99ced81bd444ea2c0c5be02c49d7a Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Thu, 31 Mar 2022 15:33:52 +0200 Subject: [PATCH 4/5] routes --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 089653643..4dcfbe044 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -310,6 +310,7 @@ Rails.application.routes.draw do get 'instruction' get 'messagerie' post 'commentaire' => 'avis#create_commentaire' + delete 'delete_commentaire' => 'avis#delete_commentaire' post 'avis' => 'avis#create_avis' get 'bilans_bdf' get 'telecharger_pjs' => 'avis#telecharger_pjs' From b2bcc34cfdb2cea75442675bed236f2b22277941 Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Thu, 31 Mar 2022 15:33:59 +0200 Subject: [PATCH 5/5] tests --- spec/models/commentaire_spec.rb | 4 +- .../messages/message.html.haml_spec.rb | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/spec/models/commentaire_spec.rb b/spec/models/commentaire_spec.rb index 8dd899acc..c1693caa3 100644 --- a/spec/models/commentaire_spec.rb +++ b/spec/models/commentaire_spec.rb @@ -95,8 +95,8 @@ describe Commentaire do context "with a commentaire created by an expert" do let(:commentaire) { CommentaireService.build(expert, dossier, body: "Mon commentaire") } - it "calls notify_user" do - expect(commentaire).to receive(:notify_user).with(no_args) + it "calls notify_user with delay so expert can destroy his comment in case of failure" do + expect(commentaire).to receive(:notify_user).with(wait: 5.minutes) commentaire.save end end diff --git a/spec/views/shared/dossiers/messages/message.html.haml_spec.rb b/spec/views/shared/dossiers/messages/message.html.haml_spec.rb index 00744a27a..106b11178 100644 --- a/spec/views/shared/dossiers/messages/message.html.haml_spec.rb +++ b/spec/views/shared/dossiers/messages/message.html.haml_spec.rb @@ -86,4 +86,51 @@ describe 'shared/dossiers/messages/message.html.haml', type: :view do end end end + + context 'with an expert message' do + describe 'delete message button for expert' do + let(:expert) { create(:expert) } + let(:procedure) { create(:procedure) } + let(:dossier) { create(:dossier, :en_construction, commentaires: [commentaire], procedure: procedure) } + let(:experts_procedure) { create(:experts_procedure, procedure: procedure, expert: expert) } + let!(:avis) { create(:avis, email: nil, experts_procedure: experts_procedure) } + subject { render 'shared/dossiers/messages/message.html.haml', commentaire: commentaire, messagerie_seen_at: seen_at, connected_user: expert, show_reply_button: true } + let(:form_url) { delete_commentaire_expert_avis_path(avis.procedure, avis, commentaire: commentaire) } + + before do + assign(:avis, avis) + end + + context 'on a procedure where commentaire had been written by connected expert' do + let(:commentaire) { create(:commentaire, expert: expert, body: 'Second message') } + + it { is_expected.to have_selector("form[action=\"#{form_url}\"]") } + end + + context 'on a procedure where commentaire had been written by connected expert and discarded' do + let(:commentaire) { create(:commentaire, expert: expert, body: 'Second message', discarded_at: 2.days.ago) } + + it { is_expected.not_to have_selector("form[action=\"#{form_url}\"]") } + it { is_expected.not_to have_selector(".rich-text", text: I18n.t(t('views.shared.commentaires.destroy.deleted_body'))) } + end + + context 'on a procedure where commentaire had been written by connected an user' do + let(:commentaire) { create(:commentaire, email: create(:user).email, body: 'Second message') } + + it { is_expected.not_to have_selector("form[action=\"#{form_url}\"]") } + end + + context 'on a procedure where commentaire had been written by connected an instructeur' do + let(:commentaire) { create(:commentaire, instructeur: create(:instructeur), body: 'Second message') } + + it { is_expected.not_to have_selector("form[action=\"#{form_url}\"]") } + end + + context 'on a procedure where commentaire had been written another expert' do + let(:commentaire) { create(:commentaire, expert: create(:expert), body: 'Second message') } + + it { is_expected.not_to have_selector("form[action=\"#{form_url}\"]") } + end + end + end end