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

Добавлено логирование id задач по отправки писем

Author: Toksi86

mailing/tasks.py

@@ -84,12 +84,31 @@ def _send_scenario_for_program(scenario, program, scheduled_for):
     def context_builder(user):
         return scenario.context_builder(program, user, deadline_date)
 
+    def status_callback(user, msg):
+        status = getattr(msg, "anymail_status", None)
+        message_id = getattr(status, "message_id", None) if status else None
+        if message_id:
+            logger.info(
+                "Scenario %s user=%s anymail_id=%s status=%s",
+                scenario.code,
+                user.id,
+                message_id,
+                getattr(status, "status", None),
+            )
+        else:
+            logger.info(
+                "Scenario %s user=%s anymail_status missing",
+                scenario.code,
+                user.id,
+            )
+
     try:
         send_mass_mail_from_template(
             recipients_to_send,
             scenario.subject,
             scenario.template_name,
             context_builder=context_builder,
+            status_callback=status_callback,
         )
     except Exception as exc:
         MailingScenarioLog.objects.filter(

mailing/utils.py

@@ -1,5 +1,5 @@
 from functools import singledispatch
-from typing import Dict, List, Union, Annotated
+from typing import Dict, List, Union, Annotated, Callable
 
 from procollab import settings
 from .constants import MAILING_USERS_BATCH_SIZE
@@ -137,6 +137,7 @@ def send_mass_mail_from_template(
         dict,
     ] = None,
     context_builder=None,
+    status_callback: Callable[[User, EmailMultiAlternatives], None] | None = None,
     connection=None,
 ) -> Annotated[int, "Количество отосланных сообщений"]:
     """
@@ -147,7 +148,7 @@ def send_mass_mail_from_template(
         template_context = {}
 
     template = get_template(template_name)
-    messages = []
+    message_pairs: list[tuple[User, EmailMultiAlternatives]] = []
     for user in users:
         context = dict(template_context)
         if context_builder is not None:
@@ -159,10 +160,14 @@ def send_mass_mail_from_template(
             subject, plain_msg, settings.EMAIL_USER, [user.email]
         )
         msg.attach_alternative(html_msg, "text/html")
-        messages.append(msg)
+        message_pairs.append((user, msg))
 
-    grouped_messages = create_message_groups(messages)
+    grouped_messages = create_message_groups(message_pairs)
     num_sent: int = 0
     for group in grouped_messages:
-        num_sent += send_group_messages(group)
+        messages = [msg for _, msg in group]
+        num_sent += send_group_messages(messages)
+        if status_callback is not None:
+            for user, msg in group:
+                status_callback(user, msg)
     return num_sent