use phone_number instead of remoteJid for driver notifications

app/database/supabase.py

@@ -40,6 +40,8 @@ class SupabaseRepository:
         preferred_language: str | None = None,
         phone_number: str | None = None,
     ) -> dict[str, Any]:
+        if phone_number:
+            phone_number = phone_number.split("@")[0]
         payload = {
             "remoteJid": remote_jid,
             "name": name,

app/tools/handlers.py

@@ -235,12 +235,12 @@ class FalsaToolHandlers:
         try:
             driver_record = _first_or_dict(trip.get("drivers")) or {}
             driver_customer = driver_record.get("customers") or {}
-            driver_remote_jid = driver_customer.get("remoteJid") or driver_record.get("remoteJid")
-            if not driver_remote_jid:
-                raise WhatsAppClientError("Driver remoteJid is missing")
-            driver_phone = driver_remote_jid.split("@")[0]
+            driver_recipient = driver_customer.get("phone_number") or driver_customer.get("remoteJid") or driver_record.get("remoteJid")
+            if not driver_recipient:
+                raise WhatsAppClientError("Driver recipient is missing")
+            driver_phone = driver_recipient.split("@")[0]
             await self.whatsapp.send_text(
-                driver_remote_jid,
+                driver_recipient,
                 _driver_notification_text(
                     customer=self.customer,
                     trip=trip,
@@ -1081,6 +1081,7 @@ def _driver_notification_text(
     return (
         "🔔 حجز جديد في فلسا\n"
         f"العميل: {customer.get('name') or 'عميل جديد'}\n"
+        f"رقم العميل: {customer.get('phone_number') or 'غير متوفر'}\n"
         f"الرحلة: {trip.get('departure')} ← {trip.get('destination')}\n"
         f"التاريخ: {trip_departure_date(trip)} {trip_departure_bucket(trip)}\n"
         f"المقاعد المطلوبة: {requested_seats}\n"

tests/test_tools.py

@@ -32,7 +32,11 @@ def trip(
     available_seats=3,
     status="active",
     car_type="SUV",
+    driver_phone_number=None,
 ):
+    drivers = {"name": "Ali", "remoteJid": "967700000009"}
+    if driver_phone_number is not None:
+        drivers["customers"] = {"phone_number": driver_phone_number}
     return {
         "id": trip_id,
         "departure": departure,
@@ -43,7 +47,7 @@ def trip(
         "total_seats": 4,
         "price": "50.00",
         "status": status,
-        "drivers": {"name": "Ali", "remoteJid": "967700000009"},
+        "drivers": drivers,
         "driver_cars": {"car_type": car_type},
     }
 
@@ -238,6 +242,27 @@ async def test_create_booking_lead_notifies_driver():
     assert whatsapp.sent[0][0] == "967700000009"
 
 
+@pytest.mark.asyncio
+async def test_create_booking_lead_uses_driver_phone_number():
+    repository = FakeRepository()
+    repository.trips_by_id["trip-1"] = trip(driver_phone_number="967700000099")
+    whatsapp = FakeWhatsApp()
+    handlers = make_handlers(
+        repository=repository,
+        whatsapp=whatsapp,
+        customer={"id": "cust-1", "remoteJid": "967700000001", "name": "Mona"},
+    )
+
+    result = await handlers.create_booking_lead(
+        {"trip_id": "trip-1", "requested_seats": 1}
+    )
+
+    assert result.ok is True
+    assert result.data["driver_notification_status"] == "sent"
+    assert whatsapp.sent[0][0] == "967700000099"
+    assert result.data["driver_phone"] == "967700000099"
+
+
 @pytest.mark.asyncio
 async def test_create_booking_lead_keeps_pending_when_driver_notification_fails():
     repository = FakeRepository()