fix(campaign): mark excluded delivery as skipped
This commit is contained in:
@@ -212,6 +212,7 @@ DELIVERY_MODES = {
|
||||
AUTOMATICALLY_SENDABLE_STATUSES = {JobSendStatus.QUEUED.value}
|
||||
EXPLICIT_RETRY_STATUSES = {JobSendStatus.FAILED_TEMPORARY.value, JobSendStatus.FAILED_PERMANENT.value}
|
||||
INITIAL_QUEUE_SKIPPED_SEND_STATUSES = SMTP_ACCEPTED_STATUSES | {
|
||||
JobSendStatus.SKIPPED.value,
|
||||
JobSendStatus.CLAIMED.value,
|
||||
JobSendStatus.SENDING.value,
|
||||
JobSendStatus.OUTCOME_UNKNOWN.value,
|
||||
@@ -1001,9 +1002,13 @@ def cancel_campaign_jobs(session: Session, *, tenant_id: str, campaign_id: str)
|
||||
)
|
||||
cancelled_count = 0
|
||||
protected_count = 0
|
||||
skipped_count = 0
|
||||
version_ids: set[str] = set()
|
||||
for job in jobs:
|
||||
version_ids.add(job.campaign_version_id)
|
||||
if job.send_status == JobSendStatus.SKIPPED.value:
|
||||
skipped_count += 1
|
||||
continue
|
||||
if job.send_status in SMTP_ACCEPTED_STATUSES | {
|
||||
JobSendStatus.OUTCOME_UNKNOWN.value,
|
||||
JobSendStatus.CLAIMED.value,
|
||||
@@ -1024,6 +1029,7 @@ def cancel_campaign_jobs(session: Session, *, tenant_id: str, campaign_id: str)
|
||||
"campaign_id": campaign.id,
|
||||
"cancelled_count": cancelled_count,
|
||||
"protected_count": protected_count,
|
||||
"skipped_count": skipped_count,
|
||||
"campaign_status": campaign.status,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user