Update subscriptions.py

subscriptions.py

@@ -5,14 +5,22 @@ SUPABASE_URL = os.getenv("SUPABASE_URL")
 SUPABASE_KEY = os.getenv("SUPABASE_SERVICE_ROLE_KEY")
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
+
 async def fetch_subscription(email: str):
-    user_res = supabase.table("auth.users").select("*").eq("email", email).execute()
+    user_res = supabase.rpc("get_user_info", {"email_input": email}).execute()
     if not user_res.data:
         return None
 
     user = user_res.data[0]
 
-    cust_res = supabase.table("stripe.customers").select("*").eq("email", email).execute()
+    # 2. Fetch Stripe customer
+    cust_res = (
+        supabase.table("stripe.customers")
+        .select("*")
+        .eq("email", email)
+        .execute()
+    )
+
     if not cust_res.data:
         return {
             "email": email,
@@ -22,7 +30,7 @@ async def fetch_subscription(email: str):
 
     customer = cust_res.data[0]
 
-    # Fetch subscriptions
+    # 3. Fetch subscriptions
     sub_res = (
         supabase.table("stripe.subscriptions")
         .select("*")
@@ -38,31 +46,45 @@ async def fetch_subscription(email: str):
             "subscription": None
         }
 
-    subs = []
+    subscriptions = []
+
     for s in sub_res.data:
+        # Extract price_id from subscription item
         price_id = (
             s["items"]["data"][0]["price"]["id"]
             if s.get("items") and s["items"].get("data")
             else None
         )
 
-        product_info = get_product_for_price(price_id) if price_id else None
-        product_name = (
-            product_info["product"]["name"]
-            if product_info and product_info.get("product")
-            else None
-        )
+        # 4. Fetch product info for this price
+        product_info = None
+        product_name = None
+        nickname = None
+
+        if price_id:
+            price_res = (
+                supabase.table("stripe.prices")
+                .select("id, nickname, product:product_id(name, description)")
+                .eq("id", price_id)
+                .execute()
+            )
+
+            if price_res.data:
+                product_info = price_res.data[0]
+                nickname = product_info.get("nickname")
+                if product_info.get("product"):
+                    product_name = product_info["product"].get("name")
 
-        subs.append({
+        subscriptions.append({
             "status": s["status"],
             "subscription_id": s["id"],
             "current_period_end": s["current_period_end"],
             "product_name": product_name,
-            "nickname": product_info["nickname"] if product_info else None
+            "nickname": nickname
         })
 
     return {
         "email": email,
         "signed_up": user["created_at"],
-        "subscription": subs
+        "subscription": subscriptions
     }