Add a cleardiv.

[wolnelektury.git] / src / messaging / models.py

diff --git a/src/messaging/models.py b/src/messaging/models.py
index da8a01e..fccd647 100644 (file)
--- a/src/messaging/models.py
+++ b/src/messaging/models.py
@@ -1,9 +1,11 @@
+from datetime import timedelta

 from django.apps import apps
 from django.conf import settings
 from django.core.mail import send_mail
 from django.db import models
 from django.template import Template, Context
 from django.urls import reverse
 from django.apps import apps
 from django.conf import settings
 from django.core.mail import send_mail
 from django.db import models
 from django.template import Template, Context
 from django.urls import reverse

+from django.utils.timezone import now, get_current_timezone

 from django.utils.translation import ugettext_lazy as _
 from sentry_sdk import capture_exception
 from catalogue.utils import get_random_hash
 from django.utils.translation import ugettext_lazy as _
 from sentry_sdk import capture_exception
 from catalogue.utils import get_random_hash


@@ -36,13 +38,24 @@ class EmailTemplate(models.Model):
     def __str__(self):
         return '%s (%+d)' % (self.get_state_display(), self.min_days_since or 0)
 
     def __str__(self):
         return '%s (%+d)' % (self.get_state_display(), self.min_days_since or 0)
 

+    @classmethod
+    def get_current(cls, time=None):
+        time = (time or now()).astimezone(get_current_timezone())
+        weekday = time.isoweekday()
+        qs = cls.objects.filter(is_active=True)
+        qs = qs.exclude(min_hour__gt=time.hour).exclude(max_hour__lte=time.hour)
+        qs = qs.exclude(min_day_of_month__gt=time.day).exclude(max_day_of_month__lte=time.day)
+        qs = qs.exclude(**{f'dow_{weekday}': False})
+        return qs
+

     def run(self, time=None, verbose=False, dry_run=False):
         state = self.get_state(time=time)
         contacts = state.get_contacts()
     
         contacts = contacts.exclude(emailsent__template=self)
         for contact in contacts:
     def run(self, time=None, verbose=False, dry_run=False):
         state = self.get_state(time=time)
         contacts = state.get_contacts()
     
         contacts = contacts.exclude(emailsent__template=self)
         for contact in contacts:

-            self.send(contact, verbose=verbose, dry_run=dry_run)
+            if not contact.is_annoyed:
+                self.send(contact, verbose=verbose, dry_run=dry_run)

 
     def get_state(self, time=None, test=False):
         for s in states:
 
     def get_state(self, time=None, test=False):
         for s in states:


@@ -69,7 +82,7 @@ class EmailTemplate(models.Model):
         body = Template(body_template).render(ctx)
 
         if verbose:
         body = Template(body_template).render(ctx)
 
         if verbose:

-            print(contact.email, subject)
+            print(self.pk, subject, contact.email)

         if not dry_run:
             try:
                 send_mail(subject, body, settings.CONTACT_EMAIL, [contact.email], fail_silently=False)
         if not dry_run:
             try:
                 send_mail(subject, body, settings.CONTACT_EMAIL, [contact.email], fail_silently=False)


@@ -114,6 +127,11 @@ class Contact(models.Model):
             self.key = get_random_hash(self.email)
         super().save(*args, **kwargs)
 
             self.key = get_random_hash(self.email)
         super().save(*args, **kwargs)
 

+    @property
+    def is_annoyed(self):
+        cutoff = now() - timedelta(settings.MESSAGING_MIN_DAYS)
+        return self.emailsent_set.filter(timestamp__gte=cutoff).exists()
+

     def get_optout_url(self):
         return reverse('messaging_optout', args=[self.key])
 
     def get_optout_url(self):
         return reverse('messaging_optout', args=[self.key])
 


@@ -127,7 +145,9 @@ class Contact(models.Model):
         if not created:
             obj.ascend(level, since, expires_at)
 
         if not created:
             obj.ascend(level, since, expires_at)
 

-    def ascend(self, level, since, expires_at=None):
+    def ascend(self, level, since=None, expires_at=None):
+        if since is None:
+            since = now()

         if level < self.level:
             return
         if level == self.level:
         if level < self.level:
             return
         if level == self.level:


@@ -157,5 +177,5 @@ class EmailSent(models.Model):
         ordering = ('-timestamp',)
 
     def __str__(self):
         ordering = ('-timestamp',)
 
     def __str__(self):

-        return '%s %s' % (self.email, self.timestamp)
+        return '%s %s' % (self.contact.email, self.timestamp)