From 5ad7e930591037b08ed1c86e1425a3481538890b Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Tue, 15 Feb 2022 18:15:45 +0530 Subject: [PATCH] chore: Discard activities from email notifiable messages (#3989) --- app/models/message.rb | 3 ++- spec/models/message_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/message.rb b/app/models/message.rb index 8e2e81307..c9113dcf0 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -137,7 +137,8 @@ class Message < ApplicationRecord end def email_notifiable_message? - return false if private? || incoming? + return false if private? + return false if %w[outgoing template].exclude?(message_type) return false if template? && %w[input_csat text].exclude?(content_type) true diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb index 1176b17e2..fea6cd5b5 100644 --- a/spec/models/message_spec.rb +++ b/spec/models/message_spec.rb @@ -111,6 +111,7 @@ RSpec.describe Message, type: :model do it 'return false if private message' do message.private = true + message.message_type = 'outgoing' expect(message.email_notifiable_message?).to be false end @@ -120,6 +121,12 @@ RSpec.describe Message, type: :model do expect(message.email_notifiable_message?).to be false end + it 'return false if activity message' do + message.private = false + message.message_type = 'activity' + expect(message.email_notifiable_message?).to be false + end + it 'return false if message type is template and content type is not input_csat or text' do message.private = false message.message_type = 'template'