Update main.py

main.py

@@ -1,17 +1,32 @@
 # main.py
 import os
+import json
+from datetime import datetime
+
 import httpx
 from fastapi import FastAPI, Request
 
+from google.oauth2 import service_account
+from googleapiclient.discovery import build
+
 app = FastAPI()
 
-# لو حابب تحط قيمة افتراضية للتست
+# ===== Notion Config =====
 NOTION_SECRET = os.getenv("NOTION_SECRET", "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")
 NOTION_VERSION = "2025-09-03"
+NOTION_DRIVE_PROP_ID = os.getenv("NOTION_DRIVE_PROP_ID", "H=Fs")  # ID بتاع حقل Google Drive Link
 
+# ===== Google Drive Config =====
+GOOGLE_CREDENTIALS = os.getenv("GOOGLE_CREDENTIALS")  # JSON string للـ service account
+PARENT_FOLDER_ID = os.getenv(
+    "PARENT_FOLDER_ID",
+    "1ddMDm2SFnNfmt6pGIMB5-HI54ywd52Jt"  # اللي انت بعتهالي
+)
 
+
+# ========== Notion Template Blocks ==========
 def build_content_template_children():
-    """نفس التمبلت بالملّي من كود 2 لكن كـ children فقط."""
+    """نفس التمبلت بالملّي لكن كـ children فقط."""
     return [
         # ===== Assets link =====
         {
@@ -309,6 +324,8 @@ def build_content_template_children():
     ]
 
 
+# ========== Notion Helpers ==========
+
 async def get_page_title(page_id: str) -> str:
     """Fetch page title from Notion."""
     async with httpx.AsyncClient() as client:
@@ -331,6 +348,7 @@ async def get_page_title(page_id: str) -> str:
 
     return "(No Title)"
 
+
 async def is_block_archived(page_id: str) -> bool:
     """يرجع True لو البلوك/الصفحة archived."""
     async with httpx.AsyncClient() as client:
@@ -348,8 +366,7 @@ async def is_block_archived(page_id: str) -> bool:
             print("[ARCHIVE CHECK] Response:", res.json())
         except Exception:
             print("[ARCHIVE CHECK] Raw response:", res.text)
-        # لو مش عارفين حالته، هنعتبره مش archived عشان ما نكسرش الفلو
-        return False
+        return False  # ما نكسرش الفلو
 
     data = res.json()
     archived = data.get("archived", False)
@@ -381,6 +398,119 @@ async def apply_template_to_page(page_id: str):
         print("[TEMPLATE] Raw Response:", res.text)
 
 
+async def update_page_drive_link(page_id: str, drive_link: str):
+    """يحدث حقل URL في الصفحة برابط Google Drive."""
+    print(f"[NOTION] Updating drive link for page {page_id} -> {drive_link}")
+
+    async with httpx.AsyncClient() as client:
+        res = await client.patch(
+            f"https://api.notion.com/v1/pages/{page_id}",
+            headers={
+                "Authorization": f"Bearer {NOTION_SECRET}",
+                "Notion-Version": NOTION_VERSION,
+                "Content-Type": "application/json",
+            },
+            json={
+                "properties": {
+                    NOTION_DRIVE_PROP_ID: {
+                        "url": drive_link
+                    }
+                }
+            },
+        )
+
+    print(f"[NOTION] Drive link update status: {res.status_code}")
+    try:
+        print("[NOTION] Drive link response:", res.json())
+    except Exception:
+        print("[NOTION] Drive link raw response:", res.text)
+
+
+# ========== Google Drive Helpers ==========
+
+def get_drive_service():
+    if not GOOGLE_CREDENTIALS:
+        raise RuntimeError("GOOGLE_CREDENTIALS env var is missing")
+
+    creds_info = json.loads(GOOGLE_CREDENTIALS)
+    creds = service_account.Credentials.from_service_account_info(
+        creds_info,
+        scopes=["https://www.googleapis.com/auth/drive"]
+    )
+    service = build("drive", "v3", credentials=creds)
+    return service
+
+
+def search_folder(name: str, parent_id: str, drive_service):
+    query = (
+        f"name = '{name}' and "
+        f"'{parent_id}' in parents and "
+        "mimeType = 'application/vnd.google-apps.folder' and trashed = false"
+    )
+    results = drive_service.files().list(
+        q=query,
+        fields="files(id, name)"
+    ).execute()
+    files = results.get("files", [])
+    return files[0] if files else None
+
+
+def create_folder(name: str, parent_id: str, drive_service):
+    metadata = {
+        "name": name,
+        "mimeType": "application/vnd.google-apps.folder",
+        "parents": [parent_id],
+    }
+    folder = drive_service.files().create(
+        body=metadata,
+        fields="id, name"
+    ).execute()
+    return folder
+
+
+def ensure_drive_folder_for_page(page_title: str) -> str:
+    """
+    - جوه PARENT_FOLDER_ID
+      - فولدر شهر (Dec 2025 مثلاً)
+      - جوه فولدر باسم الـ page_title
+    وترجع Google Drive folder link.
+    """
+    drive_service = get_drive_service()
+
+    # لو العنوان فاضي، استخدم page_id أو اسم fallback من برّه
+    safe_title = page_title.strip() if page_title and page_title.strip() else "Untitled Task"
+
+    # من الأفضل نشيل Slash عشان ما يكسرش الاسم
+    safe_title = safe_title.replace("/", "-")
+
+    month_name = datetime.now().strftime("%b %Y")  # مثال: "Dec 2025"
+
+    print(f"[DRIVE] Ensuring month folder '{month_name}' under parent {PARENT_FOLDER_ID}")
+    month_folder = search_folder(month_name, PARENT_FOLDER_ID, drive_service)
+    if not month_folder:
+        month_folder = create_folder(month_name, PARENT_FOLDER_ID, drive_service)
+        print(f"[DRIVE] Created month folder: {month_folder['id']} - {month_folder['name']}")
+    else:
+        print(f"[DRIVE] Found month folder: {month_folder['id']} - {month_folder['name']}")
+
+    month_folder_id = month_folder["id"]
+
+    print(f"[DRIVE] Ensuring page folder '{safe_title}' under month folder {month_folder_id}")
+    page_folder = search_folder(safe_title, month_folder_id, drive_service)
+    if not page_folder:
+        page_folder = create_folder(safe_title, month_folder_id, drive_service)
+        print(f"[DRIVE] Created page folder: {page_folder['id']} - {page_folder['name']}")
+    else:
+        print(f"[DRIVE] Found page folder: {page_folder['id']} - {page_folder['name']}")
+
+    folder_id = page_folder["id"]
+    drive_link = f"https://drive.google.com/drive/folders/{folder_id}"
+    print(f"[DRIVE] Final folder link: {drive_link}")
+    return drive_link
+
+
+# ========== Webhook ==========
+
 @app.post("/webhook")
 async def webhook(request: Request):
     body = await request.json()
@@ -392,7 +522,6 @@ async def webhook(request: Request):
     print("\n===== NEW WEBHOOK EVENT =====")
     print("Raw body:", body)
 
-        # نتعامل مع إنشاء صفحة جديدة فقط
     if event_type == "page.created":
         title = await get_page_title(page_id)
 
@@ -404,14 +533,21 @@ async def webhook(request: Request):
         # تشيك الأول: هل الصفحة دي Archived (زي لما تدوس Escape على placeholder)؟
         archived = await is_block_archived(page_id)
         if archived:
-            print(f"[TEMPLATE] Page {page_id} is archived right after creation. Skipping template apply.")
+            print(f"[TEMPLATE] Page {page_id} is archived right after creation. Skipping template & drive.")
         else:
-            # نطبّق التمبلت على الـ Page دي
+            # 1) نطبّق التمبلت
             try:
                 await apply_template_to_page(page_id)
             except Exception as e:
                 print("[ERROR] While applying template:", e)
 
+            # 2) ننشئ فولدر على الدرايف باسم الصفحة ونحط اللينك في النوشن
+            try:
+                drive_link = ensure_drive_folder_for_page(title or page_id)
+                await update_page_drive_link(page_id, drive_link)
+            except Exception as e:
+                print("[ERROR] While creating drive folder or updating Notion URL:", e)
+
     elif event_type == "page.deleted":
         print(f"Page deleted. ID: {page_id}, Timestamp: {timestamp}")