fix

app/dialogflow/api/v1/dialogflow.py

@@ -266,6 +266,119 @@ async def price(request: Request):
     except:
         return DialogFlowResponseAPI(text=["Hệ thống xảy ra lỗi. Quý khách vui lòng thử lại sau hoặc liên hệ Trung tâm tổng đài 1900 6067 để được hỗ trợ."])
 
+@router.post('/trip/list')
+async def get_trip_list(request: Request) -> Response:
+    body = await request.json()
+    session_info = body.get("sessionInfo", {})
+    parameters = session_info.get("parameters")
+    
+    raw_departure_city, raw_destination_city, raw_ticket_number, raw_date, _ = dialog_service.get_param_from_dialogflow(body)
+    
+    origin_office = parameters.get("origin_office")
+    dest_office = parameters.get("dest_office")
+    time = parameters.get("time-select")
+    
+    time = extra_time_dialogflow(time)
+    
+    if isinstance(time, list):
+        parameters = {
+            "is_time_ambiguous": True
+        }
+        return DialogFlowResponseAPI(parameters=parameters)
+    
+    from_time, to_time = dialog_service.process_dates_to_timestamp(raw_date)
+    
+    ticket_count = int(raw_ticket_number) if raw_ticket_number else 1
+
+    origin_code, origin_id, origin_ids, dest_code, dest_id, dest_ids = None, None, None, None, None, None
+    if origin_office:
+        origin_id, origin_code = await dialog_service.find_id_and_code_provine_by_name_office(origin_office)
+        origin_ids = await dialog_service.find_id_office_by_name_office(origin_office)
+    elif raw_departure_city:
+        origin_id, origin_code = get_origin_id_and_code(raw_departure_city)
+    if dest_office:
+        dest_id, dest_code  = await dialog_service.find_id_and_code_provine_by_name_office(dest_office)
+        dest_ids = await dialog_service.find_id_office_by_name_office(dest_office)
+    elif raw_destination_city:
+        dest_id, dest_code = get_origin_id_and_code(raw_destination_city)
+    route_ids = await dialog_service.search_all_route_ids(origin_code=origin_code, from_id=origin_id, orign_ids=origin_ids, dest_code=dest_code, to_id=dest_id, dest_ids=dest_ids)
+    
+    
+    
+    try:
+        data = await dialog_service.search_trip(from_time, to_time, route_ids, ticket_count)
+        if len(data) > 0:
+                trip_by_time_office = dialog_service.get_trip_by_time_and_office_id(data, time, origin_id, dest_id)
+                
+                # Nếu có chuyến xe theo thời gian và văn phòng chỉ định
+                if trip_by_time_office:
+                    parameters = {
+                        "is_valid_trip": True,
+                    }
+                    return DialogFlowResponseAPI(parameters=parameters)
+                
+                # Danh sách chuyến xe khớp với văn phòng đón hoặc văn phòng trả
+                data_by_office = dialog_service.get_all_trip_by_office(data, origin_id, dest_id)
+                # Tìm 4 chuyến xe gần thời gian chỉ định nhất
+                trip_surrounding_time = dialog_service.get_4_surrounding_trip(data_by_office, time, origin_id, dest_id)
+                
+                trips = []
+                trip_dialogflow = []
+                
+                for trip in trip_surrounding_time:
+                    if ticket_count <= trip["empty_seat_quantity"]:
+                        trip_dialogflow.append({"trip_id": trip["id"], "route":f"{trip["raw_departure_time"]} | {trip['route']['origin_hub_name']} => {trip['route']['dest_hub_name']}"})
+                text = ["Quý khách vui lòng lựa chọn chuyến xe\n" + "\n".join(f"{i+1}. {trip["route"]}" for i, trip in enumerate(trip_dialogflow))]
+                payload={
+                                "richContent": [
+                                    [
+                                        {
+                                            "type": "chips",
+                                            "options": [ 
+                                                {"text": trip["route"]} for trip in (trip_dialogflow)
+                                            ]
+                                        }
+                                    ]
+                                ]
+                            }
+                parameters = {
+                    "trip_select": trip_dialogflow,
+                    "trips": trips,
+                }
+                return DialogFlowResponseAPI(text=text, payload=payload,parameters=parameters)                
+            
+        text = [f"Hệ thống không tìm thấy tuyến xe **{raw_departure_city}** - **{raw_destination_city}**.\n Quý khách vui lòng thử lại với lộ trình khác hoặc liên hệ Trung tâm tổng đài 1900 6067 để được hỗ trợ."]
+        payload={
+                                "richContent": [
+                                    [
+                                        {
+                                            "type": "chips",
+                                            "options": [
+                                                {"text": "Xem tuyến xe khác"},
+                                                {"text": "Không, cảm ơn"}
+                                            ]
+                                        }
+                                    ]
+                                ]
+                            }
+                        
+        return DialogFlowResponseAPI(text=text, payload=payload)
+    except Exception as e:
+        print(e)
+        return JSONResponse(
+                    {
+                    "fulfillment_response": {
+                        "messages": [
+                        {
+                            "text": {
+                            "text": ["Hệ thống xảy ra lỗi. Quý khách vui lòng thử lại sau hoặc liên hệ Trung tâm tổng đài 1900 6067 để được hỗ trợ."]
+                            }
+                        }
+                        ]
+                    },
+                }
+        )
+
 
 @router.post('/trip/route/list')
 async def booking_trip(request: Request) -> Response:
