mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-02 03:57:52 +00:00
chore: Disable email notifications for unconfirmed users (#10964)
- disable email notifications if the user hasn't confirmed the email yet, as there is potential chance for the emails to bounce
This commit is contained in:
@@ -4,6 +4,8 @@ class Notification::EmailNotificationService
|
||||
def perform
|
||||
# don't send emails if user read the push notification already
|
||||
return if notification.read_at.present?
|
||||
# don't send emails if user is not confirmed
|
||||
return if notification.user.confirmed_at.nil?
|
||||
return unless user_subscribed_to_notification?
|
||||
|
||||
# TODO : Clean up whatever happening over here
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe Notification::EmailNotificationService do
|
||||
let(:account) { create(:account) }
|
||||
let(:agent) { create(:user, account: account, confirmed_at: Time.current) }
|
||||
let(:conversation) { create(:conversation, account: account) }
|
||||
let(:notification) { create(:notification, notification_type: :conversation_creation, user: agent, account: account, primary_actor: conversation) }
|
||||
let(:mailer) { double }
|
||||
let(:mailer_action) { double }
|
||||
|
||||
before do
|
||||
# Setup notification settings for the agent
|
||||
notification_setting = agent.notification_settings.find_by(account_id: account.id)
|
||||
notification_setting.selected_email_flags = [:email_conversation_creation]
|
||||
notification_setting.save!
|
||||
end
|
||||
|
||||
describe '#perform' do
|
||||
context 'when notification is read' do
|
||||
before do
|
||||
notification.update!(read_at: Time.current)
|
||||
end
|
||||
|
||||
it 'does not send email' do
|
||||
expect(AgentNotifications::ConversationNotificationsMailer).not_to receive(:with)
|
||||
described_class.new(notification: notification).perform
|
||||
end
|
||||
end
|
||||
|
||||
context 'when agent is not confirmed' do
|
||||
before do
|
||||
agent.update!(confirmed_at: nil)
|
||||
end
|
||||
|
||||
it 'does not send email' do
|
||||
expect(AgentNotifications::ConversationNotificationsMailer).not_to receive(:with)
|
||||
described_class.new(notification: notification).perform
|
||||
end
|
||||
end
|
||||
|
||||
context 'when agent is confirmed' do
|
||||
before do
|
||||
allow(AgentNotifications::ConversationNotificationsMailer).to receive(:with).and_return(mailer)
|
||||
allow(mailer).to receive(:public_send).and_return(mailer_action)
|
||||
allow(mailer_action).to receive(:deliver_later)
|
||||
end
|
||||
|
||||
it 'sends email' do
|
||||
described_class.new(notification: notification).perform
|
||||
expect(mailer).to have_received(:public_send).with(
|
||||
'conversation_creation',
|
||||
conversation,
|
||||
agent,
|
||||
nil
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when user is not subscribed to notification type' do
|
||||
before do
|
||||
notification_setting = agent.notification_settings.find_by(account_id: account.id)
|
||||
notification_setting.selected_email_flags = []
|
||||
notification_setting.save!
|
||||
end
|
||||
|
||||
it 'does not send email' do
|
||||
expect(AgentNotifications::ConversationNotificationsMailer).not_to receive(:with)
|
||||
described_class.new(notification: notification).perform
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user