#73: fix user status API

backend/subscription/serializers.py

@@ -7,6 +7,9 @@ def payment_response(payment, subscription, status):
             'confirmation_url': payment.confirmation.confirmation_url,
             'yookassa_payment_id': payment.id,
             'subscription_id': subscription.subscription_id
+        } if payment is not None else {
+            'yookassa_payment_id': subscription.yookassa_payment_method_id,
+            'subscription_id': subscription.subscription_id
         }, status=status
     )
 

backend/subscription/service.py

@@ -43,7 +43,7 @@ def get_subscription(subscription_id):
 
 
 def is_user_subscribed(user):
-    return Subscription.objects.filter(user=user, end_date__gt=today).exists()
+    return Subscription.objects.filter(user=user, end_date__gt=timezone.now()).exists()
 
 
 def get_user_subscription(user):
@@ -76,7 +76,7 @@ def create_subscription_payment(user):
 def recreate_subscription_payment(user, subscription):
     payment_description = f"Продление ежемесячной подписки для {user.email}"
 
-    if not subscription.end_date or subscription.end_date >= timezone.now():
+    if not subscription.end_date or subscription.end_date <= timezone.now():
         payment = create_payment(subscription, payment_description)
         return payment, subscription
     else:

backend/subscription/views.py

@@ -1,6 +1,5 @@
 import json
 import logging
-from ipaddress import ip_network
 
 from rest_framework.exceptions import ValidationError
 from rest_framework.response import Response