wbmailing 1.58.4__tar.gz → 1.59.10__tar.gz

{wbmailing-1.58.4 → wbmailing-1.59.10}/PKG-INFO

@@ -1,6 +1,5 @@
 Metadata-Version: 2.4
 Name: wbmailing
-Version: 1.58.4
+Version: 1.59.10
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
-Requires-Dist: sentry-sdk==2.*
 Requires-Dist: wbcore

{wbmailing-1.58.4 → wbmailing-1.59.10}/pyproject.toml

@@ -6,7 +6,6 @@ dynamic = ["version"]
 
 dependencies = [
   "wbcore",
-  "sentry-sdk == 2.*",
 ]
 
 [tool.uv.sources]

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/backend.py

@@ -1,20 +1,21 @@
+import logging
 from datetime import timedelta
 
 from anymail.backends.mailgun import EmailBackend as AnymailMailgunBackend
 from anymail.backends.mailjet import EmailBackend as AnymailMailjetBackend
 from anymail.backends.mandrill import EmailBackend as AnymailMandrillBackend
 from anymail.backends.postmark import EmailBackend as AnymailPostmarkBackend
-from anymail.backends.sendgrid import EmailBackend as AnymailSendgridBackend
 from anymail.backends.sendinblue import EmailBackend as AnymailSendinblueBackend
 from anymail.exceptions import AnymailError
 from django.conf import settings
 from django.core.mail.backends.console import EmailBackend as ConsoleBackend
 from django.utils import timezone
-from sentry_sdk import capture_message
 from wbcore.utils.html import convert_html2text
 
 from wbmailing.models import Mail, MailEvent
 
+logger = logging.getLogger("mailing")
+
 
 class SendMessagesMixin:
     def _process_msg(self, message):
@@ -66,7 +67,7 @@ class SendMessagesMixin:
                         mail.last_send = timezone.now()
                         mail.save()
                 except AnymailError as e:
-                    capture_message(e)
+                    logger.warning(e)
                     if self.fail_silently:
                         sent = False
                     else:
@@ -90,10 +91,6 @@ class PostmarkEmailBackend(SendMessagesMixin, AnymailPostmarkBackend):
         return super().send_messages(email_messages)
 
 
-class SendgridEmailBackend(SendMessagesMixin, AnymailSendgridBackend):
-    pass
-
-
 class MailgunEmailBackend(SendMessagesMixin, AnymailMailgunBackend):
     pass
 

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/factories.py

@@ -34,6 +34,7 @@ class ApprovedMailingListSubscriberChangeRequest(MailingListSubscriberChangeRequ
 class MailingListFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = MailingList
+        skip_postgeneration_save = True
 
     title = factory.Faker("text", max_nb_chars=64)
     is_public = False
@@ -88,6 +89,7 @@ class MailingListEmailContactThroughModelFactory(factory.django.DjangoModelFacto
 class MassMailFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = MassMail
+        skip_postgeneration_save = True
 
     # status =  #defaut = DRAFT
     from_email = factory.Faker("email")
@@ -136,6 +138,7 @@ class CustomMassMailEmailContactFactory(EmailContactFactory):
 class MailFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Mail
+        skip_postgeneration_save = True
 
     created = factory.Faker("date_time", tzinfo=pytz.utc)
     last_send = factory.Faker("date_time", tzinfo=pytz.utc)

wbmailing-1.59.10/wbmailing/migrations/0004_alter_mailinglistemailcontactthroughmodel_unique_together_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.9 on 2025-12-16 15:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0014_alter_entry_relationship_managers_and_more'),
+        ('wbmailing', '0003_alter_mailinglistsubscriberchangerequest_options'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='mailinglistemailcontactthroughmodel',
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name='mailinglistemailcontactthroughmodel',
+            constraint=models.UniqueConstraint(fields=('mailing_list', 'email_contact'), name='unique_mailinglistcontact'),
+        ),
+    ]

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/models/mailing_lists.py

@@ -235,7 +235,9 @@ class MailingListEmailContactThroughModel(models.Model):
     )
 
     class Meta:
-        unique_together = ("mailing_list", "email_contact")
+        constraints = (
+            models.UniqueConstraint(name="unique_mailinglistcontact", fields=("mailing_list", "email_contact")),
+        )
 
     def __str__(self) -> str:
         return f"{self.mailing_list} - {self.email_contact}"

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/models/mails.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from datetime import timedelta
 
 from anymail.exceptions import AnymailRecipientsRefused
@@ -21,7 +22,6 @@ from django_fsm import FSMField, transition
 from dynamic_preferences.registries import global_preferences_registry
 from psycopg.types.range import TimestamptzRange
 from rest_framework.reverse import reverse
-from sentry_sdk import capture_message
 from wbcore.contrib.color.enums import WBColor
 from wbcore.contrib.directory.models import EmailContact
 from wbcore.contrib.documents.models import Document, DocumentType
@@ -35,9 +35,12 @@ from wbcore.metadata.configs.display.instance_display.shortcuts import (
 )
 from wbcore.models import WBModel
 from wbcore.utils.html import convert_html2text
+from wbcore.workers import Queue
 
 from .mailing_lists import MailingListEmailContactThroughModel
 
+logger = logging.getLogger("mailing")
+
 
 def can_administrate_mail(mail, user):
     return user.has_perm("wbmailing.can_administrate_mail")
@@ -307,7 +310,7 @@ class MassMail(DocumentMixin, WBModel):
             context["attachment_url"] = attachment_url
         if emails.exists():
             email_contact = emails.first()
