fix task

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)

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:
+            if remaining_days <= 7:
-        expiration_date = subscribe.paid_period_to_DT
+                message = f'Ваша подписка заканчивается через {remaining_days} дня. Пожалуйста, продлите её.'
-        remaining_days = (expiration_date - current_time).days
 
-        if remaining_days <= 7:
+            user_email = subscribe.user.email
-            message = f'Ваша подписка заканчивается через {remaining_days} дня. Пожалуйста, продлите её.'
+            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('Нету подписок')