fix list trip

app/dialogflow/api/v1/dialogflow.py

@@ -307,10 +307,8 @@ async def get_trip_list(request: Request) -> Response:
     try:
         data = await dialog_service.search_trip(from_time, to_time, route_ids, ticket_count)
         if len(data) > 0:
-            ################################## bug choox nay
             
             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_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:                    
@@ -322,15 +320,16 @@ async def get_trip_list(request: Request) -> Response:
                 
                 # Nếu không có chuyến xe theo thời gian và văn phòng chỉ định   
                 # 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_ids, dest_ids)
-            elif origin_office:
-                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_ids)
-            else:
-                data_by_office = data
+            #     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_ids)
+            # elif dest_office:
+            #     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
-            trip_surrounding_time = dialog_service.get_4_surrounding_trip(data_by_office, time)
+            trip_surrounding_time = dialog_service.get_surrounding_trip(data_by_office, time, num_trip=4)
             trip_dialogflow = []    
                 
             for trip in trip_surrounding_time:

app/dialogflow/services/dialog_service.py

@@ -165,16 +165,29 @@ class DialogService:
         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:
-        if time is None:
+    def get_surrounding_trip(trips: list, time: str, num_trip: int = 4) -> list:
+        if not time or not trips or num_trip <= 0:
             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)
-        trips_result = trips[start:end]
-        return trips_result
+        
+        half = num_trip // 2
+        start = max(0, index - half)
+        end = min(len(trips), index + half + (num_trip % 2))
+        
+        missing = num_trip - (end - start)
+        
+        if missing > 0:
+            extra_start = min(missing, start)
+            start -= extra_start
+            missing -= extra_start
+        
+        if missing > 0:
+            extra_end = min(missing, len(trips) - end)
+            end += extra_end
+        
+        return trips[start:end]