updated email logic

api/webhook_routes.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Header, Request, HTTPException
 import logging
 from services.supabase_service import supabase_service
+from integrations.jira_service import JiraIntegrationService
 from typing import Dict, Any
 
 logger = logging.getLogger(__name__)
@@ -41,7 +42,27 @@ async def receive_jira_webhook(
              user_email = payload["user"].get("emailAddress")
              
         if not user_email:
-            logger.warning("Could not identify user email from webhook payload")
+            logger.warning("Email not found in payload. Attempting to fetch user details from Jira API.")
+            
+            # Try to get accountId from payload
+            account_id = None
+            if "user" in payload and "accountId" in payload["user"]:
+                account_id = payload["user"]["accountId"]
+            elif "issue" in payload and payload["issue"].get("fields", {}).get("assignee"):
+                account_id = payload["issue"]["fields"]["assignee"].get("accountId")
+                
+            if account_id:
+                try:
+                    jira_service = JiraIntegrationService()
+                    user_profile = jira_service._get_user_details(account_id)
+                    user_email = user_profile.get("emailAddress")
+                    if user_email:
+                        logger.info(f"Successfully fetched email {user_email} for accountId {account_id}")
+                except Exception as e:
+                    logger.error(f"Failed to fetch user details from Jira: {str(e)}")
+
+        if not user_email:
+            logger.warning("Could not identify user email from webhook payload or Jira API")
             logger.warning(f"Payload snippet: {str(payload)[:500]}...") # Log first 500 chars to debug
             # We still return 200 to Jira so it doesn't retry infinitely
             return {"status": "ignored", "reason": "no_email_found"}