Fix trip seat filtering and enable null seats display

- Fix search_active_trips to properly handle null seats, using 'available_seats.gte.{seats},available_seats.is.null' instead of malformed 'available_seats.is.null,available_seats.gte.{seats}'
- Update list_active_trips to use 'available_seats.is.null,available_seats.gt.0' instead of 'gt(0)'
- Allow null seats in search results (trips without seat info)
- Make seats fields nullable in database (new migration added)
- Update trip_selection to display 'المقاعد: غير متوفرة' when seats are null
- Update test fixtures and handlers to properly handle null seats

This fixes the issue where trips with null seats were showing as '1 of 1' instead of 'المقاعد: غير متوفرة'

app/database/supabase.py

@@ -141,8 +141,8 @@ class SupabaseRepository:
         destination: str,
         departure_date: Any,
         departure_time: str,
-        available_seats: int,
-        total_seats: int,
+        available_seats: int | None,
+        total_seats: int | None,
         price: float,
     ) -> dict[str, Any]:
         customer = await self.upsert_customer(
@@ -181,8 +181,8 @@ class SupabaseRepository:
         destination: str,
         departure_date: Any,
         departure_time: str,
-        available_seats: int,
-        total_seats: int,
+        available_seats: int | None,
+        total_seats: int | None,
         price: float,
     ) -> dict[str, Any]:
         if not driver_id:
@@ -387,7 +387,7 @@ class SupabaseRepository:
             self.client.table("driver_trips")
             .select("*, drivers(*, customers(*)), driver_cars(*)")
             .eq("status", "active")
-            .gt("available_seats", 0)
+            .or_("available_seats.is.null,available_seats.gt.0")
         )
         query = (
             self._apply_not_departed_filter(query)
@@ -422,7 +422,7 @@ class SupabaseRepository:
             self.client.table("driver_trips")
             .select("*, drivers(*, customers(*)), driver_cars(*)")
             .eq("status", "active")
-            .gt("available_seats", 0)
+            .or_("available_seats.is.null,available_seats.gt.0")
         )
         query = self._apply_departure_request_filter(query, departure_request)
         query = query.order("departure_date").order("departure_time")
@@ -436,7 +436,7 @@ class SupabaseRepository:
                 return []
             query = query.in_("driver_id", driver_ids)
         if seats:
-            query = query.gte("available_seats", seats)
+            query = query.or_(f"available_seats.gte.{seats},available_seats.is.null")
         if vehicle_type:
             query = query.ilike("driver_cars.car_type", f"%{vehicle_type}%")
         response = await query.limit(10).execute()
@@ -747,26 +747,28 @@ class SupabaseRepository:
         destination: str,
         departure_date: date,
         departure_time: str,
-        available_seats: int,
-        total_seats: int,
+        available_seats: int | None,
+        total_seats: int | None,
         price: float,
         driver_message: str | None = None,
         use_driver_message: bool = False,
     ) -> dict[str, Any]:
-        payload = {
+        payload: dict[str, Any] = {
             "driver_id": driver_id,
             "car_id": car_id,
             "departure": departure,
             "destination": destination,
             "departure_date": departure_date.isoformat(),
             "departure_time": departure_time,
-            "available_seats": available_seats,
-            "total_seats": total_seats,
             "price": price,
             "status": "active",
             "driver_message": driver_message,
             "use_driver_message": use_driver_message,
         }
+        if available_seats is not None:
+            payload["available_seats"] = available_seats
+        if total_seats is not None:
+            payload["total_seats"] = total_seats
         response = await self.client.table("driver_trips").insert(payload).execute()
         data = _response_data(response)
         trip = data[0] if isinstance(data, list) else data

app/services/group_message_service.py

@@ -120,8 +120,8 @@ class GroupMessageService:
                 destination=extracted.destination,
                 departure_date=departure_date,
                 departure_time=departure_time,
-                available_seats=extracted.available_seats or 1,
-                total_seats=extracted.total_seats or extracted.available_seats or 1,
+                available_seats=extracted.available_seats,
+                total_seats=extracted.total_seats,
                 price=extracted.price or 0,
             )
         else:
@@ -133,8 +133,8 @@ class GroupMessageService:
                 destination=extracted.destination,
                 departure_date=departure_date,
                 departure_time=departure_time,
