From d10525a7142776da7985972f664ec0d2c09e376f Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Wed, 31 Jan 2024 18:38:01 +0400 Subject: [PATCH] fix: Template sync issue for older Whatsapp channels (#8830) - This PR introduces a modification to the channel fetching logic, ensuring that channels with older message_template_last_updated timestamps are prioritized during synchronization. --- .../whatsapp/templates_sync_scheduler_job.rb | 6 ++++-- .../templates_sync_scheduler_job_spec.rb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb index ade3eb082..6a5e6cb2b 100644 --- a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb +++ b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb @@ -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 diff --git a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb index e6545bfe3..cf0b30842 100644 --- a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb +++ b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb @@ -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