bale group for orgs, and sms for each org

apps/notifications/management/commands/process_notifications.py

@@ -60,6 +60,15 @@ def _bale_ticket_text(ticket, message=None, *, is_reply=False, message_count=1,
 
 def _send_sms(job):
     issued = None
+    if job.event_type == "UNIT_SUPERVISOR_NEW_TICKET":
+        recipient = job.payload.get("recipient_mobile", "")
+        if not recipient:
+            raise ValueError("Unit supervisor mobile is not configured")
+        subject = " ".join(job.ticket.subject.split())[:80] or "بدون موضوع"
+        category = " ".join(job.ticket.category.title.split())[:50]
+        customer_mobile = job.ticket.customer.local_mobile or "ثبت نشده"
+        message = f"تیکت جدید {job.ticket.ticket_number}\nتلفن: {customer_mobile}\nموضوع: {subject}\nدسته: {category}"
+        return get_sms_provider().send_message(recipient, message), issued
     if job.event_type == "CUSTOMER_TICKET_CREATED":
         issued, url = _magic_link(job, "customer_created_ticket")
         message = _render_sms(job.event_type,_sms_context(job,url),job.ticket.owning_unit)
@@ -72,12 +81,13 @@ def _send_sms(job):
     return get_sms_provider().send_message(job.customer.mobile, message), issued
 
 def _send_bale(job):
+    unit_chat_id = (getattr(job.ticket.owning_unit, "bale_chat_id", "") or "").strip()
     if job.event_type == "NEW_CUSTOMER_TICKET":
-        return get_bale_provider().send_message(settings.BALE_GROUP_CHAT_ID, _bale_ticket_text(job.ticket))
+        return get_bale_provider().send_message(unit_chat_id, _bale_ticket_text(job.ticket)) if unit_chat_id else None
     if job.event_type in ["CUSTOMER_TICKET_REPLY","CUSTOMER_TICKET_REOPENED"]:
         message = job.ticket.ticket_messages.filter(pk=job.payload.get("message_id"), is_internal=False).first()
         if not message: raise ValueError("Customer reply message no longer exists")
-        return get_bale_provider().send_message(settings.BALE_GROUP_CHAT_ID, _bale_ticket_text(job.ticket,message,is_reply=True,message_count=job.payload.get("message_count",1),reopened=job.event_type=="CUSTOMER_TICKET_REOPENED"))
+        return get_bale_provider().send_message(unit_chat_id, _bale_ticket_text(job.ticket,message,is_reply=True,message_count=job.payload.get("message_count",1),reopened=job.event_type=="CUSTOMER_TICKET_REOPENED")) if unit_chat_id else None
     if not job.staff_user or not hasattr(job.staff_user, "staff_profile"): raise ValueError("Bale recipient is not configured")
     profile = job.staff_user.staff_profile
     if not profile.bale_notifications_enabled: return None

apps/notifications/services.py

@@ -5,6 +5,22 @@ from .models import NotificationJob,NotificationPolicy
 def enqueue(channel,event_type,ticket,dedupe_key,payload=None,customer=None,staff_user=None):
     return NotificationJob.objects.get_or_create(dedupe_key=dedupe_key,defaults={"channel":channel,"event_type":event_type,"ticket":ticket,"payload":payload or {},"customer":customer,"staff_user":staff_user,"next_attempt_at":timezone.now()})[0]
 
+def enqueue_unit_supervisor_ticket_sms(ticket):
+    """Queue one concise new-ticket SMS for each configured unit supervisor."""
+    unit = ticket.owning_unit
+    if not unit:
+        return []
+    return [
+        enqueue(
+            NotificationJob.Channel.SMS,
+            "UNIT_SUPERVISOR_NEW_TICKET",
+            ticket,
+            f"ticket:{ticket.pk}:unit-supervisor:{mobile}",
+            payload={"recipient_mobile": mobile},
+        )
+        for mobile in unit.supervisor_mobiles
+    ]
+
 def staff_reply_policy():
     return NotificationPolicy.objects.get_or_create(key=NotificationPolicy.Key.STAFF_REPLY_SMS,defaults={"quiet_period_seconds":300})[0]
 
@@ -40,6 +56,8 @@ def cancel_staff_reply_sms_if_read(ticket,customer):
 
 def schedule_customer_reply_bale(ticket,message):
     """Debounce consecutive customer chat messages into one Bale group alert."""
+    if not ticket.owning_unit_id or not ticket.owning_unit.bale_chat_id:
+        return None,False
     policy=customer_reply_bale_policy()
     if not policy.is_active: return None,False
     due=timezone.now()+timedelta(seconds=policy.quiet_period_seconds)