@@ -365,30 +478,29 @@ async def booking_trip(request: Request) -> Response:
                 }
         )
 
-@router.post('/trip/route/check-route-select')
+@router.post('/trip/check-trip')
 async def is_valid_select_trip(request: Request) -> Response:
     body = await request.json()
     raw_input = body.get("text", "")
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
-    routes_name = parameters.get("routes_name")
+    trip_select: list[dict[str, any]] = parameters.get("trip_select")
+    trips: list[dict[str, any]] = parameters.get("trip")
+    
+    if trip_select is None and trips is None:
+        return DialogFlowResponseAPI()
+    
     if raw_input:
         raw_input = raw_input.strip()
-    if raw_input in routes_name:
-        trip_list: List[Dict[str, any]] = parameters.get("trip_list")
-        for trip in trip_list:
-            if trip["route_name"] == raw_input:
-                route_id = int(trip["route_id"])
-                kind = trip["kind"]
-                way_id = trip["way_id"]
+    if raw_input in trip_select:
+        for item in trips:
+            if item["route"] == raw_input:
+                trip = item
                 break
         
         parameters = {
                 "is_valid_trip": True,
-                "route_name": raw_input,
-                "kind": kind,
-                "route_id": route_id,
-                "way_id": way_id,   
+                "trip": trip
             }
     else:
         parameters = {
@@ -620,13 +732,13 @@ async def seats_trip(request: Request) -> Response:
         parameters = session_info.get("parameters")
         
         trip = parameters.get("trip", None)
-        route_id: int = parameters.get("route_id", None)
-        route_id = int(route_id) if route_id else None
-        departure_date: str = parameters.get("departure_date", None)
-        departure_time: str = parameters.get("departure_time", None)
-        kind: str = parameters.get("kind", None)
+        route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+        trip_id = int(trip.get("id")) if trip.get("id") else None
+        
+        departure_date: str = trip.get("raw_departure_time")
+        departure_time: str = trip.get("raw_departure_date")
+        kind: str = trip.get("seat_type_name")
 
-        trip_id = int(trip["id"]) if trip else None
         seats = await dialog_service.seats_trip(route_id, trip_id, departure_date, departure_time, kind)
         seats_empty = [ seat for seat in seats if seat["bookStatus"] == 0 ]
         seats_empty.sort(key=lambda x: x["chair"])
@@ -657,15 +769,19 @@ async def is_valid_select_seat(request: Request) -> Response:
         session_info = body.get("sessionInfo", {})
         parameters = session_info.get("parameters")
         
-        trip = parameters.get("trip", None)
-        route_id: int = parameters.get("route_id", None)
-        route_id = int(route_id) if route_id else None
-        departure_date: str = parameters.get("departure_date", None)
-        departure_time: str = parameters.get("departure_time", None)
-        kind: str = parameters.get("kind", None)
-        seat: str = parameters.get("seat", None)
-
-        trip_id = int(trip["id"]) if trip else None
+        trip: list[dict[str, any]] = parameters.get("trip", None)
+        
+        route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+        
+        trip_id = int(trip.get("id")) if trip.get("id") else None
+        
+        departure_date: str = trip.get("raw_departure_time")
+        
+        departure_time: str = trip.get("raw_departure_date")
+        
+        kind: str = trip.get("seat_type_name")
+        
+        seat: str = parameters.get("seat")
 
         is_valid = await dialog_service.is_valid_select_seat(seat, route_id, trip_id, departure_date, departure_time, kind)
         if is_valid:
@@ -679,7 +795,7 @@ async def is_valid_select_seat(request: Request) -> Response:
                 "is_valid_seat": False,
                 "seat": None        
             }
