wagtail-newsletter-django-backend 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

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/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/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/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)

{wagtail_newsletter_django_backend-0.5.4.dist-info → wagtail_newsletter_django_backend-0.5.6.dist-info}/METADATA

@@ -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.dist-info → wagtail_newsletter_django_backend-0.5.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-wagtail_newsletter_django_backend/__init__.py,sha256=NF7ieder5YFxPvW6_O-XLC52ZjkETkySqeQZ_ppax-E,263
+wagtail_newsletter_django_backend/__init__.py,sha256=alZ9bbDpn1GrZyHtl_A2urxQ2jc6oOc3iX6QqRBmeyM,263
 wagtail_newsletter_django_backend/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 wagtail_newsletter_django_backend/admin_viewsets.py,sha256=FBiRwMT0vwvxSrNgEVy6UYeqKZDn8LJczSSnjedHDz0,2035
 wagtail_newsletter_django_backend/apps.py,sha256=fFm2QZzxZlpYBQTNRKzBXpzOUzjK5xbW2xCQdv5fNOA,281
-wagtail_newsletter_django_backend/campaign_backend.py,sha256=YikyzG5C8wg1WE92ZZlMAKw_wuD8X5LIB6b61C9qtR4,7539
+wagtail_newsletter_django_backend/campaign_backend.py,sha256=n2dk2RF-3MoHZlasTj7xOfwKDqtoVc0Mqyzhn-RhQ0k,8028
 wagtail_newsletter_django_backend/forms.py,sha256=5UK_-Fd7KuOtRkPZW_uyHM9D6BU5_JANKcM3WhAnew0,4009
-wagtail_newsletter_django_backend/models.py,sha256=a6pP9NSBXFl7Xcga2XbVRT0z9JUbM7eB0jYvSbQTx0w,12908
+wagtail_newsletter_django_backend/models.py,sha256=XQvde_2C_TC0FkDpX2ILuBjoC0PZ9ydAJ9-yz6x0nMo,12917
 wagtail_newsletter_django_backend/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 wagtail_newsletter_django_backend/urls.py,sha256=650q2IQKPOj6OSjVIB3QzxPl4n67M2MJwtFFEvJ3vOk,620
 wagtail_newsletter_django_backend/views.py,sha256=88UNdcJQzeTjLXJFI9chRgVHcowOZ_yvwe2v4_-FhVE,3200
@@ -14,6 +14,7 @@ wagtail_newsletter_django_backend/management/commands/__init__.py,sha256=47DEQpj
 wagtail_newsletter_django_backend/management/commands/send_scheduled_campaigns.py,sha256=YA6KLCUyHrHJqxc_qHP-JEBFh_U-0T2BPKiUeue8czA,320
 wagtail_newsletter_django_backend/migrations/0001_initial.py,sha256=DYuyU3MxhnhzKBPKlxZn2erP-lB9rGRUR4KngXRrBXw,11129
 wagtail_newsletter_django_backend/migrations/0002_alter_audience_name_alter_audiencesegment_name_and_more.py,sha256=-cvEvycnG5Q1bUyQOSyebfTDSrLND9TKTR7f2bEcbQU,1020
+wagtail_newsletter_django_backend/migrations/0003_alter_campaign_audience_segment.py,sha256=Z1A1VrcxqI7yHMcZgTU-Pv5SBBcAhIkMUeVQy-M9Hus,691
 wagtail_newsletter_django_backend/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail_newsletter_django_backend/templates/wagtail_newsletter_django_backend/manage.html,sha256=wrEOZgmu7YrE4J716e51FewJ-1WC4EXaJJyaIEbPucM,381
 wagtail_newsletter_django_backend/templates/wagtail_newsletter_django_backend/manage_tag.html,sha256=JfQIINFFA_aemgfzoOBY6LHdMgVBVoXOPbwiwsKRuDg,260
@@ -21,7 +22,7 @@ wagtail_newsletter_django_backend/templates/wagtail_newsletter_django_backend/un
 wagtail_newsletter_django_backend/templates/wagtail_newsletter_django_backend/unsubscribe_tag.html,sha256=DmM5O5ge-o7Q6y2rtiwOFyhzM9NaAtoq3AqCTi0cNvg,487
 wagtail_newsletter_django_backend/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail_newsletter_django_backend/templatetags/wagtail_newsletter_django_backend_tags.py,sha256=-NF9xEhCjojtMgQFBJRWrelB13dYYZFtuiL-a3zSKx8,490
-wagtail_newsletter_django_backend-0.5.4.dist-info/licenses/LICENSE,sha256=mLNEGyMZ9q73ep-adKoMoTX06QDYEd949WxgTKhl93A,33970
-wagtail_newsletter_django_backend-0.5.4.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-wagtail_newsletter_django_backend-0.5.4.dist-info/METADATA,sha256=J8TIUtd0Eceyrcd6p7XZ8gyPJ-dqekTCWk0rpV7fu4o,836
-wagtail_newsletter_django_backend-0.5.4.dist-info/RECORD,,
+wagtail_newsletter_django_backend-0.5.6.dist-info/licenses/LICENSE,sha256=mLNEGyMZ9q73ep-adKoMoTX06QDYEd949WxgTKhl93A,33970
+wagtail_newsletter_django_backend-0.5.6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+wagtail_newsletter_django_backend-0.5.6.dist-info/METADATA,sha256=poWVmRXYmtHKnCyETO45BKVwgyCbAhze-mIuGD1gqrc,836
+wagtail_newsletter_django_backend-0.5.6.dist-info/RECORD,,