challll

api/webhook_routes.py

@@ -18,13 +18,7 @@ async def receive_jira_webhook(
     Receive webhook events from Jira and sync data using the user's stored credentials
     """
     try:
-        try:
-            payload = await request.json()
-        except Exception as e:
-            logger.warning(f"Failed to parse webhook JSON: {str(e)}")
-            body = await request.body()
-            logger.warning(f"Raw body: {body.decode('utf-8', errors='ignore')}")
-            return {"status": "error", "reason": "invalid_json"}
+        payload = await request.json()
         logger.info(f"Received Jira webhook: {x_atlassian_webhook_identifier}")
         
         # 1. Extract Jira Account ID from payload

services/supabase_service.py

@@ -23,28 +23,20 @@ class SupabaseService:
         """
         Find user's firebase_id by email from the Users table
         """
-        user = self.get_user_by_email(email)
-        if user:
-            return user.get("firebase_id")
-        return None
-
-    def get_user_by_email(self, email: str) -> Optional[Dict[str, Any]]:
-        """
-        Get full user details by email
-        """
         if not self.client:
             logger.warning("Supabase client not initialized")
             return None
             
         try:
-            response = self.client.table("Users").select("*").eq("jira_email", email).execute()
+            # Assuming the table name is "Users" and it has "jira_email" and "firebase_id" columns
+            response = self.client.table("Users").select("firebase_id").eq("jira_email", email).execute()
             
             if response.data and len(response.data) > 0:
-                return response.data[0]
+                return response.data[0]["firebase_id"]
             return None
             
         except Exception as e:
-            logger.warning(f"Error fetching user by email {email}: {str(e)}")
+            logger.error(f"Error fetching user by email {email}: {str(e)}")
             return None
 
     def save_user_credentials(self, email: str, api_token: str, server_url: str, account_id: str) -> bool:
@@ -56,39 +48,22 @@ class SupabaseService:
             return False
             
         try:
-            # We use upsert to create the user if they don't exist, or update if they do.
-            # We match on "jira_email" which is the primary identifier for us here.
-            # Note: For upsert to work on a non-id column, that column must be UNIQUE in Supabase.
-            # If jira_email is not unique, we should check first.
-            
-            # First check if user exists
-            existing_user = self.get_user_by_email(email)
+            # We need to find the user first to update them, or we assume email is unique and we can update based on it.
+            # Supabase update requires a match.
             
             data = {
-                "jira_email": email,
                 "jira_api_token": api_token,
                 "jira_server_url": server_url,
                 "jira_account_id": account_id
             }
             
-            if existing_user:
-                # Update existing user
-                response = self.client.table("Users").update(data).eq("jira_email", email).execute()
-                logger.info(f"Updated credentials for existing user {email}")
-            else:
-                # Create new user (Insert)
-                # We might need a generic firebase_id if it's required and not nullable
-                # For now let's hope it's nullable or auto-generated, or unrelated here.
-                # If firebase_id is required, we cannot create a user without it.
-                # Assuming this flow is for existing firebase users who are adding Jira...
-                logger.warning(f"User {email} not found. Attempting to create new record...")
-                response = self.client.table("Users").insert(data).execute()
+            response = self.client.table("Users").update(data).eq("jira_email", email).execute()
             
             if response.data:
                 logger.info(f"Successfully saved credentials for user {email}")
                 return True
             else:
-                logger.warning(f"Failed to save credentials for {email}")
+                logger.warning(f"No user found with email {email} to update credentials")
                 return False
                 
         except Exception as e: