wagtail-newsletter-django-backend 0.5.4__tar.gz → 0.5.6__tar.gz

{wagtail_newsletter_django_backend-0.5.4 → wagtail_newsletter_django_backend-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-newsletter-django-backend
-Version: 0.5.4
+Version: 0.5.6
 Summary: An internal Django backend to wagtail-newsletter.
 Author-email: "Taylor C. Richberger" <taylor@axfive.net>
 Maintainer-email: "Taylor C. Richberger" <taylor@axfive.net>

{wagtail_newsletter_django_backend-0.5.4 → wagtail_newsletter_django_backend-0.5.6}/src/wagtail_newsletter_django_backend/__init__.py

@@ -3,4 +3,4 @@
 This is a simple, basic internal backend for wagtail-newsletter, allowing you to manage your mailing lists internally and send them out through Django's standard email capabilities.
 '''
 
-__version__ = '0.5.4'
+__version__ = '0.5.6'

{wagtail_newsletter_django_backend-0.5.4 → wagtail_newsletter_django_backend-0.5.6}/src/wagtail_newsletter_django_backend/campaign_backend.py

@@ -25,7 +25,7 @@ class CampaignBackend(wncb.CampaignBackend):
                 id=str(audience.id),
                 pk=str(audience.pk),
                 name=audience.name,
-                member_count=audience.subscriber_set.count(),
+                member_count=audience.subscriber_set.filter(verified=True).count(),
             )
             for audience in models.Audience.objects.all()
         ]
@@ -41,7 +41,7 @@ class CampaignBackend(wncb.CampaignBackend):
                 id=f'{audience_id}/{audience_segment.id}',
                 pk=f'{audience_id}/{audience_segment.id}',
                 name=audience_segment.name,
-                member_count=audience_segment.subscribers.count(),
+                member_count=audience_segment.subscribers.filter(verified=True).count(),
             )
             for audience_segment in audience.audience_segment_set.all()
         ]
@@ -55,11 +55,11 @@ class CampaignBackend(wncb.CampaignBackend):
         subject: str,
         html: str,
     ) -> str:
-        audience_segment: models.AudienceSegment | None = None
-        if recipients is not None and recipients.segment:
-            audience_segment = models.AudienceSegment.objects.get(id=int(recipients.segment.split('/')[-1]))
-
         with transaction.atomic():
+            audience_segment: models.AudienceSegment | None = None
+            if recipients is not None and recipients.segment:
+                audience_segment = models.AudienceSegment.objects.get(id=int(recipients.segment.split('/')[-1]))
+
             campaign: models.Campaign | None
             if campaign_id:
                 int_campaign_id = int(campaign_id)
@@ -94,7 +94,13 @@ class CampaignBackend(wncb.CampaignBackend):
     @override
     def send_test_email(self, *, campaign_id: str, email: str) -> None:
         campaign = models.Campaign.objects.get(id=int(campaign_id))
-        audience = campaign.audience_segment.audience
+        audience: models.Audience
+        if campaign.audience_segment is not None:
+            audience = campaign.audience_segment.audience
+        else:
+            # Build empty audience.  Will have no subscribers, and no smtp data.
+            # This will not work without default data in the config.
+            audience = models.Audience()
 
         from_address = audience.from_address()
         user, password = audience.smtp_auth()
@@ -113,6 +119,9 @@ class CampaignBackend(wncb.CampaignBackend):
     def send_campaign(self, campaign_id: str) -> None:
         with transaction.atomic():
             campaign = models.Campaign.objects.get(id=int(campaign_id))
+            if campaign.audience_segment is None:
+                raise RuntimeError("Campaign can't be sent without an audience segment")
+
             audience = campaign.audience_segment.audience
 
             site = audience.site

wagtail_newsletter_django_backend-0.5.6/src/wagtail_newsletter_django_backend/migrations/0003_alter_campaign_audience_segment.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.5 on 2025-09-02 21:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "wagtail_newsletter_django_backend",
+            "0002_alter_audience_name_alter_audiencesegment_name_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="campaign",
+            name="audience_segment",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="wagtail_newsletter_django_backend.audiencesegment",
+            ),
+        ),
+    ]

{wagtail_newsletter_django_backend-0.5.4 → wagtail_newsletter_django_backend-0.5.6}/src/wagtail_newsletter_django_backend/models.py

@@ -252,7 +252,7 @@ class Campaign(models.Model):
     sent_at: 'models.DateTimeField[datetime | None]' = models.DateTimeField(blank=True, null=True, default=None)
     subject: 'models.TextField[str]' = models.TextField(blank=False, null=False)
     html: 'models.TextField[str]' = models.TextField(blank=False, null=False)
-    audience_segment: models.ForeignKey[AudienceSegment] = models.ForeignKey(AudienceSegment, blank=False, null=False, on_delete=models.CASCADE)
+    audience_segment: 'models.ForeignKey[AudienceSegment | None]' = models.ForeignKey(AudienceSegment, blank=False, null=True, on_delete=models.SET_NULL)
 
     created_at: 'models.DateTimeField[datetime]' = models.DateTimeField(auto_now_add=True)
     updated_at: 'models.DateTimeField[datetime]' = models.DateTimeField(auto_now=True)