-            text = [f"Ghế **{seat}** đã được đặt. Quý khách vui lòng chọn ghế khác"]
+            text = [f"Ghế **{seat}** không hợp lệ. Quý khách vui lòng chọn ghế khác"]
         return DialogFlowResponseAPI(text=text, parameters=parameters)
         
     except Exception as e:
@@ -690,11 +806,13 @@ async def pickup(request: Request) -> Response:
     body = await request.json()
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
-    trip: dict[str, any] = parameters.get("trip", None)
-    route_id: int = trip["route_id"]
-    route_id = int(route_id) if route_id else None
-    way_id: int = trip["way_id"]
-    way_id = int(way_id) if way_id else None
+    
+    trip: list[dict[str, any]] = parameters.get("trip", {})
+    
+    route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+    
+    way_id = int(trip.get("way_id")) if trip.get("way_id") else None
+    
     pickup_list = await dialog_service.pickup_list(route_id, way_id)
     
     text=["Quý khách vui lòng chọn điểm đón"]
@@ -721,11 +839,13 @@ async def is_valid_select_pickup(request: Request) -> Response:
     body = await request.json()
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
-    trip = parameters.get("trip", None)
-    route_id: int = trip["route_id"]
-    route_id = int(route_id) if route_id else None
-    way_id: int = trip["way_id"]
-    way_id = int(way_id) if way_id else None
+    
+    trip: list[dict[str, any]] = parameters.get("trip", {})
+    
+    route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+    
+    way_id = int(trip.get("way_id")) if trip.get("way_id") else None
+    
     raw_input = (body.get("text",""))
     pickup = raw_input.strip()
 
@@ -750,11 +870,13 @@ async def dropoff(request: Request) -> Response:
     body = await request.json()
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
-    trip = parameters.get("trip", None)
-    route_id: int = trip["route_id"]
-    route_id = int(route_id) if route_id else None
-    way_id: int = trip["way_id"]
-    way_id = int(way_id) if way_id else None
+    
+    trip: list[dict[str, any]] = parameters.get("trip", {})
+    
+    route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+    
+    way_id = int(trip.get("way_id")) if trip.get("way_id") else None
+    
     dropoff_list = await dialog_service.dropoff_list(route_id, way_id)
 
     text=["Quý khách vui lòng chọn điểm trả khách"]
@@ -781,11 +903,13 @@ async def is_valid_select_dropoff(request: Request) -> Response:
     body = await request.json()
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
-    trip = parameters.get("trip", None)
-    route_id: int = trip["route_id"]
-    route_id = int(route_id) if route_id else None
-    way_id: int = trip["way_id"]
-    way_id = int(way_id) if way_id else None
+    
+    trip: list[dict[str, any]] = parameters.get("trip", {})
+    
+    route_id = int(trip.get("route_id")) if trip.get("route_id") else None
+    
+    way_id = int(trip.get("way_id")) if trip.get("way_id") else None
+    
     raw_input = (body.get("text",""))
     dropoff = raw_input.strip()
 
@@ -805,26 +929,33 @@ async def is_valid_select_dropoff(request: Request) -> Response:
 
     return DialogFlowResponseAPI(text=text, parameters=parameters)
 
-@router.post('/trip/ticket/info')
+@router.post('/ticket/info')
 async def response_ticket_info(request: Request) -> Response:
     body = await request.json()
     session_info = body.get("sessionInfo", {})
     parameters = session_info.get("parameters")
 
-    user_name = parameters.get("user_name", None)
-    phone_number = parameters.get("phone_number", None)
-    email = parameters.get("email", None)
-    seat = parameters.get("seat", None)
-    pickup = parameters.get("pick_up", None)
-    dropoff = parameters.get("drop_off", None)
+    user_name = parameters.get("user_name")
+    
+    phone_number = parameters.get("phone_number")
+    
+    email = parameters.get("email")
+    
+    seat = parameters.get("seat")
+    
+    pickup = parameters.get("pick_up")
+    
+    dropoff = parameters.get("drop_off")
 
