fix

app/dialogflow/api/v1/dialogflow.py

@@ -234,20 +234,33 @@ async def price(request: Request):
 @router.post('/trip/route/list')
 async def booking_trip(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, raw_time_of_day = dialog_service.get_param_from_dialogflow(body)
     
-    date = raw_date.strftime('%m-%d-%Y')
+    origin_office = parameters.get("origin_office")
+    dest_office = parameters.get("dest_office")
+    
     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))
+    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)
+    else:
+        origin_code = await 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)
+    else:
+        dest_code = await 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)
+    
+    
     try:
-        data = await dialog_service.search_trip(from_time, to_time, routes_ids, ticket_count)
+        data = await dialog_service.search_trip(from_time, to_time, route_ids, ticket_count)
         total = len(data)
         if total > 0:
                 trips = []

app/dialogflow/services/dialog_service.py

@@ -34,13 +34,26 @@ class DialogService:
         return raw_departure_city, raw_destination_city, raw_ticket_number, raw_date, raw_time_of_day
 
     @staticmethod
-    async def search_route_ids_from_province(departure_code: str, destination_code: str):
-        response = await api.get(f'/metadata/office/routes?DestCode={destination_code}&OriginCode={departure_code}')
+    async def search_route_ids_one_way(origin_code: str = None, from_id: int = None, orign_ids: int = None, des_code: str = None, to_id: str = None, dest_ids: str = None):
+        params = {
+            "OriginCode": origin_code,
+            "FromId": from_id,
+            "OriginIds": orign_ids,
+            "DestCode": des_code,
+            "ToId": to_id,
+            "DestIds": dest_ids
+        }
+        response = await api.get(f'/metadata/office/routes' , params=params)
         route_ids = []
         if isinstance(response, list):
-                route_ids = [route.get("routeId", -1) for route in response]
+                route_ids = [route.get("routeId", None) for route in response]
+        return route_ids
+    
+    async def search_all_route_ids(self, origin_code: str = None, from_id: int = None, orign_ids: int = None, des_code: str = None, to_id: str = None, dest_ids: str = None)
+        route_ids_origin_dest = await self.search_route_ids_one_way(origin_code, from_id, orign_ids, des_code, to_id, dest_ids)
+        route_ids_dest_origin = await self.search_route_ids_one_way(des_code, to_id, dest_ids, origin_code, from_id, orign_ids)
+        route_ids = list(set(route_ids_origin_dest + route_ids_dest_origin))
         return route_ids
-
     @staticmethod
     async def seats_trip(route_id: int, trip_id:int, departure_date: str, departure_time: str, kind: str):
         try:
@@ -168,9 +181,50 @@ class DialogService:
             return data
         return None
     
+    async def find_id_office_by_name_office(self, office_name: str):
+        data = await self.search_pickup_points(origin=office_name)
+        if data.get["origin"]:
+            origins = data["origin"]
+            for origin in origins:
+                if origin.get("group"):
+                    groups = origin["group"]
+                    for group in groups:
+                        if group.get("name"):
+                            name = group["name"]
+                            if name == office_name:
+                                return group["officeId"]
+        return None
+    
+    async def find_id_provine_by_name_office(self, office_name: str):
+        data = await self.search_pickup_points(origin=office_name)
+        if data.get["origin"]:
+            origins = data["origin"]
+            for origin in origins:
+                if origin.get("group"):
+                    groups = origin["group"]
+                    for group in groups:
+                        if group.get("name"):
+                            name = group["name"]
+                            if name == office_name:
+                                return group["provinceId"]
+        return None
+
+    async def find_id_and_code_provine_by_name_office(self, office_name: str):
+        data = await self.search_pickup_points(origin=office_name)
+        if data.get["origin"]:
+            origins = data["origin"]
+            for origin in origins:
+                if origin.get("group"):
+                    groups = origin["group"]
+                    for group in groups:
+                        if group.get("name"):
+                            name = group["name"]
+                            if name == office_name:
+                                return group["provinceId"], group["provinceCode"]
+        return None
     
     async def get_origin_city_from_office(self, origin_office: str):
-        data = self.search_pickup_points(origin=origin_office)
+        data = await self.search_pickup_points(origin=origin_office)
         if data.get["origin"]:
             origins = data["origin"]
             for origin in origins:
@@ -184,7 +238,7 @@ class DialogService:
         return None
 
     async def get_destination_city_from_office(self, dest_office: str):
-        data = self.search_pickup_points(dest=dest_office)
+        data = await self.search_pickup_points(dest=dest_office)
         if data.get("dest"):
             dests = data["dest"]
             for dest in dests: