fix(tier): require active, non-revoked, and non-expired subscription for pro/vip tiers

app/superadmin_routes.py

@@ -610,47 +610,97 @@ async def get_all_users(
 
         if tier and tier.strip() and tier.strip().upper() != "ALL":
             t = tier.strip().upper().replace(" ", "_")
+            now_dt = datetime.datetime.utcnow()
+            not_revoked_clause = {
+                "subscription.status": {"$nin": ["REVOKED", "CANCELLED", "EXPIRED", "revoked", "cancelled", "expired"]}
+            }
+            not_expired_clause = {
+                "$or": [
+                    {"subscription.expires_at": None},
+                    {"subscription.expires_at": {"$gte": now_dt}},
+                    {"subscription.expires_at": {"$exists": False}},
+                ]
+            }
+            pro_active_clause = {
+                "$or": [{"is_pro": True}, {"subscription.is_pro": True}]
+            }
+
             if t in ("20_ADFREE", "AD_FREE", "ADFREE", "20"):
                 tier_clause = {
-                    "$or": [
-                        {"is_ad_free_admob": True},
-                        {"subscription.plan_id": "sahih_ad_free_monthly"},
-                        {"subscription.amount": 20.0},
-                        {"subscription.tier": "AD_FREE"},
+                    "$and": [
+                        not_revoked_clause,
+                        not_expired_clause,
+                        {
+                            "$or": [
+                                {"is_ad_free_admob": True},
+                                {"subscription.plan_id": "sahih_ad_free_monthly"},
+                                {"subscription.amount": 20.0},
+                                {"subscription.tier": "AD_FREE"},
+                            ]
+                        }
                     ]
                 }
-            elif t in ("159_PRO", "PRO_MONTHLY", "159"):
+            elif t in ("VIP_PRO", "VIP", "VIP_OFFER"):
                 tier_clause = {
-                    "$or": [
-                        {"subscription.plan_id": "sahih_pro_monthly"},
-                        {"subscription.amount": 159.0},
-                        {"subscription.tier": "159_PRO"},
+                    "$and": [
+                        pro_active_clause,
+                        not_revoked_clause,
+                        not_expired_clause,
+                        {
+                            "$or": [
+                                {"subscription.tag": "VIP offer"},
+                                {"subscription.payment_method": "VIP offer"},
+                                {"subscription.plan_id": {"$in": ["vip_pro", "vip_offer", "pro_lifetime"]}},
+                                {"subscription.tier": "VIP_PRO"},
+                                {"is_vip": True},
+                            ]
+                        }
                     ]
                 }
-            elif t in ("800_PRO", "PRO_6MONTH", "800"):
+            elif t in ("1500_PRO", "PRO_ANNUAL", "1500"):
                 tier_clause = {
-                    "$or": [
-                        {"subscription.plan_id": "sahih_pro_6month"},
-                        {"subscription.amount": 800.0},
-                        {"subscription.tier": "800_PRO"},
+                    "$and": [
+                        pro_active_clause,
+                        not_revoked_clause,
+                        not_expired_clause,
+                        {
+                            "$or": [
+                                {"subscription.plan_id": "sahih_pro_annual"},
+                                {"subscription.amount": 1500.0},
+                                {"subscription.tier": "1500_PRO"},
+                            ]
+                        }
                     ]
                 }
-            elif t in ("1500_PRO", "PRO_ANNUAL", "1500"):
+            elif t in ("800_PRO", "PRO_6MONTH", "800"):
                 tier_clause = {
-                    "$or": [
-                        {"subscription.plan_id": "sahih_pro_annual"},
-                        {"subscription.amount": 1500.0},
-                        {"subscription.tier": "1500_PRO"},
+                    "$and": [
+                        pro_active_clause,
+                        not_revoked_clause,
+                        not_expired_clause,
+                        {
+                            "$or": [
+                                {"subscription.plan_id": "sahih_pro_6month"},
+                                {"subscription.amount": 800.0},
+                                {"subscription.tier": "800_PRO"},
+                            ]
+                        }
                     ]
                 }
-            elif t in ("VIP_PRO", "VIP", "VIP_OFFER"):
+            elif t in ("159_PRO", "PRO_MONTHLY", "159"):
                 tier_clause = {
-                    "$or": [
-                        {"subscription.tag": "VIP offer"},
-                        {"subscription.payment_method": "VIP offer"},
-                        {"subscription.plan_id": {"$in": ["vip_pro", "vip_offer", "pro_lifetime"]}},
-                        {"subscription.tier": "VIP_PRO"},
-                        {"is_vip": True},
+                    "$and": [
+                        pro_active_clause,
+                        not_revoked_clause,
+                        not_expired_clause,
+                        {
+                            "$or": [
+                                {"subscription.plan_id": "sahih_pro_monthly"},
+                                {"subscription.amount": 159.0},
+                                {"subscription.tier": "159_PRO"},
+                                {"subscription.tier": "PRO"},
+                            ]
+                        }
                     ]
                 }
             else:
@@ -786,24 +836,47 @@ async def get_all_users(
             # Canonical tier resolution across the 5 tiers:
             # 20 adfree, 159 pro, 800 pro, 1500 pro, vip pro (or FREE)
             sub = u.get("subscription") if isinstance(u.get("subscription"), dict) else {}
+            sub_status = str(sub.get("status") or "").upper()
+            is_revoked = sub_status in ("REVOKED", "CANCELLED", "EXPIRED")
+
+            is_expired = False
+            expires_at = sub.get("expires_at")
+            if expires_at:
+                try:
+                    if isinstance(expires_at, str):
+                        exp_dt = datetime.datetime.fromisoformat(expires_at.replace("Z", "+00:00"))
+                    elif isinstance(expires_at, datetime.datetime):
+                        exp_dt = expires_at
+                    else:
+                        exp_dt = None
+                    if exp_dt:
+                        if exp_dt.tzinfo is not None:
+                            exp_dt = exp_dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
+                        if exp_dt < datetime.datetime.utcnow():
+                            is_expired = True
+                except Exception:
+                    pass
+
+            is_pro_active = (bool(u.get("is_pro")) or bool(sub.get("is_pro"))) and not is_revoked and not is_expired
+            is_ad_free_active = bool(u.get("is_ad_free_admob")) and not is_revoked and not is_expired
+
             plan_id = str(sub.get("plan_id") or "").lower()
             tag = str(sub.get("tag") or "").lower()
             pay_method = str(sub.get("payment_method") or "").lower()
             tier_val = str(sub.get("tier") or "").upper()
             amt = float(sub.get("amount") or u.get("amount") or 0.0)
-            is_pro = bool(u.get("is_pro") or sub.get("is_pro", False))
-            is_ad_free = bool(u.get("is_ad_free_admob") or "ad_free" in plan_id or tier_val == "AD_FREE")
 
             resolved_tier = "FREE"
-            if "vip" in tag or "vip" in pay_method or "vip" in plan_id or u.get("is_vip") or tier_val in ("VIP", "VIP_PRO"):
-                resolved_tier = "VIP_PRO"
-            elif plan_id == "sahih_pro_annual" or "annual" in plan_id or amt == 1500.0 or tier_val in ("1500_PRO", "ANNUAL"):
-                resolved_tier = "1500_PRO"
-            elif plan_id == "sahih_pro_6month" or "6month" in plan_id or amt == 800.0 or tier_val in ("800_PRO",):
-                resolved_tier = "800_PRO"
-            elif plan_id == "sahih_pro_monthly" or amt == 159.0 or tier_val in ("159_PRO", "PRO") or is_pro:
-                resolved_tier = "159_PRO"
-            elif is_ad_free or plan_id == "sahih_ad_free_monthly" or amt == 20.0 or tier_val == "AD_FREE":
+            if is_pro_active:
+                if "vip" in tag or "vip" in pay_method or "vip" in plan_id or u.get("is_vip") or tier_val in ("VIP", "VIP_PRO"):
+                    resolved_tier = "VIP_PRO"
+                elif plan_id == "sahih_pro_annual" or "annual" in plan_id or amt == 1500.0 or tier_val in ("1500_PRO", "ANNUAL"):
+                    resolved_tier = "1500_PRO"
+                elif plan_id == "sahih_pro_6month" or "6month" in plan_id or amt == 800.0 or tier_val in ("800_PRO",):
+                    resolved_tier = "800_PRO"
+                else:
+                    resolved_tier = "159_PRO"
+            elif is_ad_free_active or (("ad_free" in plan_id or amt == 20.0 or tier_val == "AD_FREE") and not is_revoked and not is_expired):
                 resolved_tier = "20_ADFREE"
 
             u["tier"] = resolved_tier