fix: filter to get active user subscriptions

manage_subscriptions/models.py

@@ -146,23 +146,23 @@ class PrincipalSubscription(BaseModel):
         return cls.objects.filter(
             principal=principal,
             is_paid=True,
-            cancelled=False,
+            # cancelled=False,
             deleted=False,
             active=True,
-            status=SubscriptionStatus.ACTIVE,
+            # status=SubscriptionStatus.ACTIVE,
             grace_period_end_date__gt=timezone.now().date(),
         )
 
-    # need to improve this 
+ 
     @classmethod
     def get_principal_subscription(cls, principal):
         return cls.objects.filter(
             principal=principal,
             is_paid=True,
-            cancelled=False,
+            # cancelled=False,
             deleted=False,
             active=True,
-            status=SubscriptionStatus.ACTIVE,
+            # status=SubscriptionStatus.ACTIVE,
         ).order_by("-grace_period_end_date").first()
 
 

manage_subscriptions/views.py

@@ -723,7 +723,7 @@ class CancelSubscriptionView(LoginRequiredMixin, generic.View):
                 # Updating subscription status in the local database
                 subscription.status = SubscriptionStatus.INACTIVE
                 subscription.cancelled = True
-                subscription.active = False
+                subscription.auto_renew = False
                 subscription.cancelled_date_time = timezone.now()
                 subscription.save()