fix: better datetime handle

vas3k · Oct 10, 2023 · 2534881 · 2534881
1 parent 8ba2362
commit 2534881
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/frontend/html/emails/subscription_expired.html b/frontend/html/emails/subscription_expired.html
@@ -75,3 +75,9 @@
 
     <br><br><br>
 {% endblock %}
+
+{% block unsubscribe %}
+    <p style="font-size: 12px;">
+        Если вам больше не хочется никогда получать никаких писем от Клуба,<br> нажмите <a href="{{ settings.APP_HOST }}/notifications/unsubscribe/%user_id%/%secret_code%/">отписаться вообще от всего</a>.
+    </p>
+{% endblock %}
diff --git a/payments/management/commands/send_subscription_expired.py b/payments/management/commands/send_subscription_expired.py
@@ -1,5 +1,6 @@
+import base64
 import logging
-from datetime import datetime, timedelta
+from datetime import timedelta, date
 
 from django.conf import settings
 from django.core.management import BaseCommand
@@ -11,7 +12,7 @@
 
 log = logging.getLogger(__name__)
 
-TIMEDELTA = timedelta(days=14)
+EXPIRATION_DAY = date.today() + timedelta(days=14)
 
 
 class Command(BaseCommand):
@@ -30,12 +31,11 @@ def handle(self, *args, **options):
         else:
             about_to_expire_users = User.objects\
                 .filter(
-                    membership_expires_at__gte=datetime.utcnow() + TIMEDELTA,
-                    membership_expires_at__lt=datetime.utcnow() + TIMEDELTA + timedelta(days=1),
+                    membership_expires_at__gte=EXPIRATION_DAY,
+                    membership_expires_at__lt=EXPIRATION_DAY + timedelta(days=1),
                     moderation_status=User.MODERATION_STATUS_APPROVED,
                     deleted_at__isnull=True,
                 )\
-                .exclude(is_email_unsubscribed=True)\
                 .exclude(membership_platform_type=User.MEMBERSHIP_PLATFORM_PATREON)
 
         for user in about_to_expire_users:
@@ -51,6 +51,11 @@ def handle(self, *args, **options):
                         "user": user,
                     })
 
+                    email = email\
+                        .replace("%username%", user.slug)\
+                        .replace("%user_id%", str(user.id))\
+                        .replace("%secret_code%", base64.b64encode(user.secret_hash.encode("utf-8")).decode())
+
                     send_club_email(
                         recipient=user.email,
                         subject=f"Ваша клубная карта скоро истечёт 😱",