-                available_seats=extracted.available_seats or 1,
-                total_seats=extracted.total_seats or extracted.available_seats or 1,
+                available_seats=extracted.available_seats,
+                total_seats=extracted.total_seats,
                 price=extracted.price or 0,
             )
 

app/services/trip_indexing.py

@@ -11,10 +11,12 @@ def build_trip_embedding_record(trip: dict[str, Any], embedding_model: str) -> d
     trip_id = str(trip.get("id") or trip.get("trip_id"))
     departure_date = trip_departure_date(trip)
     departure_time = trip_departure_bucket(trip)
+    available = trip.get("available_seats") or "unknown"
+    total = trip.get("total_seats") or "unknown"
     chunk_text = (
         f"Trip {trip_id}: {trip.get('departure')} to {trip.get('destination')} "
         f"on {departure_date} during {departure_time}. "
-        f"Available seats: {trip.get('available_seats')} of {trip.get('total_seats')}. "
+        f"Available seats: {available} of {total}. "
         f"Vehicle: {car.get('car_type')}. Driver: {driver.get('name')}. "
         f"Price: {trip.get('price')}. Status: {trip.get('status')}."
     )

app/tools/handlers.py

@@ -248,7 +248,8 @@ class FalzhToolHandlers:
             return ToolResult(ok=False, data={}, error="Trip was not found")
         if trip.get("status") != "active":
             return ToolResult(ok=False, data={}, error="Trip is not active")
-        if int(trip.get("available_seats") or 0) < requested_seats:
+        available_seats = trip.get("available_seats")
+        if available_seats is not None and int(available_seats) < requested_seats:
             return ToolResult(
                 ok=False,
                 data={"available_seats": trip.get("available_seats")},
@@ -555,10 +556,6 @@ class FalzhToolHandlers:
         if price is None and latest_trip is not None:
             price = _optional_price(latest_trip.get("price"))
 
-        if total_seats is None:
-            total_seats = 4
-        if available_seats is None:
-            available_seats = total_seats
         if price is None:
             price = 0
 
@@ -578,11 +575,11 @@ class FalzhToolHandlers:
                 error="No registered vehicle found for this driver",
             )
 
-        if total_seats is None or total_seats < 1:
+        if total_seats is not None and total_seats < 1:
             return ToolResult(ok=False, data={}, error="total_seats must be at least 1")
-        if available_seats is None or available_seats < 0:
+        if available_seats is not None and available_seats < 0:
             return ToolResult(ok=False, data={}, error="available_seats must be at least 0")
