added sending threshold

src/api/management/commands/send-messages.py

@@ -28,6 +28,7 @@ def handle(self, *args: t.Any, **options: t.Any) -> None:
             a = input("Are you sure you want to send messages? [y/N] ")
             if a.lower() != "y":
                 return
+        print(f"Sending messages for {party} (dry: {dry})")
         send_due_messages(
             party, dry=dry, wait=options["wait"], refresh=options["refresh"], force=options["force"]
         )

src/api/messages.py

@@ -1,4 +1,6 @@
 import logging
+from datetime import timedelta
+from pathlib import Path
 
 from dateutil.relativedelta import relativedelta
 from django.contrib.sites.models import Site
@@ -10,65 +12,26 @@
 
 logger = logging.getLogger("twilio_whatsapp")
 
-TEMPLATES = {
-    "Invitation": ("""🏳️‍🌈 *INVITATION: {party}* 🏳️‍🌈
 
-Hi, {name}!
-
-You are invited to *{party}*!
-
-Here's your *personal* link to manage your invitation:
-
-{url}
-
-Don't share this link with anyone else, it's only yours!
-
-(Send "stop" to unsubscribe)""", relativedelta(month=1, hour=1)),
-
-    "2-week reminder": ("""🏳️‍🌈 *2-WEEK REMINDER: {party}* 🏳️‍🌈
-
-Hi, {name}!
-
-This is just to remind you that you are invited to *{party}*!
-
-Here's your *personal* link to manage your invitation:
-
-{url}
-
-Don't share this link with anyone else, it's only yours!
-
-(Send "stop" to unsubscribe)""", relativedelta(weeks=2, hour=1)),
-    "1-week reminder": ("""🏳️‍🌈 *1-WEEK REMINDER: {party}* 🏳️‍🌈
-
-Hi, {name}!
-
-This is just to remind you that you are invited to *{party}*!
-
-Here's your *personal* link to manage your invitation:
-
-{url}
-
-Don't share this link with anyone else, it's only yours!
-
-(Send "stop" to unsubscribe)""", relativedelta(weeks=1, hour=1)),
-    "Final reminder": ("""🏳️‍🌈 *FINAL REMINDER: {party}* 🏳️‍🌈
-
-Hi, {name}!
-
-This is just to remind you that you are invited to *{party}*!
-
-Here's your *personal* link to manage your invitation:
-
-{url}
-
-Don't share this link with anyone else, it's only yours!
-
-(Send "stop" to unsubscribe)""", relativedelta(days=2, hour=1)),
-}
-
-
-# message_statuses = ["accepted", "scheduled", "canceled", "queued", "sending",
-# "sent", "failed", "delivered", "undelivered", "receiving", "received", "read"]
+def load_templates():
+    template_dir = Path(__file__).parent / 'templates' / 'api'
+    templates = {}
+    delta_dict = {
+        "Invitation": (relativedelta(month=1, hour=1), None),
+        "2-week reminder": (relativedelta(weeks=2, hour=1), timedelta(days=1)),
+        "1-week reminder": (relativedelta(weeks=1, hour=1), timedelta(days=1)),
+        "Final reminder": (relativedelta(days=2, hour=1), timedelta(days=1)),
+    }
+    for file_path in template_dir.glob('*.txt'):
+        with file_path.open('r') as file:
+            content = file.read().strip()
+        # Use the file stem (without extension) as the key and content as the value
+        file_stem = file_path.stem
+        templates[file_stem] = (content, *delta_dict.get(file_stem))
+    return templates
+
+
+TEMPLATES = load_templates()
 
 
 def send_whatsapp_message(to: str, body: str) -> MessageInstance | None:

src/api/migrations/0028_message_send_threshold.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-01-10 10:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0027_alter_message_text'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='message',
+            name='send_threshold',
+            field=models.DurationField(blank=True, null=True),
+        ),
+    ]

src/api/models.py

@@ -332,6 +332,7 @@ class Message(models.Model):
     text = MarkdownField(rendered_field='text_rendered', validator=VALIDATOR_STANDARD, default="", blank=True)
     text_rendered = RenderedMarkdownField()
     due_at = models.DateTimeField(db_index=True, null=True, blank=True)
+    send_threshold = models.DurationField(null=True, blank=True)
     draft = models.BooleanField(default=True, db_index=True)
 
     class Meta:
@@ -456,12 +457,13 @@ def create_invite(sender, instance: Party, created: bool, **kwargs):
 
 @receiver(post_save, sender=Party)
 def create_party_default_messages(sender, instance: Party, created: bool, **kwargs):
-    for title, (message, delta) in TEMPLATES.items():
+    for title, (message, delta, send_threshold) in TEMPLATES.items():
         msg_instance, created = Message.objects.get_or_create(party=instance, title=title)
         if not created:
             continue
         msg_instance.text = message
         msg_instance.due_at = instance.date_and_time - delta
+        msg_instance.send_threshold = send_threshold
         msg_instance.draft = False
         msg_instance.save()
 

src/api/tasks.py

@@ -3,7 +3,7 @@
 
 from celery import shared_task
 from django.contrib.sites.models import Site
-from django.db.models import Q
+from django.db.models import F, Q
 from django.shortcuts import reverse
 from django.utils import timezone
 
@@ -23,7 +23,11 @@ def send_due_messages(
     site = Site.objects.get_current()
     party_url = f"https://{site.domain}" + reverse('party', kwargs={"edition": party.edition})
     sent = []
-    messages = models.Message.objects.filter(party=party, due_at__lte=timezone.now(), draft=False).order_by("due_at")
+    current_time = timezone.now()
+    messages = models.Message.objects.filter(party=party, due_at__lte=current_time, draft=False).exclude(
+        Q(send_threshold__isnull=False) &
+        Q(due_at__lt=current_time - F('send_threshold'))
+    ).order_by("due_at")
     recipents = _get_recipients(party)
     for person in recipents:
         for message in messages:

src/api/templates/api/1-week reminder.txt

@@ -0,0 +1,13 @@
+🏳️‍🌈 *1-WEEK REMINDER: {party}* 🏳️‍🌈
+
+Hi, {name}!
+
+This is just to remind you that you are invited to *{party}*!
+
+Here's your *personal* link to manage your invitation:
+
+{url}
+
+Don't share this link with anyone else, it's only yours!
+
+(Send "stop" to unsubscribe)

src/api/templates/api/2-week reminder.txt

@@ -0,0 +1,13 @@
+🏳️‍🌈 *2-WEEK REMINDER: {party}* 🏳️‍🌈
+
+Hi, {name}!
+
+This is just to remind you that you are invited to *{party}*!
+
+Here's your *personal* link to manage your invitation:
+
+{url}
+
+Don't share this link with anyone else, it's only yours!
+
+(Send "stop" to unsubscribe)

src/api/templates/api/Final reminder.txt

@@ -0,0 +1,13 @@
+🏳️‍🌈 *FINAL REMINDER: {party}* 🏳️‍🌈
+
+Hi, {name}!
+
+This is just to remind you that you are invited to *{party}*!
+
+Here's your *personal* link to manage your invitation:
+
+{url}
+
+Don't share this link with anyone else, it's only yours!
+
+(Send "stop" to unsubscribe)

src/api/templates/api/Invitation.txt

@@ -0,0 +1,13 @@
+🏳️‍🌈 *INVITATION: {party}* 🏳️‍🌈
+
+Hi, {name}!
+
+You are invited to *{party}*!
+
+Here's your *personal* link to manage your invitation:
+
+{url}
+
+Don't share this link with anyone else, it's only yours!
+
+(Send "stop" to unsubscribe)