From fa116c08c1bf3dbb955bef06a378803fdd38d1dd Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 5 Mar 2024 13:47:36 +0300 Subject: [PATCH] fix task --- SubscribesApp/views.py | 6 +++--- TWB/tasks.py | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SubscribesApp/views.py b/SubscribesApp/views.py index 59934e3..b55ab34 100644 --- a/SubscribesApp/views.py +++ b/SubscribesApp/views.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User +from django.http import JsonResponse from rest_framework import status from rest_framework.permissions import IsAuthenticated -from rest_framework.response import Response from rest_framework.views import APIView from SubscribesApp.models import SubscribeForUser @@ -31,6 +31,6 @@ class SubscribersView(APIView): else: subscribe_for_user.update(auto_continue=False) - return Response("Subscriptions updated successfully", status=status.HTTP_200_OK) + return JsonResponse({"message": "Subscriptions updated successfully"}, status=status.HTTP_200_OK) - return Response("User not found", status=status.HTTP_404_NOT_FOUND) + return JsonResponse({"message": "User not found"}, status=status.HTTP_404_NOT_FOUND) diff --git a/TWB/tasks.py b/TWB/tasks.py index 7a1dd5e..0963714 100644 --- a/TWB/tasks.py +++ b/TWB/tasks.py @@ -25,16 +25,16 @@ def check_auto_subscribe(): def subscription_expiration_check(): current_time = datetime.now() subscribes = SubscribeForUser.objects.filter(paid_period_to_DT__gte=current_time) + if subscribes: + for subscribe in subscribes: + expiration_date = subscribe.paid_period_to_DT + remaining_days = (expiration_date - current_time).days - for subscribe in subscribes: - expiration_date = subscribe.paid_period_to_DT - remaining_days = (expiration_date - current_time).days + if remaining_days <= 7: + message = f'Ваша подписка заканчивается через {remaining_days} дня. Пожалуйста, продлите её.' - if remaining_days <= 7: - message = f'Ваша подписка заканчивается через {remaining_days} дня. Пожалуйста, продлите её.' - - user_email = subscribe.user.email - subject = 'Подписка истекает!' - send_mail(subject, message, settings.EMAIL_HOST_USER, [user_email], fail_silently=False) + user_email = subscribe.user.email + subject = 'Подписка истекает!' + send_mail(subject, message, settings.EMAIL_HOST_USER, [user_email], fail_silently=False) else: print('Нету подписок') \ No newline at end of file