Update routes/sendnotifications.py

routes/sendnotifications.py

@@ -1,14 +1,24 @@
+import os
+import aiohttp
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel
-import httpx
 from google.oauth2 import service_account
 from google.auth.transport.requests import Request
 
 router = APIRouter()
 
-# Configurações Supabase
-SUPABASE_URL = "https://your-project.supabase.co"
-SUPABASE_API_KEY = "your-supabase-anon-or-service-role-key"
+# Supabase config (pegando das variáveis de ambiente)
+SUPABASE_URL = "https://ussxqnifefkgkaumjann.supabase.co"  # Ajuste pro seu projeto
+SUPABASE_ROLE_KEY = os.getenv("SUPA_SERVICE_KEY")
+if not SUPABASE_ROLE_KEY:
+    raise ValueError("❌ SUPA_SERVICE_KEY not set in environment!")
+
+SUPABASE_ROLE_HEADERS = {
+    "apikey": SUPABASE_ROLE_KEY,
+    "Authorization": f"Bearer {SUPABASE_ROLE_KEY}",
+    "Content-Type": "application/json",
+    "Prefer": "return=representation"
+}
 
 # Firebase config
 SERVICE_ACCOUNT_FILE = './closetcoach-2d50b-firebase-adminsdk-fbsvc-7fcccb1.json'
@@ -26,42 +36,33 @@ def get_access_token():
 
 class NotificationRequest(BaseModel):
     keyword: str
-    initiator_id: str   # quem iniciou a ação (ex: quem seguiu)
-    target_user_id: str # quem recebe a notificação
+    initiator_id: str
+    target_user_id: str
 
-async def supabase_select(table: str, select: str, filters: dict):
-    headers = {
-        "apikey": SUPABASE_API_KEY,
-        "Authorization": f"Bearer {SUPABASE_API_KEY}",
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-    }
-    filter_query = '&'.join([f'{key}=eq.{value}' for key, value in filters.items()])
+async def fetch_supabase(table: str, select: str, filters: dict):
+    # Monta query params
+    filter_query = '&'.join([f'{k}=eq.{v}' for k, v in filters.items()])
     url = f"{SUPABASE_URL}/rest/v1/{table}?select={select}&{filter_query}"
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(url, headers=headers)
-        response.raise_for_status()
-        return response.json()
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url, headers=SUPABASE_ROLE_HEADERS) as resp:
+            if resp.status != 200:
+                detail = await resp.text()
+                raise HTTPException(status_code=500, detail=f"Erro Supabase: {detail}")
+            return await resp.json()
+
+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 format_name(full_name: str) -> str:
     parts = full_name.strip().split()
     if len(parts) == 1:
         return parts[0]
-    first_name = parts[0]
-    second_initial = parts[1][0].upper() if len(parts) > 1 else ''
-    return f"{first_name} {second_initial}."
-
-async def check_follow_exists(follower_id: str, following_id: str) -> bool:
-    filters = {
-        "follower_id": follower_id,
-        "following_id": following_id
-    }
-    result = await supabase_select("followers", "id", filters)
-    return len(result) > 0
+    return f"{parts[0]} {parts[1][0].upper()}."
 
 async def get_user_info(user_id: str):
-    users = await supabase_select("User", "name,token_fcm", {"id": user_id})
+    users = await fetch_supabase("User", "name,token_fcm", {"id": user_id})
     if not users:
         return None
     return users[0]
@@ -80,41 +81,39 @@ def build_notification_payload(title: str, body: str, token: str) -> dict:
 async def send_fcm_notification(payload: dict):
     access_token = get_access_token()
     headers = {
-        'Authorization': f'Bearer {access_token}',
-        'Content-Type': 'application/json',
+        "Authorization": f"Bearer {access_token}",
+        "Content-Type": "application/json"
     }
     url = f"https://fcm.googleapis.com/v1/projects/{FCM_PROJECT_ID}/messages:send"
-    async with httpx.AsyncClient() as client:
-        response = await client.post(url, headers=headers, json=payload)
-    return response
+
+    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()
 
 @router.post("/send-notification")
 async def send_notification(data: NotificationRequest):
     keyword = data.keyword.lower()
 
-    # Pega info do initiator (ex: quem fez a ação)
     initiator = await get_user_info(data.initiator_id)
     if not initiator:
         raise HTTPException(status_code=404, detail="Initiator user not found")
 
-    # Pega info do target (quem vai receber notificação)
     target = await get_user_info(data.target_user_id)
     if not target or not target.get("token_fcm"):
         raise HTTPException(status_code=404, detail="Target user or token not found")
 
-    # Aqui definimos regras para cada keyword
     if keyword == "follow":
-        # Verifica se realmente está seguindo
         if not await check_follow_exists(data.initiator_id, data.target_user_id):
             raise HTTPException(status_code=403, detail="Follow relationship not found")
 
-        # Monta mensagem
         follower_name = format_name(initiator["name"])
         title = "Novo seguidor!"
         body = f"{follower_name} começou a seguir você."
 
     elif keyword == "like":
-        # Exemplo: notificação de like
         liker_name = format_name(initiator["name"])
         title = "Nova curtida!"
         body = f"{liker_name} curtiu sua publicação."
@@ -124,9 +123,6 @@ async def send_notification(data: NotificationRequest):
 
     payload = build_notification_payload(title, body, target["token_fcm"])
 
-    response = await send_fcm_notification(payload)
-
-    if response.status_code != 200:
-        raise HTTPException(status_code=response.status_code, detail=response.text)
+    result = await send_fcm_notification(payload)
 
-    return {"detail": "Notification sent successfully"}
+    return {"detail": "Notification sent successfully", "fcm_response": result}