Update routes/sendnotifications.py

routes/sendnotifications.py

@@ -9,7 +9,7 @@ from google.auth.transport.requests import Request
 router = APIRouter()
 
 # 🔧 Supabase Config
-SUPABASE_URL = "https://ussxqnifefkgkaumjann.supabase.co"  # ajuste para seu Supabase
+SUPABASE_URL = "https://ussxqnifefkgkaumjann.supabase.co"
 SUPABASE_KEY = os.getenv("SUPA_KEY")
 SUPABASE_ROLE_KEY = os.getenv("SUPA_SERVICE_KEY")
 
@@ -35,13 +35,13 @@ FCM_PROJECT_ID = "closetcoach-2d50b"
 
 class NotificationRequest(BaseModel):
     keyword: str
-    target_user_id: str
+    target_user_id: str = ""  # optional for 'newmessage'
     reference: str = ""
 
 def short_collapse_key(keyword: str, sender_id: str, receiver_id: str) -> str:
     raw = f"{keyword}:{sender_id}:{receiver_id}"
     return hashlib.sha1(raw.encode()).hexdigest()[:20]
-    
+
 async def verify_user_token(user_token: str) -> str:
     headers = {
         "Authorization": f"Bearer {user_token}",
@@ -52,47 +52,24 @@ async def verify_user_token(user_token: str) -> str:
     async with aiohttp.ClientSession() as session:
         async with session.get(f"{SUPABASE_URL}/auth/v1/user", headers=headers) as response:
             if response.status != 200:
-                raise HTTPException(status_code=401, detail="Token inválido ou expirado")
+                raise HTTPException(status_code=401, detail="Invalid or expired token")
 
             user_data = await response.json()
             user_id = user_data.get("id")
             if not user_id:
-                raise HTTPException(status_code=400, detail="ID do usuário não encontrado")
+                raise HTTPException(status_code=400, detail="User ID not found")
 
     return user_id
 
-async def get_post_info(feed_id: str):
-    # Busca o feed
-    feeds = await fetch_supabase("Feeds", "description,portfolios,user_id", {"id": feed_id})
-    if not feeds:
-        raise HTTPException(status_code=404, detail="Post not found")
-    
-    feed = feeds[0]
-    description = feed.get("description", "")
-    portfolio_ids = feed.get("portfolios") or []
-    user_id = feed.get("user_id")
-
-    image_url = None
-    if portfolio_ids:
-        portfolio_data = await fetch_supabase("Portfolio", "image_url", {"id": portfolio_ids[0]})
-        if portfolio_data:
-            image_url = portfolio_data[0].get("image_url")
-
-    return {
-        "description": description,
-        "image_url": image_url,
-        "user_id": user_id  # <-- importante
-    }
-
 async def fetch_supabase(table: str, select: str, filters: dict, headers=SUPABASE_ROLE_HEADERS):
     filter_query = '&'.join([f'{k}=eq.{v}' for k, v in filters.items()])
-    url = f"{SUPABASE_URL}/rest/v1/{table}?select={select}&{filter_query}"
+    url = f"{SUPABASE_URL}/rest/v1/{table}?select={select}&{filter_query}&order=created_at.desc"
 
     async with aiohttp.ClientSession() as session:
         async with session.get(url, headers=headers) as resp:
             if resp.status != 200:
                 detail = await resp.text()
-                raise HTTPException(status_code=500, detail=f"Erro Supabase: {detail}")
+                raise HTTPException(status_code=500, detail=f"Supabase error: {detail}")
             return await resp.json()
 
 def format_name(full_name: str) -> str:
@@ -111,41 +88,6 @@ async def check_follow_exists(follower_id: str, following_id: str) -> bool:
     result = await fetch_supabase("followers", "id", {"follower_id": follower_id, "following_id": following_id})
     return len(result) > 0
 
-def get_access_token():
-    credentials = service_account.Credentials.from_service_account_file(
-        SERVICE_ACCOUNT_FILE
-    )
-    scoped_credentials = credentials.with_scopes(
-        ['https://www.googleapis.com/auth/firebase.messaging']
-    )
-    scoped_credentials.refresh(Request())
-    return scoped_credentials.token
-
-async def send_fcm_notification(title: str, body: str, token: str):
-    payload = {
-        "message": {
-            "notification": {
-                "title": title,
-                "body": body,
-            },
-            "token": token
-        }
-    }
-
-    access_token = get_access_token()
-    headers = {
-        "Authorization": f"Bearer {access_token}",
-        "Content-Type": "application/json"
-    }
-    url = f"https://fcm.googleapis.com/v1/projects/{FCM_PROJECT_ID}/messages:send"
-
-    async with aiohttp.ClientSession() as session:
-        async with session.post(url, headers=headers, json=payload) as resp:
-            resp_text = await resp.text()
-            if resp.status != 200:
-                raise HTTPException(status_code=resp.status, detail=f"FCM error: {resp_text}")
-            return await resp.json()
-
 async def check_subscription_exists(customer_id: str, stylist_id: str) -> bool:
     result = await fetch_supabase(
         "Subscriptions",
@@ -158,46 +100,99 @@ async def check_subscription_exists(customer_id: str, stylist_id: str) -> bool:
     )
     return len(result) > 0
 
+async def get_post_info(feed_id: str):
+    feeds = await fetch_supabase("Feeds", "description,portfolios,user_id", {"id": feed_id})
+    if not feeds:
+        raise HTTPException(status_code=404, detail="Post not found")
+
+    feed = feeds[0]
+    description = feed.get("description", "")
+    portfolio_ids = feed.get("portfolios") or []
+    user_id = feed.get("user_id")
+
+    image_url = None
+    if portfolio_ids:
+        portfolio_data = await fetch_supabase("Portfolio", "image_url", {"id": portfolio_ids[0]})
+        if portfolio_data:
+            image_url = portfolio_data[0].get("image_url")
+
+    return {
+        "description": description,
+        "image_url": image_url,
+        "user_id": user_id
+    }
+
+def get_access_token():
+    credentials = service_account.Credentials.from_service_account_file(
+        SERVICE_ACCOUNT_FILE
+    )
+    scoped_credentials = credentials.with_scopes(
+        ['https://www.googleapis.com/auth/firebase.messaging']
+    )
+    scoped_credentials.refresh(Request())
+    return scoped_credentials.token
+
 @router.post("/send-notification")
 async def send_notification(
     data: NotificationRequest,
     user_token: str = Header(..., alias="User-key")
 ):
-    follower_id = await verify_user_token(user_token)
+    sender_id = await verify_user_token(user_token)
 
-    if data.keyword not in ("follow", "like", "subscriber"):
+    if data.keyword not in ("follow", "like", "subscriber", "newmessage"):
         raise HTTPException(status_code=400, detail="Unsupported keyword")
 
+    # Determine target_user_id
     if data.keyword == "like":
         post_info = await get_post_info(data.reference)
         target_user_id = post_info["user_id"]
+    elif data.keyword == "newmessage":
+        # Get last message in the chat
+        messages = await fetch_supabase("messages", "sender_id,content", {"chat_id": data.reference})
+        if not messages:
+            raise HTTPException(status_code=404, detail="No messages found in chat")
+
+        last_message = messages[0]
+        sender_id = last_message["sender_id"]
+        content = last_message["content"]
+
+        # Get participants
+        chats = await fetch_supabase("chats", "client_id,stylist_id", {"id": data.reference})
+        if not chats:
+            raise HTTPException(status_code=404, detail="Chat not found")
+
+        chat = chats[0]
+        target_user_id = chat["stylist_id"] if sender_id == chat["client_id"] else chat["client_id"]
     else:
         target_user_id = data.target_user_id
 
+    # Check conditions
     if data.keyword == "follow":
-        follow_exists = await check_follow_exists(follower_id, target_user_id)
+        follow_exists = await check_follow_exists(sender_id, target_user_id)
         if not follow_exists:
             raise HTTPException(status_code=403, detail="Follow relationship does not exist")
 
     if data.keyword == "subscriber":
         subscription_exists = await check_subscription_exists(
-            customer_id=follower_id,
+            customer_id=sender_id,
             stylist_id=target_user_id
         )
         if not subscription_exists:
             return {"detail": "No active subscription found, notification not sent"}
 
+    # User info
     target_user = await get_user_info(target_user_id)
     if not target_user or not target_user.get("token_fcm"):
         raise HTTPException(status_code=404, detail="Target user or FCM token not found")
 
-    actor_info = await get_user_info(follower_id)
+    actor_info = await get_user_info(sender_id)
     if not actor_info or not actor_info.get("name"):
         raise HTTPException(status_code=404, detail="User not found")
     actor_name = format_name(actor_info["name"])
 
-    collapse_id = short_collapse_key(data.keyword, follower_id, target_user_id)
+    collapse_id = short_collapse_key(data.keyword, sender_id, target_user_id)
 
+    # Notification content
     if data.keyword == "follow":
         title = "🎉 New Follower!"
         body = f"{actor_name} started following you."
@@ -211,9 +206,14 @@ async def send_notification(
         title = "💼 New Subscriber!"
         body = f"{actor_name} just subscribed to your styling services."
         image_url = None
+    elif data.keyword == "newmessage":
+        title = "💬 New Message"
+        body = f"{actor_name}: {content}"
+        image_url = None
     else:
         raise HTTPException(status_code=400, detail="Unsupported keyword")
 
+    # Compose FCM message
     message = {
         "notification": {
             "title": title,