button force anoncecall

apps/notifications/announcement_worker.py

@@ -4,6 +4,7 @@ from datetime import timedelta
 
 import requests
 from django.db import transaction
+from django.db.models import Case, IntegerField, Value, When
 from django.utils import timezone
 
 from apps.core.models import VoipConfiguration
@@ -30,18 +31,31 @@ def _failure_code(exc):
 
 
 def _cancellation_reason(job, configuration):
-    message = job.message
-    customer = message.ticket.customer
+    if job.source == AnnouncementJob.Source.MANUAL:
+        if not job.ticket_id:
+            return "message_unavailable"
+        customer = job.ticket.customer
+    else:
+        if job.message is None:
+            return "message_unavailable"
+        customer = job.message.ticket.customer
+        reason = _automatic_cancellation_reason(job.message, customer)
+        if reason:
+            return reason
+    if not customer.is_active or not customer.local_mobile:
+        return "customer_mobile_unavailable"
+    if not configuration.announcement_url or not configuration.announcement_id:
+        return "announcement_not_configured"
+    return ""
+
+
+def _automatic_cancellation_reason(message, customer):
     if message.is_internal or message.deleted_at or message.author.account_type != "STAFF":
         return "message_unavailable"
     if MessageReadReceipt.objects.filter(message=message, user=customer).exists():
         return "customer_read"
     if message.ticket.ticket_messages.filter(author=customer, created_at__gt=message.created_at, is_internal=False).exists():
         return "customer_replied"
-    if not customer.is_active or not customer.local_mobile:
-        return "customer_mobile_unavailable"
-    if not configuration.announcement_url or not configuration.announcement_id:
-        return "announcement_not_configured"
     return ""
 
 
@@ -55,7 +69,7 @@ def _deliver(job):
             return
         place_announcement_call(
             configuration,
-            mobile=job.message.ticket.customer.local_mobile,
+            mobile=(job.ticket.customer if job.source == AnnouncementJob.Source.MANUAL else job.message.ticket.customer).local_mobile,
             idempotency_key=job.idempotency_key,
         )
     except Exception as exc:
@@ -82,8 +96,9 @@ def process_due_announcements():
         jobs = list(
             AnnouncementJob.objects.select_for_update(skip_locked=True)
             .filter(status=AnnouncementJob.Status.PENDING, next_attempt_at__lte=now)
-            .select_related("message__ticket__customer")
-            .order_by("next_attempt_at", "pk")[:20]
+            .select_related("message__ticket__customer", "ticket__customer")
+            .annotate(priority=Case(When(source=AnnouncementJob.Source.MANUAL, then=Value(0)), default=Value(1), output_field=IntegerField()))
+            .order_by("priority", "next_attempt_at", "pk")[:20]
         )
         AnnouncementJob.objects.filter(pk__in=[job.pk for job in jobs]).update(
             status=AnnouncementJob.Status.PROCESSING, next_attempt_at=now,