fix

app/dialogflow/api/v1/dialogflow.py

@@ -90,8 +90,13 @@ async def confirm(request: Request):
 @router.post('/routes')
 async def route(request: Request):
     body = await request.json()
-    raw_departure_city, raw_destination_city, raw_ticket_number , raw_date, _ = dialog_service.get_param_from_dialogflow(body)
+    session_info = body.get("sessionInfo", {})
+    parameters = session_info.get("parameters")
+    
+    origin_office = parameters.get("origin_office")
+    dest_office = parameters.get("dest_office")
     
+    raw_departure_city, raw_destination_city, raw_ticket_number , raw_date, _ = dialog_service.get_param_from_dialogflow(body)
     
     ticket_count = int(raw_ticket_number) if raw_ticket_number else 1
 
@@ -101,15 +106,24 @@ async def route(request: Request):
     else:
         date = raw_date.strftime('%m-%d-%Y')
         from_time, to_time = dialog_service.process_dates_to_timestamp(raw_date)
-    departure_code = origin_codes.get(raw_departure_city)
-    destination_code = origin_codes.get(raw_destination_city)
-    route_dep_to_des = await dialog_service.search_route_ids_from_province(departure_code,destination_code)
-    route_des_to_dep = await dialog_service.search_route_ids_from_province(destination_code,departure_code)
-    routes_ids = list(set(route_dep_to_des + route_des_to_dep))
+    
+    origin_code, origin_id, origin_ids, dest_code, dest_id, dest_ids = None, None, None, None, None, None
+    if origin_office:
+        origin_code, origin_id = 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_code = origin_codes.get(raw_departure_city)
+    if dest_office:
+        dest_code, dest_id = 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_code = origin_codes.get(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)
+    
     payload = {
         "from_time": from_time,
         "to_time": to_time,
-        "route_ids": routes_ids,
+        "route_ids": route_ids,
         "ticket_count": 1,
         "sort_by": ["price", "departure_time"]
     }
@@ -169,21 +183,35 @@ async def route(request: Request):
 @router.post('/price')
 async def price(request: Request):
     body = await request.json()
+    session_info = body.get("sessionInfo", {})
+    parameters = session_info.get("parameters")
+    
     raw_departure_city, raw_destination_city, _, raw_date, _ = dialog_service.get_param_from_dialogflow(body)
     
     if raw_date is None:
         from_time, to_time = dialog_service.process_dates_to_timestamp()
     from_time, to_time = dialog_service.process_dates_to_timestamp(raw_date)
 
-    departure_code = origin_codes.get(raw_departure_city)
-    destination_code = origin_codes.get(raw_destination_city)
-    route_dep_to_des = await dialog_service.search_route_ids_from_province(departure_code,destination_code)
-    route_des_to_dep = await dialog_service.search_route_ids_from_province(destination_code,departure_code)
-    routes_ids = list(set(route_dep_to_des + route_des_to_dep))
+    origin_office = parameters.get("origin_office")
+    dest_office = parameters.get("dest_office")
+    
+    origin_code, origin_id, origin_ids, dest_code, dest_id, dest_ids = None, None, None, None, None, None
+    if origin_office:
+        origin_code, origin_id = 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_code = origin_codes.get(raw_departure_city)
+    if dest_office:
+        dest_code, dest_id = 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_code = origin_codes.get(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)
+    
     payload = {
         "from_time": from_time,
         "to_time": to_time,
-        "route_ids": routes_ids,
+        "route_ids": route_ids,
         "ticket_count": 1,
         "sort_by": ["price", "departure_time"]
     }
@@ -408,16 +436,25 @@ async def is_valid_select_time(request: Request) -> Response:
 
         raw_departure_city, raw_destination_city, raw_ticket_number, raw_date, raw_time_of_day = dialog_service.get_param_from_dialogflow(body)
     
-        date = raw_date.strftime('%m-%d-%Y')
         from_time, to_time = dialog_service.process_dates_to_timestamp(raw_date)
         ticket_count = int(raw_ticket_number) if raw_ticket_number else 1
-
-        departure_code = origin_codes.get(raw_departure_city)
-        destination_code = origin_codes.get(raw_destination_city)
-
-        route_dep_to_des = await dialog_service.search_route_ids_from_province(departure_code,destination_code)
-        route_des_to_dep = await dialog_service.search_route_ids_from_province(destination_code,departure_code)
-        routes_ids = list(set(route_dep_to_des + route_des_to_dep))
+        
+        origin_office = parameters.get("origin_office")
+        dest_office = parameters.get("dest_office")
+
+        origin_code, origin_id, origin_ids, dest_code, dest_id, dest_ids = None, None, None, None, None, None
+        if origin_office:
+            origin_code, origin_id = 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_code = origin_codes.get(raw_departure_city)
+        if dest_office:
+            dest_code, dest_id = 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_code = origin_codes.get(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)
+        
 
         time_list: List[Dict[str, any]] = parameters.get("time_list", [])
         time_select = parameters.get("time-select", None)
@@ -428,7 +465,7 @@ async def is_valid_select_time(request: Request) -> Response:
             for time in time_list:
                 if time_select == time["time"]:
                     id = int(time["id"])
-                    trip = await dialog_service.search_trip_by_id(id, from_time, to_time, routes_ids, ticket_count)
+                    trip = await dialog_service.search_trip_by_id(id, from_time, to_time, route_ids, ticket_count)
                     departure_date = trip["raw_departure_date"]
                     parameters = {
                         "is_valid_time": True,