Add Commentaire#notify to dispatch notifications
This commit is contained in:
parent
1235fce34a
commit
8a5420301c
3 changed files with 100 additions and 8 deletions
|
@ -4,8 +4,7 @@ class Commentaire < ActiveRecord::Base
|
||||||
|
|
||||||
belongs_to :piece_justificative
|
belongs_to :piece_justificative
|
||||||
|
|
||||||
after_save :notify_gestionnaires
|
after_create :notify
|
||||||
after_save :notify_user
|
|
||||||
|
|
||||||
def header
|
def header
|
||||||
"#{email}, " + I18n.l(created_at.localtime, format: '%d %b %Y %H:%M')
|
"#{email}, " + I18n.l(created_at.localtime, format: '%d %b %Y %H:%M')
|
||||||
|
@ -13,15 +12,32 @@ class Commentaire < ActiveRecord::Base
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def notify_gestionnaires
|
def notify
|
||||||
if email == dossier.user.email || dossier.invites_user.pluck(:email).to_a.include?(email)
|
dossier_user_email = dossier.user.email
|
||||||
NotificationService.new('commentaire', self.dossier.id).notify
|
invited_users_emails = dossier.invites_user.pluck(:email).to_a
|
||||||
|
|
||||||
|
case email
|
||||||
|
when "contact@tps.apientreprise.fr"
|
||||||
|
# The commentaire is a copy of an automated notification email
|
||||||
|
# we sent to a user, so do nothing
|
||||||
|
when dossier_user_email, *invited_users_emails
|
||||||
|
# A user or an inved user posted a commentaire,
|
||||||
|
# we need to notify the gestionnaires
|
||||||
|
|
||||||
|
notify_gestionnaires
|
||||||
|
else
|
||||||
|
# A gestionnaire posted a commentaire,
|
||||||
|
# we need to notify the user
|
||||||
|
|
||||||
|
notify_user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def notify_gestionnaires
|
||||||
|
NotificationService.new('commentaire', self.dossier.id).notify
|
||||||
|
end
|
||||||
|
|
||||||
def notify_user
|
def notify_user
|
||||||
if email != dossier.user.email && email != 'contact@tps.apientreprise.fr'
|
|
||||||
NotificationMailer.new_answer(dossier).deliver_now!
|
NotificationMailer.new_answer(dossier).deliver_now!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
24
spec/factories/invite_user.rb
Normal file
24
spec/factories/invite_user.rb
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
FactoryGirl.define do
|
||||||
|
factory :invite_user do
|
||||||
|
email 'plop@octo.com'
|
||||||
|
|
||||||
|
after(:build) do |invite, _evaluator|
|
||||||
|
if invite.dossier.nil?
|
||||||
|
invite.dossier = create(:dossier)
|
||||||
|
end
|
||||||
|
|
||||||
|
unless invite.user.nil?
|
||||||
|
invite.email = invite.user.email
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
trait :with_user do
|
||||||
|
after(:build) do |invite, _evaluator|
|
||||||
|
if invite.user.nil?
|
||||||
|
invite.user = create(:user)
|
||||||
|
invite.email = invite.user.email
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -8,4 +8,56 @@ describe Commentaire do
|
||||||
it { is_expected.to belong_to(:dossier) }
|
it { is_expected.to belong_to(:dossier) }
|
||||||
|
|
||||||
it { is_expected.to belong_to(:piece_justificative) }
|
it { is_expected.to belong_to(:piece_justificative) }
|
||||||
|
|
||||||
|
describe "#notify" do
|
||||||
|
let(:procedure) { create(:procedure) }
|
||||||
|
let(:gestionnaire) { create(:gestionnaire) }
|
||||||
|
let(:assign_to) { create(:assign_to, gestionnaire: gestionnaire, procedure: procedure) }
|
||||||
|
let(:user) { create(:user) }
|
||||||
|
let(:dossier) { create(:dossier, procedure: procedure, user: user) }
|
||||||
|
let(:commentaire) { Commentaire.new(dossier: dossier) }
|
||||||
|
|
||||||
|
context "with a commentaire created by a user" do
|
||||||
|
it "calls notify_gestionnaires" do
|
||||||
|
expect(commentaire).to receive(:notify_gestionnaires)
|
||||||
|
|
||||||
|
commentaire.email = user.email
|
||||||
|
commentaire.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a commentaire created by an invited user" do
|
||||||
|
let(:user_invite) { create(:user) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
FactoryGirl.create(:invite_user, email: "invite@tps.apientreprise.fr", dossier: dossier, user: user_invite)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "calls notify_gestionnaires" do
|
||||||
|
expect(commentaire).to receive(:notify_gestionnaires)
|
||||||
|
|
||||||
|
commentaire.email = user_invite.email
|
||||||
|
commentaire.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a commentaire created by a gestionnaire" do
|
||||||
|
it "calls notify_user" do
|
||||||
|
expect(commentaire).to receive(:notify_user)
|
||||||
|
|
||||||
|
commentaire.email = gestionnaire.email
|
||||||
|
commentaire.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a commentaire automatically created (notification)" do
|
||||||
|
it "does not call notify_user or notify_gestionnaires" do
|
||||||
|
expect(commentaire).not_to receive(:notify_user)
|
||||||
|
expect(commentaire).not_to receive(:notify_gestionnaires)
|
||||||
|
|
||||||
|
commentaire.email = "contact@tps.apientreprise.fr"
|
||||||
|
commentaire.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue