feat: Display sent status of emails in email channel (#3125)

spec/mailers/conversation_reply_mailer_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
     let!(:account) { create(:account) }
     let!(:agent) { create(:user, email: 'agent1@example.com', account: account) }
     let(:class_instance) { described_class.new }
+    let(:email_channel) { create(:channel_email, account: account) }
 
     before do
       allow(described_class).to receive(:new).and_return(class_instance)
@@ -35,8 +36,8 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
                })
       end
       let(:private_message) { create(:message, account: account, content: 'This is a private message', conversation: conversation) }
-      let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
-      let(:cc_mail) { described_class.reply_with_summary(cc_message.conversation, Time.zone.now).deliver_now }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
+      let(:cc_mail) { described_class.reply_with_summary(cc_message.conversation, message.id).deliver_now }
 
       it 'renders the subject' do
         expect(mail.subject).to eq("[##{message.conversation.display_id}] New messages on this conversation")
@@ -66,7 +67,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
     context 'without assignee' do
       let(:conversation) { create(:conversation, assignee: nil) }
       let(:message) { create(:message, conversation: conversation) }
-      let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       it 'has correct name' do
         expect(mail[:from].display_names).to eq(['Notifications from Inbox'])
@@ -84,7 +85,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
                account: account,
                message_type: 'outgoing').reload
       end
-      let(:mail) { described_class.reply_without_summary(message_1.conversation, Time.zone.now - 1.minute).deliver_now }
+      let(:mail) { described_class.reply_without_summary(message_2.conversation, message_2.id).deliver_now }
 
       before do
         message_2.save
@@ -113,12 +114,30 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       end
     end
 
+    context 'with email reply' do
+      let(:conversation) { create(:conversation, assignee: agent, inbox: email_channel.inbox, account: account).reload }
+      let(:message) { create(:message, conversation: conversation, account: account, message_type: 'outgoing', content: 'Outgoing Message 2') }
+      let(:mail) { described_class.email_reply(message).deliver_now }
+
+      it 'renders the subject' do
+        expect(mail.subject).to eq("[##{message.conversation.display_id}] New messages on this conversation")
+      end
+
+      it 'renders the body' do
+        expect(mail.decoded).to include message.content
+      end
+
+      it 'updates the source_id' do
+        expect(mail.message_id).to eq message.source_id
+      end
+    end
+
     context 'when custom domain and email is not enabled' do
       let(:inbox) { create(:inbox, account: account) }
       let(:inbox_member) { create(:inbox_member, user: agent, inbox: inbox) }
       let(:conversation) { create(:conversation, assignee: agent, inbox: inbox_member.inbox, account: account) }
       let!(:message) { create(:message, conversation: conversation, account: account) }
-      let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
       let(:domain) { account.inbound_email_domain }
 
       it 'renders the receiver email' do
@@ -142,7 +161,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       let(:inbox) { create(:inbox, account: account, email_address: 'noreply@chatwoot.com') }
       let(:conversation) { create(:conversation, assignee: agent, inbox: inbox, account: account) }
       let!(:message) { create(:message, conversation: conversation, account: account) }
-      let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       it 'set reply to email address as inbox email address' do
         expect(mail.from).to eq([inbox.email_address])
@@ -154,7 +173,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       let(:account) { create(:account) }
       let(:conversation) { create(:conversation, assignee: agent, account: account).reload }
       let(:message) { create(:message, conversation: conversation, account: account, inbox: conversation.inbox) }
-      let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       before do
         account = conversation.account
@@ -166,7 +185,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
 
       it 'sets reply to email to be based on the domain' do
         reply_to_email = "reply+#{message.conversation.uuid}@#{conversation.account.domain}"
-        reply_to = "#{agent.available_name} <#{reply_to_email}>"
+        reply_to = "#{agent.available_name} from #{conversation.inbox.name} <#{reply_to_email}>"
         expect(mail['REPLY-TO'].value).to eq(reply_to)
         expect(mail.reply_to).to eq([reply_to_email])
       end

spec/models/message_spec.rb

