Update app.py

app.py

@@ -19,7 +19,7 @@ WHATSAPP_URL = "https://7105.api.greenapi.com/waInstance7105210836/sendMessage/8
 ACCESS_TOKEN = "2144425825_36f2249dc27c5aca075ac5442b1bbcdf01c3a29b9e41b86bda46a6cf651acd0f"
 
 # Google Apps Script Data handler
-web_app_url = "https://script.google.com/macros/s/AKfycbypM7ZNzcyUH20dVgPErD6SVSdgOVD3igXVhASr12hCm_DceX9NPCR6SB527GLfYBLU/exec"
+web_app_url = "https://script.google.com/macros/s/AKfycbxuN5YtKgFkXu1gu-dafyDHz0JII0F2RLifhVi8YVclabenlPt0X3780ChQHRdE_Ccc/exec"
 
 # Headers for ClickUp authorization
 headers = {
@@ -263,15 +263,78 @@ async def task_update(request: Request):
                 logging.info(f"Task: {task_name}, New Status: {after_status}, Action Date: {action_date_human}")
 
                 if after_status.lower() == "ready for review":
-                    chat_id = "201092003112@c.us"
-                    message = (
-                        f"📝 *Task Submitted for Review!*\n\n"
-                        f"📌 *Task:* {task_name}\n"
-                        f"📅 *Submitted On:* {action_date_human}\n\n"
-                        f"🔗 *View Task:* {task_link}\n\n"
-                        f"Please review the task and provide feedback."
-                    )
-                    send_whatsapp_notification(chat_id, message)
+                    # Step 1: Get task details
+                    task_details = get_task_details(task_id)
+                    print(f"Task details: {task_details}")
+    
+                    task_name = task_details.get("name", "Unnamed Task")
+                    task_url = task_details.get("url", "")
+                    space_id = task_details.get("space", {}).get("id")
+                    assignees = task_details.get("assignees", [])
+                    assignee_ids = [str(assignee['id']) for assignee in assignees]
+                    assignee_id_to_name = {str(assignee['id']): assignee['username'] for assignee in assignees}
+                    assignee_names_str = "، ".join(assignee_id_to_name.values())
+    
+                    # Step 2: Call WebApp for notify-roles
+                    web_app_url = "https://script.google.com/macros/s/AKfycbxuN5YtKgFkXu1gu-dafyDHz0JII0F2RLifhVi8YVclabenlPt0X3780ChQHRdE_Ccc/exec"
+                    params = {
+                        "mode": "notify-roles",
+                        "assigneeId": assignee_ids[0],  # Assume main assignee
+                        "spaceId": space_id
+                    }
+                    response = requests.get(web_app_url, params=params)
+    
+                    if response.ok:
+                        notify_map = response.json()
+                        print("✅ Notify Map:", notify_map)
+    
+                        # 1️⃣ Notify the user (confirmation)
+                        user_dict = notify_map.get("users", {})
+                        for user_id, number in user_dict.items():
+                            chat_id = f"{number}@c.us"
+                            user_message = (
+                                f"✅ *تم نقل المهمة للمراجعة بنجاح!*\n\n"
+                                f"📌 *المهمة:* {task_name}\n"
+                                f"📅 *التاريخ:* {action_date_human}\n"
+                                f"🔗 *رابط المهمة:* {task_url}\n\n"
+                                f"شكراً لك على استكمال المهمة."
+                            )
+                            send_whatsapp_notification(chat_id, user_message)
+    
+                        # 2️⃣ Notify the team roles
+                        notify_users = notify_map.get("notifyUsers", [])
+                        for user in notify_users:
+                            name = user.get("name", "عضو الفريق")
+                            number = user.get("phone")
+                            if number:
+                                chat_id = f"{number}@c.us"
+                                notify_message = (
+                                    f"📣 *تنبيه للفريق:*\n\n"
+                                    f"📌 *{assignee_names_str}* قام بنقل المهمة التالية للمراجعة:\n"
+                                    f"*{task_name}*\n"
+                                    f"🔗 {task_url}\n\n"
+                                    f"يرجى مراجعة المهمة وإضافة ملاحظاتك."
+                                )
+                                send_whatsapp_notification(chat_id, notify_message)
+    
+                        # 3️⃣ Notify the managers
+                        managers = notify_map.get("managers", [])
+                        for manager in managers:
+                            manager_name = manager.get("name", "مدير")
+                            number = manager.get("phone")
+                            if number:
+                                chat_id = f"{number}@c.us"
+                                manager_message = (
+                                    f"👤 *إشعار للمدير:*\n\n"
+                                    f"📌 *{assignee_names_str}* قام بنقل المهمة للمراجعة:\n"
+                                    f"*{task_name}*\n"
+                                    f"🔗 {task_url}\n\n"
+                                    f"يمكنك إلقاء نظرة وإضافة ملاحظات إن وجدت."
+                                )
+                                send_whatsapp_notification(chat_id, manager_message)
+                    else:
+                        logging.error(f"❌ Failed to fetch notify-roles data: {response.status_code}")
+                        print("Raw response:", response.text)
 
     elif event_type == "taskTagUpdated":
         history_items = data.get("history_items", [])