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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-newsletter-django-backend
-Version: 0.5.2
+Version: 0.5.4
 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.2 → wagtail_newsletter_django_backend-0.5.4}/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.2'
+__version__ = '0.5.4'

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

@@ -60,15 +60,25 @@ class CampaignBackend(wncb.CampaignBackend):
             audience_segment = models.AudienceSegment.objects.get(id=int(recipients.segment.split('/')[-1]))
 
         with transaction.atomic():
-            campaign: models.Campaign
+            campaign: models.Campaign | None
             if campaign_id:
-                campaign = models.Campaign.objects.get(id=int(campaign_id))
-                campaign.subject = subject
-                campaign.html = html.strip()
-                if audience_segment is not None:
-                    campaign.audience_segment = audience_segment
-                campaign.full_clean()
-                campaign.save()
+                int_campaign_id = int(campaign_id)
+                campaign = models.Campaign.objects.filter(id=int_campaign_id).first()
+                if campaign is None:
+                    # No campaign exists with that ID anymore; recreate it.
+                    campaign = models.Campaign.objects.create(
+                        id=int_campaign_id,
+                        subject=subject,
+                        html=html.strip(),
+                        audience_segment=audience_segment,
+                    )
+                else:
+                    campaign.subject = subject
+                    campaign.html = html.strip()
+                    if audience_segment is not None:
+                        campaign.audience_segment = audience_segment
+                    campaign.full_clean()
+                    campaign.save()
             else:
                 campaign = models.Campaign.objects.create(
                     subject=subject,
@@ -160,7 +170,7 @@ class CampaignBackend(wncb.CampaignBackend):
             ])
 
     def send_scheduled_campaigns(self) -> None:
-        for campaign in models.Campaign.objects.filter(sent_at=None, send_at__gte=timezone.now()):
+        for campaign in models.Campaign.objects.filter(sent_at=None, send_at__lte=timezone.now()):
             self.send_campaign(str(campaign.id))
 
     @override