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.
34 lines
1.1 KiB
Ruby
34 lines
1.1 KiB
Ruby
class Sms::OneoffSmsCampaignService
|
|
pattr_initialize [:campaign!]
|
|
|
|
def perform
|
|
raise "Invalid campaign #{campaign.id}" if campaign.inbox.inbox_type != 'Sms' || !campaign.one_off?
|
|
raise 'Completed Campaign' if campaign.completed?
|
|
|
|
audience_label_ids = campaign.audience.select { |audience| audience['type'] == 'Label' }.pluck('id')
|
|
audience_labels = campaign.account.labels.where(id: audience_label_ids).pluck(:title)
|
|
process_audience(audience_labels)
|
|
campaign.completed!
|
|
end
|
|
|
|
private
|
|
|
|
delegate :inbox, to: :campaign
|
|
delegate :channel, to: :inbox
|
|
|
|
def process_audience(audience_labels)
|
|
campaign.account.contacts.tagged_with(audience_labels, any: true).each do |contact|
|
|
next if contact.phone_number.blank?
|
|
|
|
content = Liquid::CampaignTemplateService.new(campaign: campaign, contact: contact).call(campaign.message)
|
|
send_message(to: contact.phone_number, content: content)
|
|
end
|
|
end
|
|
|
|
def send_message(to:, content:)
|
|
channel.send_text_message(to, content)
|
|
rescue StandardError => e
|
|
Rails.logger.error("[SMS Campaign #{campaign.id}] Failed to send to #{to}: #{e.message}")
|
|
end
|
|
end
|