scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-10-29 18:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Template sync issue for older Whatsapp channels (#8830)

Browse Source 
- This PR introduces a modification to the channel fetching logic, ensuring that channels with older message_template_last_updated timestamps are prioritized during synchronization.
This commit is contained in:
Sojan Jose
2024-01-31 18:38:01 +04:00
committed by GitHub
parent 390cd756e8
commit d10525a714
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
View File

@@ -2,8 +2,10 @@ class Channels::Whatsapp::TemplatesSyncSchedulerJob < ApplicationJob
queue_as :low
def perform
Channel::Whatsapp.where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL',
3.hours.ago).limit(Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT).all.each do |channel|
Channel::Whatsapp.order(Arel.sql('message_templates_last_updated IS NULL DESC, message_templates_last_updated ASC'))
.where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL', 3.hours.ago)
.limit(Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT)
.each do |channel|
Channels::Whatsapp::TemplatesSyncJob.perform_later(channel)
end
end

18
spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
View File

@@ -23,5 +23,23 @@ RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob do
have_been_enqueued.with(non_synced).on_queue('low')
)
end
it 'schedules templates_sync_job for oldest synced channels first' do
stub_const('Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT', 2)
stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
non_synced = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: nil)
synced_recently = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 4.hours.ago)
synced_old = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 6.hours.ago)
described_class.perform_now
expect(Channels::Whatsapp::TemplatesSyncJob).not_to(
have_been_enqueued.with(synced_recently).on_queue('low')
)
expect(Channels::Whatsapp::TemplatesSyncJob).to(
have_been_enqueued.with(synced_old).on_queue('low')
)
expect(Channels::Whatsapp::TemplatesSyncJob).to(
have_been_enqueued.with(non_synced).on_queue('low')
)
end
end
end