-        if available_seats > total_seats:
+        if total_seats is not None and available_seats is not None and available_seats > total_seats:
             return ToolResult(
                 ok=False,
                 data={},
@@ -966,7 +963,7 @@ def _is_trip_match(
 ) -> bool:
     if trip.get("status") != "active":
         return False
-    if int(trip.get("available_seats") or 0) < seats:
+    if trip.get("available_seats") is not None and int(trip["available_seats"]) < seats:
         return False
     if departure and departure.lower() not in str(trip.get("departure") or "").lower():
         return False

app/whatsapp/trip_selection.py

@@ -24,16 +24,21 @@ def format_trip_card(trip: dict[str, Any]) -> str:
     driver_name = driver.get("name") or trip.get("driver_name") or ""
     car_type = car.get("car_type") or trip.get("car_type") or ""
 
-    available = trip.get("available_seats") or 0
-    total = trip.get("total_seats") or 0
+    available = trip.get("available_seats")
+    total = trip.get("total_seats")
     price = trip.get("price") or ""
     selection_count = trip.get("selection_count")
 
+    if available is not None and total is not None:
+        seats_line = f"المقاعد: {available} من {total} متاحة"
+    else:
+        seats_line = "المقاعد: غير متوفرة"
+
     lines = [
         "─" * 14,
         f"من: {departure} ← إلى: {destination}",
         f"التاريخ: {date_text} | الوقت: {bucket_text}",
-        f"المقاعد: {available} من {total} متاحة",
+        seats_line,
         f"السعر: {price}" if price else "",
         f"السيارة: {car_type}" if car_type else "",
         f"السائق: {driver_name}" if driver_name else "",

supabase/migrations/202607210001_nullable_seats.sql

@@ -0,0 +1,141 @@
+-- Make available_seats and total_seats nullable on driver_trips.
+-- Group-message trips often lack seat info; store NULL instead of defaulting.
+
+ALTER TABLE public.driver_trips
+  ALTER COLUMN available_seats DROP NOT NULL,
+  ALTER COLUMN total_seats DROP NOT NULL;
+
+-- Replace the check constraint so it only enforces when both values are present
+ALTER TABLE public.driver_trips
+  DROP CONSTRAINT IF EXISTS driver_trips_available_not_over_total;
+
+ALTER TABLE public.driver_trips
+  ADD CONSTRAINT driver_trips_available_not_over_total
+    CHECK (available_seats IS NULL OR total_seats IS NULL OR available_seats <= total_seats);
+
+-- Drop BOTH overloads of match_active_trips and recreate with NULL-safe seats filter
+DROP FUNCTION IF EXISTS public.match_active_trips(
+  extensions.vector(1024), float, int, text, text, date, text, time, int, text
+);
+DROP FUNCTION IF EXISTS public.match_active_trips(
+  extensions.vector(1024), float, int, text, text, text, date, text, time, int, text
+);
+
+-- Recreate with filter_driver_name (the version the code actually calls)
+CREATE OR REPLACE FUNCTION public.match_active_trips(
+  query_embedding extensions.vector(1024),
+  match_threshold float DEFAULT 0.0,
+  match_count int DEFAULT 10,
+  filter_departure text DEFAULT NULL,
+  filter_destination text DEFAULT NULL,
+  filter_driver_name text DEFAULT NULL,
+  filter_departure_date date DEFAULT NULL,
+  filter_departure_time text DEFAULT NULL,
+  filter_requested_time time DEFAULT NULL,
+  filter_seats int DEFAULT 1,
+  filter_vehicle_type text DEFAULT NULL
+)
+RETURNS TABLE (
+  trip_id uuid,
+  departure text,
+  destination text,
+  departure_date date,
+  departure_time text,
+  available_seats integer,
+  total_seats integer,
+  price numeric,
+  status text,
+  driver_name text,
+  driver_phone_number text,
+  car_type text,
+  chunk_text text,
+  similarity float,
+  time_difference_minutes integer,
+  registered boolean
+)
+LANGUAGE sql STABLE
+AS $$
+  WITH ranked AS (
+    SELECT
+      driver_trips.id AS trip_id,
+      driver_trips.departure,
+      driver_trips.destination,
+      driver_trips.departure_date,
+      driver_trips.departure_time,
+      driver_trips.available_seats,
+      driver_trips.total_seats,
+      driver_trips.price,
+      driver_trips.status,
+      customers.name AS driver_name,
+      customers."remoteJid" AS driver_phone_number,
+      driver_cars.car_type,
+      driver_trip_embeddings.chunk_text,
+      COALESCE(customers.registered, false) AS registered,
+      1 - (driver_trip_embeddings.embedding <=> query_embedding) AS similarity,
+      driver_trip_embeddings.embedding <=> query_embedding AS vector_distance,
+      CASE
+        WHEN filter_requested_time IS NULL THEN NULL
+        ELSE abs(
+          extract(epoch FROM (
+            public.departure_bucket_clock_time(driver_trips.departure_time)
+            - filter_requested_time
+          )) / 60
+        )::integer
+      END AS time_difference_minutes
+    FROM public.driver_trip_embeddings
+    JOIN public.driver_trips ON driver_trips.id = driver_trip_embeddings.trip_id
+    LEFT JOIN public.drivers ON drivers.id = driver_trips.driver_id
+    LEFT JOIN public.customers ON customers.id = drivers.customer_id
+    LEFT JOIN public.driver_cars ON driver_cars.id = driver_trips.car_id
+    WHERE driver_trips.status = 'active'
+      AND (driver_trips.available_seats IS NULL OR driver_trips.available_seats >= COALESCE(filter_seats, 1))
+      AND (filter_departure IS NULL OR driver_trips.departure ILIKE '%' || filter_departure || '%')
+      AND (filter_destination IS NULL OR driver_trips.destination ILIKE '%' || filter_destination || '%')
+      AND (filter_driver_name IS NULL OR customers.name ILIKE '%' || filter_driver_name || '%')
+      AND (filter_departure_date IS NULL OR driver_trips.departure_date = filter_departure_date)
+      AND (filter_departure_time IS NULL OR driver_trips.departure_time = filter_departure_time)
+      AND (filter_vehicle_type IS NULL OR driver_cars.car_type ILIKE '%' || filter_vehicle_type || '%')
+      AND (
+        driver_trips.departure_date > (NOW() AT TIME ZONE 'Asia/Aden')::date
+        OR (
+          driver_trips.departure_date = (NOW() AT TIME ZONE 'Asia/Aden')::date
+          AND (
+            (NOW() AT TIME ZONE 'Asia/Aden')::time < TIME '12:00'
+            OR (
+              (NOW() AT TIME ZONE 'Asia/Aden')::time < TIME '18:00'
+              AND driver_trips.departure_time IN ('noon', 'night')
+            )
+            OR (
+              (NOW() AT TIME ZONE 'Asia/Aden')::time >= TIME '18:00'
+              AND driver_trips.departure_time = 'night'
+            )
+          )
+        )
+      )
+  )
+  SELECT
+    ranked.trip_id,
+    ranked.departure,
+    ranked.destination,
+    ranked.departure_date,
+    ranked.departure_time,
+    ranked.available_seats,
+    ranked.total_seats,
+    ranked.price,
+    ranked.status,
+    ranked.driver_name,
+    ranked.driver_phone_number,
+    ranked.car_type,
+    ranked.chunk_text,
+    ranked.similarity,
+    ranked.time_difference_minutes,
+    ranked.registered
+  FROM ranked
+  WHERE ranked.similarity >= match_threshold
+  ORDER BY
+    ranked.registered DESC,
+    ranked.time_difference_minutes NULLS LAST,
+    ranked.departure_date,
+    ranked.vector_distance
+  LIMIT match_count;
+$$;

tests/conftest.py

@@ -223,8 +223,8 @@ class FakeRepository:
         destination: str,
         departure_date: Any,
         departure_time: str,
-        available_seats: int,
-        total_seats: int,
+        available_seats: int | None,
+        total_seats: int | None,
         price: float,
     ) -> dict[str, Any]:
         customer = await self.upsert_customer(
@@ -263,8 +263,8 @@ class FakeRepository:
         destination: str,
         departure_date: Any,
         departure_time: str,
-        available_seats: int,
-        total_seats: int,
+        available_seats: int | None,
+        total_seats: int | None,
         price: float,
     ) -> dict[str, Any]:
         if not driver_id:

tests/test_group_message_service.py

@@ -669,3 +669,27 @@ async def test_dm_with_multi_phone_merges_into_existing(settings: Settings) -> N
     assert customer1["id"] == customer2["id"]
     assert customer2["remoteJid"] == "967712345678"
     assert customer2["registered"] is True
+
+
+@pytest.mark.asyncio
+async def test_trip_ad_with_null_seats_stores_none(settings: Settings) -> None:
+    repo = FakeRepository()
+    embeddings = FakeEmbeddings()
+    provider = FakeProvider(
+        response_content=_trip_ad_response(available_seats=None, total_seats=None)
+    )
+
+    service = GroupMessageService(
+        repository=repo,
+        embeddings=embeddings,
+        ai=provider,
+        settings=settings,
+    )
+
+    inbound = _make_inbound(text="رحلة من صنعاء إلى عدن")
+    await service.handle_group_message(inbound)
+
+    assert len(repo.created_trips) == 1
+    trip = repo.created_trips[0]
+    assert trip.get("available_seats") is None
+    assert trip.get("total_seats") is None

tests/test_tools.py

@@ -587,7 +587,7 @@ async def test_add_trip_by_driver_creates_trip_without_optional_fields():
     assert result.ok is True
     assert repository.created_trips[0]["car_id"] == "car-1"
     assert repository.created_trips[0]["total_seats"] == 4
-    assert repository.created_trips[0]["available_seats"] == 4
+    assert repository.created_trips[0]["available_seats"] is None
     assert repository.created_trips[0]["price"] == 0
 
 

tests/test_trip_selection.py

@@ -83,3 +83,21 @@ def test_format_trip_card_driver_message_empty():
     }
     card = format_trip_card(trip)
     assert "صنعاء ← إلى" in card
+
+
+def test_format_trip_card_null_seats():
+    trip = {
+        "id": "trip-1",
+        "departure": "صنعاء",
+        "destination": "تعز",
+        "departure_date": "2026-12-01",
+        "departure_time": "noon",
+        "available_seats": None,
+        "total_seats": None,
+        "price": 5000,
+        "driver_cars": [{"car_type": "باص"}],
+        "drivers": [{"name": "أحمد"}],
+    }
+    card = format_trip_card(trip)
+    assert "غير متوفرة" in card
+    assert "المقاعد:" in card