Merge pull request #601 from PROCOLLAB-github/feature/auto_sending_email

 Устраён баг с линивым QuerySet

Author: Toksi86

mailing/constants.py

@@ -10,3 +10,7 @@ def get_default_mailing_schema() -> dict[str, dict[str, str]]:
 
 
 MAILING_USERS_BATCH_SIZE = 100
+
+FAILED_ANYMAIL_STATUSES = frozenset(
+    {"rejected", "failed", "invalid", "bounced", "unknown"}
+)

mailing/tasks.py

@@ -3,6 +3,7 @@
 
 from django.utils import timezone
 
+from mailing.constants import FAILED_ANYMAIL_STATUSES
 from mailing.models import MailingScenarioLog
 from mailing.scenarios import RecipientRule, SCENARIOS, TriggerType
 from mailing.utils import send_mass_mail_from_template
@@ -54,8 +55,8 @@ def _send_scenario_for_program(scenario, program, scheduled_for):
         ],
     ).values_list("user_id", flat=True)
 
-    recipients_to_send = recipients.exclude(id__in=pending_or_sent_ids)
-    user_ids = list(recipients_to_send.values_list("id", flat=True))
+    recipients_to_send = list(recipients.exclude(id__in=pending_or_sent_ids))
+    user_ids = [user.id for user in recipients_to_send]
     if not user_ids:
         return 0
 
@@ -99,18 +100,24 @@ def _normalize_status(status_value):
         if status_value is None:
             return set()
         if isinstance(status_value, dict):
-            return {str(key) for key in status_value.keys()}
+            statuses = set()
+            for value in status_value.values():
+                if isinstance(value, (set, list, tuple)):
+                    statuses.update(str(item) for item in value)
+                else:
+                    statuses.add(str(value))
+            return {status.lower() for status in statuses}
         if isinstance(status_value, (set, list, tuple)):
-            return {str(item) for item in status_value}
-        return {str(status_value)}
+            return {str(item).lower() for item in status_value}
+        return {str(status_value).lower()}
 
     def status_callback(user, msg):
         nonlocal sent_count, failed_count
         status = getattr(msg, "anymail_status", None)
         message_id = getattr(status, "message_id", None) if status else None
         status_set = _normalize_status(getattr(status, "status", None))
         status_str = ",".join(sorted(status_set)) if status_set else "unknown"
-        is_failed = bool(status_set & {"rejected", "failed", "invalid", "bounced"})
+        is_failed = not status_set or bool(status_set & FAILED_ANYMAIL_STATUSES)
 
         if not message_id:
             failed_count += 1