wbmailing 1.51.1__py2.py3-none-any.whl → 1.51.2__py2.py3-none-any.whl

wbmailing/tests/signals.py

@@ -56,7 +56,6 @@ def receive_factory_email(sender, *args, **kwargs):
 
 
 @receiver(custom_update_data_from_factory, sender=MailingListSubscriberRequestMailingListModelViewSet)
-@receiver(custom_update_data_from_factory, sender=MailingListSubscriberRequestEntryModelViewSet)
 @receiver(custom_update_data_from_factory, sender=MailingListSubscriberChangeRequestModelViewSet)
 def receive_data_mailinglist_subscriber(sender, *args, **kwargs):
     if obj := kwargs.get("obj_factory"):
@@ -66,6 +65,15 @@ def receive_data_mailinglist_subscriber(sender, *args, **kwargs):
     return {}
 
 
+@receiver(custom_update_data_from_factory, sender=MailingListSubscriberRequestEntryModelViewSet)
+def receive_data_mailinglistrequest_entry_subscriber(sender, *args, **kwargs):
+    if obj := kwargs.get("obj_factory"):
+        obj.status = MailingListSubscriberChangeRequest.Status.APPROVED
+        obj.save()
+        return {"entry_id": obj.email_contact.entry.id}
+    return {}
+
+
 @receiver(custom_update_data_from_factory, sender=EmailContactMailingListModelViewSet)
 def receive_data_email_contact_mailinglist(sender, *args, **kwargs):
     if obj := kwargs.get("obj_factory"):

wbmailing/viewsets/endpoints/mailing_lists.py

@@ -15,13 +15,6 @@ class EmailContactMailingListEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:mailing_list-email_contacts-list",
-            args=[self.view.kwargs["mailing_list_id"]],
-            request=self.request,
-        )
-
     def get_create_endpoint(self, **kwargs):
         return reverse(
             "wbmailing:mailing_list-mailinglistsubscriberchangerequest-list",
@@ -33,13 +26,6 @@ class EmailContactMailingListEndpointConfig(EndpointViewConfig):
 class MailingListEntryEndpointConfig(EndpointViewConfig):
     PK_FIELD = "mailing_list"
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:entry-mailinglist-list",
-            args=[self.view.kwargs["entry_id"]],
-            request=self.request,
-        )
-
     def get_instance_endpoint(self, **kwargs):
         return reverse(
             "wbmailing:mailinglist-list",
@@ -77,10 +63,3 @@ class MailingListSubscriberRequestEntryEndpointConfig(EndpointViewConfig):
 
     def get_create_endpoint(self, **kwargs):
         return self.get_instance_endpoint(**kwargs)
-
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:entry-mailinglistsubscriberchangerequest-list",
-            args=[self.view.kwargs["entry_id"]],
-            request=self.request,
-        )

wbmailing/viewsets/endpoints/mails.py

@@ -10,13 +10,6 @@ class MailStatusMassMailEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:massmail-mailstatus-list",
-            args=[self.view.kwargs["mass_mail_id"]],
-            request=self.request,
-        )
-
     def get_instance_endpoint(self, **kwargs):
         endpoint = reverse(
             "wbmailing:mail-list",
@@ -32,21 +25,7 @@ class MailEventMailEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:mail-mailevent-list",
-            args=[self.view.kwargs["mail_id"]],
-            request=self.request,
-        )
-
 
 class MailEventMassMailEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
-
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbmailing:massmail-mailevent-list",
-            args=[self.view.kwargs["mass_mail_id"]],
-            request=self.request,
-        )

wbmailing/viewsets/mailing_lists.py

