Skip to content

Commit

Permalink
feat: Add delivery reports for live chat (#8092)
Browse files Browse the repository at this point in the history
  • Loading branch information
muhsin-k committed Oct 12, 2023
1 parent 5c729cc commit 980013a
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/api/v1/widget/conversations_controller.rb
Expand Up @@ -28,6 +28,7 @@ def update_last_seen

conversation.contact_last_seen_at = DateTime.now.utc
conversation.save!
::Conversations::MarkMessagesAsReadJob.perform_later(conversation)
head :ok
end

Expand Down
Expand Up @@ -214,6 +214,10 @@ export default {
if (this.isAWhatsAppChannel || this.isATwilioChannel) {
return this.sourceId && this.isDelivered;
}
// We will consider messages as delivered for web widget inbox if they are sent
if (this.isAWebWidgetInbox) {
return this.isSent;
}
return false;
},
Expand Down
13 changes: 13 additions & 0 deletions app/jobs/conversations/mark_messages_as_read_job.rb
@@ -0,0 +1,13 @@
class Conversations::MarkMessagesAsReadJob < ApplicationJob
queue_as :low

def perform(conversation)
# Mark every message created before the user's viewing time as read.
conversation.messages.where(status: %w[sent delivered])
.where.not(message_type: 'incoming')
.where('created_at <= ?',
conversation.contact_last_seen_at).find_each do |message|
message.update!(status: 'read')
end
end
end
Expand Up @@ -170,6 +170,7 @@
it 'returns the correct conversation params' do
allow(Rails.configuration.dispatcher).to receive(:dispatch)
expect(conversation.contact_last_seen_at).to be_nil
expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation)

post '/api/v1/widget/conversations/update_last_seen',
headers: { 'X-Auth-Token' => token },
Expand Down
61 changes: 61 additions & 0 deletions spec/jobs/conversations/mark_messages_as_read_job_spec.rb
@@ -0,0 +1,61 @@
require 'rails_helper'

RSpec.describe Conversations::MarkMessagesAsReadJob do
subject(:job) { described_class.perform_later(account) }

let!(:account) { create(:account) }
let!(:conversation) { create(:conversation, account: account, contact_last_seen_at: DateTime.now.utc) }
let!(:message) { create(:message, conversation: conversation, message_type: 'outgoing', status: 'sent', created_at: 1.day.ago) }

it 'enqueues the job' do
expect { job }.to have_enqueued_job(described_class)
.with(account)
.on_queue('low')
end

context 'when called' do
it 'marks all sent messages in a conversation as read' do
expect do
described_class.perform_now(conversation)
message.reload
end.to change(message, :status).from('sent').to('read')
end

it 'marks all delivered messages in a conversation as read' do
message.update!(status: 'delivered')
expect do
described_class.perform_now(conversation)
message.reload
end.to change(message, :status).from('delivered').to('read')
end

it 'marks all templates messages in a conversation as read' do
message.update!(status: 'delivered', message_type: 'template')
expect do
described_class.perform_now(conversation)
message.reload
end.to change(message, :status).from('delivered').to('read')
end

it 'does not mark failed messages as read' do
message.update!(status: 'failed')
expect do
described_class.perform_now(conversation)
end.not_to change(message.reload, :status)
end

it 'does not mark incoming messages as read' do
message.update!(message_type: 'incoming')
expect do
described_class.perform_now(conversation)
end.not_to change(message.reload, :status)
end

it 'does not mark messages created after the contact last seen time as read' do
message.update!(created_at: DateTime.now.utc)
expect do
described_class.perform_now(conversation)
end.not_to change(message.reload, :status)
end
end
end

0 comments on commit 980013a

Please sign in to comment.