-            unsubscribe_url = f'{settings.BASE_ENDPOINT_URL}{reverse("wbmailing:manage_mailing_list_subscriptions", args=[email_contact.id])}'
+            unsubscribe_url = f"{settings.BASE_ENDPOINT_URL}{reverse('wbmailing:manage_mailing_list_subscriptions', args=[email_contact.id])}"
             context["unsubscribe"] = f"<a href={unsubscribe_url}>" + _("Unsubscribe</a>")
             entry = email_contact.entry
             if entry:
@@ -820,10 +823,10 @@ def handle_mail_tracking(sender, event, esp_name, **kwargs):  # noqa: C901
                 )
 
     else:
-        capture_message(gettext("Received event but could not find related mail"))
+        logger.warning(f"Received event but could not find related mail: {event}")
 
 
-@shared_task
+@shared_task(queue=Queue.HIGH_PRIORITY.value)
 def send_mail_as_task(
     subject=None,
     body=None,
@@ -847,7 +850,7 @@ def send_mail_as_task(
     msg.send()
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def send_mass_mail_as_task(mass_mail_id: int, email_address: str):
     mass_mail = MassMail.objects.get(id=mass_mail_id)
     try:
@@ -869,7 +872,7 @@ def send_mass_mail_as_task(mass_mail_id: int, email_address: str):
                 )
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def send_mail_task(mass_mail_id):
     """
     MailingListSubscriberChangeRequest post_save signal: Automatically approve if user is superuser/manager

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/tasks.py

@@ -1,10 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
-from datetime import datetime
-
 from celery import shared_task
 from django.db.models import Q
 from django.utils import timezone
+from wbcore.workers import Queue
 
 from wbmailing.models import (
     MailingListEmailContactThroughModel,
@@ -13,7 +12,7 @@ from wbmailing.models import (
 )
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def check_and_remove_expired_mailinglist_subscription(date=None):
     """
     Shared tasks to expire contact in MailingList.
@@ -30,9 +29,9 @@ def check_and_remove_expired_mailinglist_subscription(date=None):
         request.save()
 
 
-@shared_task
+@shared_task(queue=Queue.BACKGROUND.value)
 def periodic_send_mass_mail_as_tasks():
-    mass_mails = MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=datetime.now()))
+    mass_mails = MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=timezone.now()))
     for mass_mail in mass_mails:
         mass_mail.send()
         mass_mail.save()

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/tests/models/test_mails.py

@@ -9,7 +9,7 @@ from wbcore.contrib.directory.factories import EmailContactFactory
 from wbcore.contrib.documents.factories import DocumentFactory
 from wbcore.test.utils import get_or_create_superuser
 
-from wbmailing.backend import SendgridEmailBackend
+from wbmailing.backend import AnymailPostmarkBackend
 from wbmailing.factories import ToEmailMailFactory
 from wbmailing.models import MailEvent, MassMail
 from wbmailing.models.mails import (
@@ -153,20 +153,20 @@ class TestSpecificModels:
             esp_event=esp_event,
         )
         # sender(class) – The source of the event.  (One of theanymail.webhook.*Viewclasses, but you generally won’t examine this parameter; it’s required by Django’s signalmechanism.
-        tracking.send(sender=msg, event=mevent, esp_name="SendGrid")
+        tracking.send(sender=msg, event=mevent, esp_name="Postmark")
 
         if exits_message_id == "YES":
             assert MailEvent.objects.filter(mail=ml, recipient=mailevent.recipient).count() == 2
         else:
             assert MailEvent.objects.filter(mail=ml, recipient=mailevent.recipient).count() == 1
 
-    @override_settings(EMAIL_BACKEND="anymail.backends.test.EmailBackend", ANYMAIL_SENDGRID_API_KEY="TEST")
-    @patch("wbmailing.backend.SendgridEmailBackend._send")
+    @override_settings(EMAIL_BACKEND="anymail.backends.test.EmailBackend", ANYMAIL_POSTMARK_SERVER_TOKEN="TEST")
+    @patch("wbmailing.backend.AnymailPostmarkBackend._send")
     @pytest.mark.parametrize("resend, exit_document", [(False, False), (False, True), (True, False)])
-    def test_sendgridemailbackend_send_messages(self, mock_send, resend, exit_document):
+    def test_emailbackend_send_messages(self, mock_send, resend, exit_document):
         request = APIRequestFactory().get("")
         request.user = get_or_create_superuser()
-        num_sent = SendgridEmailBackend().send_messages(None)
+        num_sent = AnymailPostmarkBackend().send_messages(None)
         assert num_sent == 0
         doc1 = DocumentFactory()
         ml = ToEmailMailFactory(cc_email=(EmailContactFactory(),), attachments=(doc1,))
@@ -193,7 +193,7 @@ class TestSpecificModels:
         mock_send.return_value.status_code = 200
         mock_send.return_value.json.return_value = msg
 
-        num_sent = SendgridEmailBackend().send_messages(email_messages)
+        num_sent = AnymailPostmarkBackend().send_messages(email_messages)
         mock_send.assert_called()
         assert mock_send.call_count == 1
         assert num_sent == 1

{wbmailing-1.58.4 → wbmailing-1.59.10}/wbmailing/tests/test_tasks.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import timedelta
 from unittest.mock import patch
 
 import pytest
@@ -40,11 +40,11 @@ class TestSpecificTasks:
         send_date = timezone.now() - timedelta(minutes=15)
         mass_mail_factory(status=MassMail.Status.SEND_LATER, send_at=send_date)
         assert (
-            MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=datetime.now())).count() == 1
+            MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=timezone.now())).count() == 1
         )
         periodic_send_mass_mail_as_tasks()
         send_mail_task.assert_called()
         assert send_mail_task.call_count == 1
         assert (
-            MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=datetime.now())).count() == 0
+            MassMail.objects.filter(Q(status=MassMail.Status.SEND_LATER) & Q(send_at__lte=timezone.now())).count() == 0
         )