@@ -267,8 +267,11 @@ class MailingListSubscriberRequestEntryModelViewSet(MailingListSubscriberChangeR
     endpoint_config_class = MailingListSubscriberRequestEntryEndpointConfig
 
     @cached_property
-    def primary_email(self):
-        return EmailContact.objects.filter(entry=self.kwargs["entry_id"], primary=True).first()
+    def primary_email(self) -> EmailContact | None:
+        try:
+            return EmailContact.objects.filter(entry=self.kwargs["entry_id"], primary=True).first()
+        except KeyError:
+            return None
 
     def get_serializer_class(self):
         if self.primary_email:

{wbmailing-1.51.1.dist-info → wbmailing-1.51.2.dist-info}/METADATA

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

{wbmailing-1.51.1.dist-info → wbmailing-1.51.2.dist-info}/RECORD

@@ -10,7 +10,13 @@ wbmailing/urls.py,sha256=pFaPAoT443HF9aqyVZ8DGTsFP2vjDlpTwzNcxIg0ntI,3784
 wbmailing/filters/__init__.py,sha256=fTZ6DyP4ey0kYFB4PC4zUIadtbaZmxwadHGmmE-9PDA,281
 wbmailing/filters/mailing_lists.py,sha256=hy90873oav5Q_lwcLFtXe8F2JBH_0pY2XAc4l3AQ_0I,3276
 wbmailing/filters/mails.py,sha256=-ZZJ2PFqXx5p2PkSG4VEPcMTOwkkLZTAVwNV9KrvJVs,2767
-wbmailing/locale/de/LC_MESSAGES/django.po,sha256=hLWrRDAp4p_LsCEGvg2APmgpUOQ27j2InDqiRqwtIGk,32693
+wbmailing/locale/de/LC_MESSAGES/django.mo,sha256=__qDb85V3dzdtZ3bXCpCCtI5eHGM2SBl9qe2b60k0Lg,18738
+wbmailing/locale/de/LC_MESSAGES/django.po,sha256=yhgcXEXt4AdenSfpuwx5gKgEzM5yLg_gDewegFbS9sg,29750
+wbmailing/locale/de/LC_MESSAGES/django.po.translated,sha256=hLWrRDAp4p_LsCEGvg2APmgpUOQ27j2InDqiRqwtIGk,32693
+wbmailing/locale/en/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
+wbmailing/locale/en/LC_MESSAGES/django.po,sha256=472QWnk48ACTxEfYMhIpcPKNLzovsjjq9H0k9O2WZ3A,22067
+wbmailing/locale/fr/LC_MESSAGES/django.mo,sha256=t4lh3zX7kshbDAFzXa5HU_YGPXkPzKqODNXL2MeZ5KQ,429
+wbmailing/locale/fr/LC_MESSAGES/django.po,sha256=UYypJISmZzkd-m2U08g2PfhF8p8HdLm0XSNyKMa9QjU,22123
 wbmailing/management/__init__.py,sha256=xv1hFgQUi9MwVLVXPxUNw1SPUyQcHLDgyNxHSz8Sodc,994
 wbmailing/migrations/0001_initial_squashed_squashed_0008_alter_mail_bcc_email_alter_mail_cc_email_and_more.py,sha256=ixjWLQdzQ8q04m6LbTL_DldipL8YPKtAYh50IRq5gu0,25679
 wbmailing/migrations/0002_delete_mailingsettings.py,sha256=gLR94m-PZO1XHaXTvVuk6T2BwhOpwImJ2xtPcpM2gDc,415
@@ -32,7 +38,7 @@ wbmailing/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 wbmailing/templatetags/mailing_tags.py,sha256=f79ahkpta-97t0oS_QHcfZCHbMCWFlQ8ypFbFki3nXQ,438
 wbmailing/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbmailing/tests/conftest.py,sha256=sUhy9eF5XiJHH67vtnpZRNio4we1nslw0e5njJJtZIc,993
-wbmailing/tests/signals.py,sha256=Uw3GPC2sSkegUAaCvCdJnYFYOm0JOREo5XsHA-C7Gy0,4980
+wbmailing/tests/signals.py,sha256=10dwI-Y8KOsDqtI0P-js-vmdrxx9ZBRijisqaiN2spU,5263
 wbmailing/tests/test_serializers.py,sha256=MzwcDSllsCqohKmTky7u5jf_NcLczPxH7l18VZhzwFQ,1149
 wbmailing/tests/test_tasks.py,sha256=QYurMZwpO9nm2Zu_RKi28eZhdDa6k5_PO8P5O-3q9N4,2104
 wbmailing/tests/test_viewsets.py,sha256=r446gKVGHBxq9GgwSgyA590d6K6B0T5ICKdFP4kYv1w,8982
@@ -42,7 +48,7 @@ wbmailing/tests/models/test_mailing_lists.py,sha256=ik_Xz3te-USuqojN9wn1qxb42o56
 wbmailing/tests/models/test_mails.py,sha256=0hgsSPt1N3HSM5UMPH04xjeJDaZSE3HBDAKMW9bMR6Y,8719
 wbmailing/viewsets/__init__.py,sha256=CFc_Of1qHtx2PVsRBcUREt6TSBW4uee1sjyJ_22Vyqc,986
 wbmailing/viewsets/analytics.py,sha256=vheoliS1lKhr9aXpcTnEKuQEBOy605lor1AbW3lSoDs,4152
-wbmailing/viewsets/mailing_lists.py,sha256=hXzJj0eDyUWvlEzjZ9TTAODcW80hcuvTGM0zSLgyJKQ,12912
+wbmailing/viewsets/mailing_lists.py,sha256=75ix9xurvXuO-uQHqmRhaAzHmV559ugYHcyLxMFqb8Q,13001
 wbmailing/viewsets/mails.py,sha256=QxsX7MGxYcKHZmIxj992uLANYRBAXwlBAkGUskQk1ic,15908
 wbmailing/viewsets/buttons/__init__.py,sha256=bk8OPmdAZNWged3CcUyFjbzTR2YP7230pwu01bvXLoY,267
 wbmailing/viewsets/buttons/mailing_lists.py,sha256=925ETQDaQ2389gg56di6R5vVaUHbkBvq5cAeI9PwuMY,3905
@@ -51,14 +57,14 @@ wbmailing/viewsets/display/__init__.py,sha256=Zzv31Li0pOy6bTuOlx226bIEwxjd217O-K
 wbmailing/viewsets/display/mailing_lists.py,sha256=sl7chZrRsruAZzN7YHeSvZCFEvVisKFK3bdHZFEHDPs,7019
 wbmailing/viewsets/display/mails.py,sha256=6LjhpljcXHnZAm1Hg4AmZAbTxLkjmgq4iBNRzAbcH50,13356
 wbmailing/viewsets/endpoints/__init__.py,sha256=hx1ASN20ZzQ6xeym5dWzY9tsFfv7MReoI3ZnKflIwjc,376
-wbmailing/viewsets/endpoints/mailing_lists.py,sha256=mvJYhbxqu3lwgyRsYzagGYglxnBw0-vWSWOaAecW6TI,2773
-wbmailing/viewsets/endpoints/mails.py,sha256=gLYqNAplSLto7873qiknIy-dLp3iINgi0EeiM__bMrw,1571
+wbmailing/viewsets/endpoints/mailing_lists.py,sha256=xEmlAYK4rtgrxhcTr-TLtBk2yS_YTrEUsDIdMqQyWmk,2106
+wbmailing/viewsets/endpoints/mails.py,sha256=BOF8P4glhLoLkxskitV6dqD30-5PnjUG3UaQqWdIYTk,937
 wbmailing/viewsets/menu/__init__.py,sha256=KotcNXYIfPvJfbiUgvmLCNw7_t1aahyP_GoAvuBscGQ,160
 wbmailing/viewsets/menu/mailing_lists.py,sha256=2pd7U0qpuCsjF3Kn_QrvevEJ0nWlbm5AqlI5sfxH5AM,1529
 wbmailing/viewsets/menu/mails.py,sha256=XCmDrcW6BGf2SFssywqUeUejSNAzNORGKCkwfhIe3ys,879
 wbmailing/viewsets/titles/__init__.py,sha256=L2LFtVlgmvcZDa5O0YF8_ZFgoL_TLnr30MwLME3KwmM,519
 wbmailing/viewsets/titles/mailing_lists.py,sha256=-oXBBHKh8KISsoFfqEdGXa1ScPoKvh70F7Txa5gxKrQ,2384
 wbmailing/viewsets/titles/mails.py,sha256=uNApgDNivu93z4fnbIhIlCKRXQplbQKGu_A696MaTkQ,1687
-wbmailing-1.51.1.dist-info/METADATA,sha256=HZyASrP0Fngy6Fy4qhCOO32MlF8TPZ1V9GHd7mziB2Y,171
-wbmailing-1.51.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbmailing-1.51.1.dist-info/RECORD,,
+wbmailing-1.51.2.dist-info/METADATA,sha256=SGgw72v-3m3V40n98AS84sCUX7EYjtI9UTDBnZl7tRo,171
+wbmailing-1.51.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbmailing-1.51.2.dist-info/RECORD,,