Sojan JoseandGitHub
f27bbef73b
## Summary One-off SMS and WhatsApp campaigns now show a `Processing` state while the audience send is in progress. The campaign moves to `Completed` after processing finishes, and already-processing campaigns are skipped by the scheduler to avoid duplicate sends. ## Closes - [CW-6037: feat: Introduce an in-progress status for campaigns](https://linear.app/chatwoot/issue/CW-6037/feat-introduce-an-in-progress-status-for-campaigns) ## Screenshot SMS campaign card showing the new `Processing` status. <img width="3840" height="2160" alt="framed-campaign-processing-status" src="https://github.com/user-attachments/assets/de7913b5-65fb-4121-9034-24a568eb0382" /> ## What changed - Added `processing` as a campaign status. - Mark one-off campaigns as `processing` under a row lock before the send service runs. - Complete SMS, Twilio SMS, and WhatsApp one-off campaigns after audience processing finishes. - Keep campaigns in `processing` if an unexpected service error escapes, so the scheduler does not automatically resend the audience. - Added the `Processing` label for SMS and WhatsApp campaign cards. ## Known operational behavior If a worker is interrupted or an unexpected service error escapes after a campaign is marked `processing`, the campaign can remain in `processing`. This is intentional for now to avoid automatic full-audience resends. Installation admins can decide whether to mark the campaign completed or restart it manually from the Rails console after checking what was sent. ## How to test - Create a one-off SMS or WhatsApp campaign scheduled for now. - Run the scheduled job or trigger the campaign job. - Confirm the campaign card shows `Processing` while the audience is being processed. For small audiences, refresh during processing or use a larger audience so the state is observable. - Confirm the campaign moves to `Completed` after audience processing finishes. - Confirm an already-processing campaign is not enqueued again by the scheduled job.
53 lines
1.9 KiB
Ruby
53 lines
1.9 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe TriggerScheduledItemsJob do
|
|
subject(:job) { described_class.perform_later }
|
|
|
|
let(:account) { create(:account) }
|
|
|
|
it 'enqueues the job' do
|
|
expect { job }.to have_enqueued_job(described_class)
|
|
.on_queue('scheduled_jobs')
|
|
end
|
|
|
|
it 'triggers Conversations::ReopenSnoozedConversationsJob' do
|
|
expect(Conversations::ReopenSnoozedConversationsJob).to receive(:perform_later).once
|
|
described_class.perform_now
|
|
end
|
|
|
|
it 'triggers Notification::ReopenSnoozedNotificationsJob' do
|
|
expect(Notification::ReopenSnoozedNotificationsJob).to receive(:perform_later).once
|
|
described_class.perform_now
|
|
end
|
|
|
|
it 'triggers Account::ConversationsResolutionSchedulerJob' do
|
|
expect(Account::ConversationsResolutionSchedulerJob).to receive(:perform_later).once
|
|
described_class.perform_now
|
|
end
|
|
|
|
it 'triggers Channels::Whatsapp::TemplatesSyncSchedulerJob' do
|
|
expect(Channels::Whatsapp::TemplatesSyncSchedulerJob).to receive(:perform_later).once
|
|
described_class.perform_now
|
|
end
|
|
|
|
context 'when unexecuted Scheduled campaign jobs' do
|
|
let!(:twilio_sms) { create(:channel_twilio_sms, account: account) }
|
|
let!(:twilio_inbox) { create(:inbox, channel: twilio_sms, account: account) }
|
|
|
|
it 'triggers Campaigns::TriggerOneoffCampaignJob' do
|
|
campaign = create(:campaign, inbox: twilio_inbox, account: account)
|
|
create(:campaign, inbox: twilio_inbox, account: account, scheduled_at: 10.days.after)
|
|
expect(Campaigns::TriggerOneoffCampaignJob).to receive(:perform_later).with(campaign).once
|
|
described_class.perform_now
|
|
end
|
|
|
|
it 'does not trigger campaigns that are already processing' do
|
|
create(:campaign, inbox: twilio_inbox, account: account, campaign_status: :processing)
|
|
|
|
expect(Campaigns::TriggerOneoffCampaignJob).not_to receive(:perform_later)
|
|
|
|
described_class.perform_now
|
|
end
|
|
end
|
|
end
|