@@ -70,6 +70,14 @@ RSpec.describe Message, type: :model do
       expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
     end
 
+    it 'calls EmailReply worker if the channel is email' do
+      message.inbox = create(:inbox, account: message.account, channel: build(:channel_email, account: message.account))
+      allow(EmailReplyWorker).to receive(:perform_in).and_return(true)
+      message.message_type = 'outgoing'
+      message.save!
+      expect(EmailReplyWorker).to have_received(:perform_in).with(1.second, message.id)
+    end
+
     it 'wont call notify email method unless its website or email channel' do
       message.inbox = create(:inbox, account: message.account, channel: build(:channel_api, account: message.account))
       allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)

spec/workers/conversation_reply_email_worker_spec.rb

@@ -2,8 +2,6 @@ require 'rails_helper'
 
 Sidekiq::Testing.fake!
 RSpec.describe ConversationReplyEmailWorker, type: :worker do
-  let(:perform_at) { (Time.zone.today + 6.hours).to_datetime }
-  let(:scheduled_job) { described_class.perform_at(perform_at, 1, Time.zone.now) }
   let(:conversation) { build(:conversation, display_id: nil) }
   let(:message) { build(:message, conversation: conversation, content_type: 'incoming_email', inbox: conversation.inbox) }
   let(:mailer) { double }
@@ -29,18 +27,18 @@ RSpec.describe ConversationReplyEmailWorker, type: :worker do
       expect do
         described_class.perform_async
       end.to change(described_class.jobs, :size).by(1)
-      described_class.new.perform(1, Time.zone.now)
+      described_class.new.perform(1, message.id)
     end
 
     context 'with actions performed by the worker' do
       it 'calls ConversationSummaryMailer#reply_with_summary when last incoming message was not email' do
-        described_class.new.perform(1, Time.zone.now)
+        described_class.new.perform(1, message.id)
         expect(mailer).to have_received(:reply_with_summary)
       end
 
       it 'calls ConversationSummaryMailer#reply_without_summary when last incoming message was from email' do
         message.save
-        described_class.new.perform(1, Time.zone.now)
+        described_class.new.perform(1, message.id)
         expect(mailer).to have_received(:reply_without_summary)
       end
     end

spec/workers/email_reply_worker_spec.rb

@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe EmailReplyWorker, type: :worker do
+  let(:account) { create(:account) }
+  let(:channel) { create(:channel_email, account: account) }
+  let(:message) { create(:message, message_type: :outgoing, inbox: channel.inbox, account: account) }
+  let(:private_message) { create(:message, private: true, message_type: :outgoing, inbox: channel.inbox, account: account) }
+  let(:incoming_message) { create(:message, message_type: :incoming, inbox: channel.inbox, account: account) }
+  let(:template_message) { create(:message, message_type: :template, content_type: :input_csat, inbox: channel.inbox, account: account) }
+  let(:mailer) { double }
+  let(:mailer_action) { double }
+
+  describe '#perform' do
+    before do
+      allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+      allow(mailer).to receive(:email_reply).and_return(mailer_action)
+      allow(mailer_action).to receive(:deliver_later).and_return(true)
+    end
+
+    it 'calls mailer action with message' do
+      described_class.new.perform(message.id)
+      expect(mailer).to have_received(:email_reply).with(message)
+      expect(mailer_action).to have_received(:deliver_later)
+    end
+
+    it 'does not call mailer action with a private message' do
+      described_class.new.perform(private_message.id)
+      expect(mailer).not_to have_received(:email_reply)
+      expect(mailer_action).not_to have_received(:deliver_later)
+    end
+
+    it 'calls mailer action with a CSAT message' do
+      described_class.new.perform(template_message.id)
+      expect(mailer).to have_received(:email_reply).with(template_message)
+      expect(mailer_action).to have_received(:deliver_later)
+    end
+
+    it 'does not call mailer action with an incoming message' do
+      described_class.new.perform(incoming_message.id)
+      expect(mailer).not_to have_received(:email_reply)
+      expect(mailer_action).not_to have_received(:deliver_later)
+    end
+  end
+end