wbmailing 1.51.7__tar.gz → 1.58.1__tar.gz

{wbmailing-1.51.7 → wbmailing-1.58.1}/PKG-INFO

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

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/filters/mailing_lists.py

@@ -68,7 +68,6 @@ class MailStatusMassMailFilterSet(wb_filters.FilterSet):
 class MailingListEmailContactThroughModelModelFilterSet(wb_filters.FilterSet):
     expiration_date = wb_filters.DateTimeRangeFilter(
         label=_("Expiration Date"),
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
     )
     is_pending_request_change = wb_filters.BooleanFilter(
         label=_("Pending Change"), lookup_expr="exact", field_name="is_pending_request_change"

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/models/mailing_lists.py

@@ -237,6 +237,9 @@ class MailingListEmailContactThroughModel(models.Model):
     class Meta:
         unique_together = ("mailing_list", "email_contact")
 
+    def __str__(self) -> str:
+        return f"{self.mailing_list} - {self.email_contact}"
+
     def change_state(self, automatically_approve: bool = False, **kwargs):
         """
         When called, change the state of the relationship from subscribe to unsubscribe or unsubscribe to subscribe

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/models/mails.py

@@ -404,7 +404,8 @@ class Mail(DocumentMixin, WBModel):
         )
 
         document_type, created = DocumentType.objects.get_or_create(name="mailing")
-        for name, payload, mimetype in attachments:
+        for attachment in attachments:
+            name, payload = attachment[0:2]
             # If an alternative sent from DMS is found, we match against the attachment email.
             dms_elements = list(filter(lambda x: x["filename"] == name, dms_alternatives))
             if (len(dms_elements) == 1) and (document_id := dms_elements[0].get("id", None)):
@@ -626,6 +627,9 @@ class MailEvent(models.Model):
         verbose_name = _("Mail Event")
         verbose_name_plural = _("Mail Events")
 
+    def __str__(self) -> str:
+        return f"{self.mail} - {self.event_type}"
+
     @classmethod
     def subquery_delivered_mails(cls, mass_mail_name="pk"):
         """
@@ -713,7 +717,7 @@ class MailTemplate(WBModel):
 
 
 @receiver(tracking)
-def handle_mail_tracking(sender, event, esp_name, **kwargs):
+def handle_mail_tracking(sender, event, esp_name, **kwargs):  # noqa: C901
     """
     Signal triggered by the Sendgrid sdk. Create MailEvent
     """
@@ -741,7 +745,7 @@ def handle_mail_tracking(sender, event, esp_name, **kwargs):
                         automatically_approve=automatically_approve,
                     )
 
-    def get_mail(message_id, tags=[]):
+    def get_mail(message_id, tags: list | None = None):
         mail = Mail.objects.filter(message_ids__contains=[event.message_id]).first()
         if mail:
             return mail

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/templatetags/mailing_tags.py

@@ -5,7 +5,7 @@ register = template.Library()
 
 
 @register.filter
-def stripAndsplit(string, sep):
+def stripAndsplit(string, sep):  # noqa
     """Return the string split by sep.
 
     Example usage: {{ value|split:"/" }}

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/tests/models/test_mails.py

@@ -163,7 +163,7 @@ class TestSpecificModels:
     @override_settings(EMAIL_BACKEND="anymail.backends.test.EmailBackend", ANYMAIL_SENDGRID_API_KEY="TEST")
     @patch("wbmailing.backend.SendgridEmailBackend._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_sendgridemailbackend_send_messages(self, mock_send, resend, exit_document):
         request = APIRequestFactory().get("")
         request.user = get_or_create_superuser()
         num_sent = SendgridEmailBackend().send_messages(None)
@@ -184,7 +184,7 @@ class TestSpecificModels:
         msg.send()
 
         if exit_document:
-            for name, payload, mimetype in msg.attachments:
+            for name, _, _ in msg.attachments:
                 doc1.name = name
                 doc1.save()
 

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/tests/test_viewsets.py

@@ -177,8 +177,8 @@ class TestSpecificViewsets:
         request = APIRequestFactory().get("")
         request.user = user
         factory = get_model_factory(MailingListSubscriberChangeRequestModelViewSet().get_serializer_class().Meta.model)
-        for i in range(2):
-            obj = factory()
+        factory.create()
+        obj = factory()
         kwargs = get_kwargs(obj, MailingListSubscriberChangeRequestModelViewSet, request)
         assert (
             MailingListSubscriberChangeRequest.objects.filter(
@@ -196,7 +196,7 @@ class TestSpecificViewsets:
     @pytest.mark.parametrize(
         "mvs, factory", [(ManageMailingListSubscriptions, MailingListEmailContactThroughModelFactory)]
     )
-    def test_ManageMailingListSubscriptions(self, mvs, factory, user):
+    def test_managemailinglistsubscriptions(self, mvs, factory, user):
         request = APIRequestFactory().get("")
         request.user = user
         through_model = factory()
@@ -205,7 +205,7 @@ class TestSpecificViewsets:
         assert response.content
 
     @pytest.mark.parametrize("mvs, factory", [(UnsubscribeView, MailingListEmailContactThroughModelFactory)])
-    def test_UnsubscribeView(self, mvs, factory, user):
+    def test_unsubscribeview(self, mvs, factory, user):
         request = APIRequestFactory().get("")
         request.user = user
         through_model = factory()

{wbmailing-1.51.7 → wbmailing-1.58.1}/wbmailing/tests/tests.py

@@ -59,7 +59,7 @@ class TestSpecificAdmin:
         assert len(mail.outbox) == nb_mail_send + 1
 
     @patch("wbmailing.models.mails.send_mail_as_task.delay")
-    def test_MailAdmin(self, send_mail_as_task, user):
+    def test_mailadmin(self, send_mail_as_task, user):
         request = APIRequestFactory().get("")
         request.user = user
         ToEmailMailFactory()
@@ -91,7 +91,7 @@ class TestSpecificAdmin:
         send_mail_as_task(**msg)
         assert len(mail.outbox) == 1
 
-    def test_stripAndsplit(self):
+    def test_stripandsplit(self):
         string = "diego loic is the best man"
         result = stripAndsplit(string, " ")
         assert len(result) == 6
@@ -123,8 +123,8 @@ class TestSpecificAdmin:
         request = APIRequestFactory().get("")
         request.user = user
         factory = get_model_factory(mvs().get_serializer_class().Meta.model)
-        for i in range(2):
-            obj = factory()
+        factory()
+        obj = factory()
         kwargs = get_kwargs(obj, mvs, request)
         assert (
             MailingListSubscriberChangeRequest.objects.filter(