fix

app/dialogflow/api/v1/dialogflow.py

@@ -308,13 +308,10 @@ async def get_trip_list(request: Request) -> Response:
         if len(data) > 0:
             ################################## bug choox nay
             
-                if origin_office:
-                    origin_id = origin_ids
-                if dest_office:
-                    dest_id = dest_ids
+            if origin_office and dest_office:
                     
                 ## Chưa tìm được 
-                trip_by_time_office = dialog_service.get_trip_by_time_and_office_id(data, time, origin_id, dest_id)
+                trip_by_time_office = dialog_service.get_trip_by_time_and_office_id(data, time, origin_ids, dest_ids)
                 # Nếu có chuyến xe theo thời gian và văn phòng chỉ định
                 if trip_by_time_office:
                     print(trip_by_time_office)
@@ -327,11 +324,11 @@ async def get_trip_list(request: Request) -> Response:
                 
                 # Danh sách chuyến xe khớp với văn phòng đón hoặc văn phòng trả
                 if origin_office and dest_office:
-                    data_by_office = dialog_service.get_all_trip_by_office(data, origin_id, dest_id)
+                    data_by_office = dialog_service.get_all_trip_by_office(data, origin_ids, dest_ids)
                 elif origin_office:
-                    data_by_office = dialog_service.get_all_trip_by_office(data,origin_id=origin_id)
+                    data_by_office = dialog_service.get_all_trip_by_office(data,origin_id=origin_ids)
                 elif dest_office:
-                    data_by_office = dialog_service.get_all_trip_by_office(data, dest_id=dest_id)
+                    data_by_office = dialog_service.get_all_trip_by_office(data, dest_id=dest_ids)
                 else:
                     data_by_office = data
                 # Tìm 4 chuyến xe gần thời gian chỉ định nhất

app/dialogflow/services/dialog_service.py

@@ -140,17 +140,25 @@ class DialogService:
             
         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
+            pickup_points = trip.get("pickup_points", [])
+            pickup_point_ids = {p["OfficeId"] for p in pickup_points if "OfficeId" in p}
+
+            origin_match = (
+                (origin_id is None) or
+                (trip["route"]["origin_hub_office_id"] == origin_id) or
+                (origin_id in pickup_point_ids)
+            )
+
+            dest_match = (
+                (dest_id is None) or
+                (trip["route"]["dest_hub_office_id"] == dest_id) or
+                (dest_id in pickup_point_ids)
+            )
+
+            if origin_match and dest_match:
+                result.append(trip)
+
+        return result if result else trips
     # 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:
@@ -224,7 +232,8 @@ class DialogService:
             return False
         pickup_list = await self.pickup_list(route_id, way_id)
         for pickup_data in pickup_list:
-            if pickup_data['name'] == pickup:
+            pickup_name: str = pickup_data['name']
+            if pickup_name.lower() == pickup.lower():
                 return True
         return False
 
@@ -278,8 +287,8 @@ class DialogService:
                     groups = origin["group"]
                     for group in groups:
                         if group.get("name"):
-                            name = group["name"]
-                            if name == office_name:
+                            name: str = group["name"]
+                            if name.lower() == office_name.lower():
                                 office_id = group["officeId"]
                                 office_id = office_id[0] if isinstance(office_id, tuple) else office_id
                                 return office_id
@@ -294,9 +303,10 @@ class DialogService:
                     groups = origin["group"]
                     for group in groups:
                         if group.get("name"):
-                            name = group["name"]
-                            if name == office_name:
-                                return group["provinceId"]
+                            name: str = group["name"]
+                            if name.lower() == office_name.lower():
+                                province_id = group["provinceId"]
+                                return province_id
         return None
 
     async def find_all_origin_by_name_office(self, office_name: str):
@@ -315,8 +325,8 @@ class DialogService:
                     groups = origin["group"]
                     for group in groups:
                         if group.get("name"):
-                            name = group["name"]
-                            if name == office_name:
+                            name: str = group["name"]
+                            if name.lower() == office_name.lower():
                                 province_id = group["provinceId"]
                                 province_code = group["provinceCode"]
                                 province_id = province_id[0] if isinstance(province_id, tuple) else province_id
@@ -332,8 +342,8 @@ class DialogService:
                     groups = origin["group"]
                     for group in groups:
                         if group.get("name"):
-                            name = group["name"]
-                            if name == origin_office:
+                            name:str = group["name"]
+                            if name.lower() == origin_office.lower():
                                 return group["provinceName"]
         return None
 
@@ -346,8 +356,8 @@ class DialogService:
                     groups = dest["group"]
                     for group in groups:
                         if group.get("name"):
-                            name = group["name"]
-                            if name == dest_office:
+                            name: str = group["name"]
+                            if name.lower() == dest_office.lower():
                                 return group["provinceName"]
         return None