-    trip = parameters.get("trip", None)
+    trip = parameters.get("trip", {})
 
     route_name = trip["route"]["name"]
+    
     time = trip["raw_departure_time"]
+    
     date = trip["raw_departure_date"]
-    price = trip["price"]
-    price = int(price) if price else None
+    
+    price = int(trip.get("price")) if trip.get("price") else None
 
     text = [
         f" \

app/dialogflow/services/dialog_service.py

@@ -1,3 +1,4 @@
+from bisect import bisect_left
 from datetime import datetime, timedelta
 
 from fastapi import logger
@@ -35,6 +36,7 @@ class DialogService:
         raw_time_of_day = parameters.get("time_of_day")
         return raw_departure_city, raw_destination_city, raw_ticket_number, raw_date, raw_time_of_day
 
+    # Danh sách route_id API v1
     @staticmethod
     async def search_route_ids_one_way_by_metadata(origin_code: str = None, from_id: int = None, orign_ids: int = None, dest_code: str = None, to_id: str = None, dest_ids: str = None):
         params = {k: v for k, v in {
@@ -52,6 +54,7 @@ class DialogService:
                 return route_ids
         return []
     
+    # Danh sách route_id v2 khi API route v1 không có dữ liệu
     @staticmethod
     async def search_route_ids_one_way_by_origin_dest_code(origin: str, dest: str):
         try:
@@ -71,6 +74,7 @@ class DialogService:
         if len(route_ids) == 0:
             route_ids = await self.search_route_ids_one_way_by_origin_dest_code(origin_code, dest_code)
         return route_ids
+    # Danh sách ghế 
     @staticmethod
     async def seats_trip(route_id: int, trip_id:int, departure_date: str, departure_time: str, kind: str):
         try:
@@ -86,6 +90,7 @@ class DialogService:
             print(e)
             raise Exception("Error fetching seats data")
 
+    # Call API để lấy danh sách chuyến đi
     @staticmethod
     async def search_trip(from_time: int, to_time: int, route_ids: list[int], ticket_count: int = 1):
         try:
@@ -112,6 +117,52 @@ class DialogService:
         except Exception as e:
             print(e)
             raise Exception("Error fetching trip data")
+        
+    # Chuyến đi khớp với thời gian và văn phòng đón trả 
+    @staticmethod
+    def get_trip_by_time_and_office_id(trips: list, time: str ,origin_id: int, dest_id: int) -> dict:
+        if time is None or origin_id is None or dest_id is None:
+            return {}
+        
+        for trip in trips:
+            if trip and trip["raw_departure_time"] == time and trip["route"]["origin_hub_office_id"] == origin_id and trip["route"]["dest_hub_office_id"] == dest_id:
+                return trip
+        return {}
+    
+    
+    # Danh sách chuyến đi có thể chọn được theo văn phòng
+    @staticmethod
+    def get_all_trip_by_office(trips, origin_id: int = None, dest_id: int = None) -> list:
+        if origin_id is None and dest_id is None:
+            return []
+            
+        result = []
+        for trip in trips:
+            if origin_id and dest_id:
+                if trip["route"]["origin_hub_office_id"] == origin_id and trip["route"]["dest_hub_office_id"] == dest_id:
+                    result.append(trip)
+            elif origin_id:
+                if trip["route"]["origin_hub_office_id"] == origin_id:
+                    result.append(trip)
+            elif dest_id:
+                if trip["route"]["dest_hub_office_id"] == dest_id:
+                    result.append(trip)
+            
+        return result
+    # Danh sách 4 chuyến đi xung quanh thời gian chỉ định
+    @staticmethod
+    def get_4_surrounding_trip(trips: list, time: str) -> list:
+        if time is None:
+            return []
+        
+        time_trips = [ trip["raw_departure_time"] for trip in trips]
+        index = bisect_left(time_trips, time)
+        start = max(0, index - 2)
+        end = min(len(time_trips), index + 2)
+        
+        return time_trips[start:end]
+        
+        
 
     async def is_valid_select_seat(self, seat: str,route_id: int, trip_id:int, departure_date: str, departure_time: str, kind: str):
         if seat is None: