diff --git a/app/jobs/internal/process_stale_contacts_job.rb b/app/jobs/internal/process_stale_contacts_job.rb index eaf53be75..a40e73a01 100644 --- a/app/jobs/internal/process_stale_contacts_job.rb +++ b/app/jobs/internal/process_stale_contacts_job.rb @@ -8,6 +8,8 @@ class Internal::ProcessStaleContactsJob < ApplicationJob queue_as :scheduled_jobs def perform + return unless ChatwootApp.chatwoot_cloud? + Account.find_in_batches(batch_size: 100) do |accounts| accounts.each do |account| Rails.logger.info "Enqueuing RemoveStaleContactsJob for account #{account.id}" diff --git a/config/schedule.yml b/config/schedule.yml index f86015de6..afb9d98c7 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -33,9 +33,9 @@ remove_stale_redis_keys_job.rb: class: 'Internal::RemoveStaleRedisKeysJob' queue: scheduled_jobs -# executed daily at 2230 UTC -# which is our lowest traffic time -# process_stale_contacts_job: -# cron: '30 22 * * *' -# class: 'Internal::ProcessStaleContactsJob' -# queue: scheduled_jobs +#executed daily at 0430 UTC +# which will be IST 10:00 AM +process_stale_contacts_job: + cron: '30 04 * * *' + class: 'Internal::ProcessStaleContactsJob' + queue: scheduled_jobs diff --git a/spec/jobs/internal/process_stale_contacts_job_spec.rb b/spec/jobs/internal/process_stale_contacts_job_spec.rb index 30648ce9a..412ee06cc 100644 --- a/spec/jobs/internal/process_stale_contacts_job_spec.rb +++ b/spec/jobs/internal/process_stale_contacts_job_spec.rb @@ -4,11 +4,13 @@ RSpec.describe Internal::ProcessStaleContactsJob do subject(:job) { described_class.perform_later } it 'enqueues the job' do + allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true) expect { job }.to have_enqueued_job(described_class) .on_queue('scheduled_jobs') end it 'enqueues RemoveStaleContactsJob for each account' do + allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true) account1 = create(:account) account2 = create(:account) account3 = create(:account) @@ -25,10 +27,20 @@ RSpec.describe Internal::ProcessStaleContactsJob do end it 'processes accounts in batches' do + allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true) account = create(:account) allow(Account).to receive(:find_in_batches).with(batch_size: 100).and_yield([account]) expect(Internal::RemoveStaleContactsJob).to receive(:perform_later).with(account) described_class.perform_now end + + it 'does not process accounts when not in cloud environment' do + allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false) + create(:account) + + expect(Account).not_to receive(:find_in_batches) + expect(Internal::RemoveStaleContactsJob).not_to receive(:perform_later) + described_class.perform_now + end end