feat: /seat /check_seat /pickup /dropoff /ticketinfo

.gitignore

@@ -13,3 +13,4 @@ venv/
 .python-version
 .ruff_cache/00
 .pytest_cache/
+note.txt

Dockerfile

@@ -2,13 +2,6 @@ FROM python:3.10.16-slim
 
 RUN adduser --disabled-password --gecos '' appuser
 
-
-ENV API_BASE_URL=https://api-dev.futabus.vn
-
-ENV API_BASE_URL_ACCESS_TOKEN=https://api-dev.futabus.vn/identity/api/token/anonymous-token
-
-ENV ENVIRONMENT=dev
-
 WORKDIR /app
 
 COPY . .

app/dialogflow/api/v1/dialogflow.py

@@ -157,7 +157,7 @@ async def price(request: Request):
         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')
+@router.post('/trip/route/list')
 async def booking_trip(request: Request) -> Response:
     body = await request.json()
     raw_departure_city, raw_destination_city, raw_ticket_number, raw_date, raw_time_of_day = dialog_service.get_param_from_dialogflow(body)
@@ -172,21 +172,10 @@ async def booking_trip(request: Request) -> Response:
     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))
-    payload = {
-        "from_time": from_time,
-        "to_time": to_time,
-        "route_ids": routes_ids,
-        "ticket_count": ticket_count,
-        "sort_by": ["price", "departure_time"]
-    }
     try:
-        response = await api.post("/search/trips", payload=payload)
-        if response.get('status') == 200:
-            data = response["data"]["items"]
-            total = response["data"]["total"]
-            if total > 0:
-                list_raw_departure_times = sorted(list(set([ trip["raw_departure_time"] for trip in data])))
-                schedule_time_trip = "**" + "** | **".join(map(str, list_raw_departure_times)) + "**"
+        data = await dialog_service.search_trip(from_time, to_time, routes_ids, ticket_count)
+        total = len(data)
+        if total > 0:
                 trips = []
                 routes_name = []
                 for trip in data:
@@ -255,7 +244,7 @@ async def booking_trip(request: Request) -> Response:
                 }
         )
 
-@router.post('/trip/check-trip-select')
+@router.post('/trip/route/check-route-select')
 async def is_valid_select_trip(request: Request) -> Response:
     body = await request.json()
     raw_input = body.get("text", "")
@@ -278,8 +267,7 @@ async def is_valid_select_trip(request: Request) -> Response:
                 "route_name": raw_input,
                 "kind": kind,
                 "route_id": route_id,
-                "way_id": way_id,
-                
+                "way_id": way_id,   
             }
     else:
         parameters = {
@@ -301,7 +289,7 @@ async def time_trip(request: Request) -> Response:
         time_list = []
         for trip in trip_list:
             if (trip["route_id"]) == route_id:
-                time_list.append(trip["departure_time"])
+                time_list.append({"time": trip["departure_time"], "id": trip["id"]})
         parameters = {
             "time_list": time_list
         }
@@ -312,7 +300,7 @@ async def time_trip(request: Request) -> Response:
                                         {
                                             "type": "chips",
                                             "options": [ 
-                                                {"text": time} for time in (time_list)
+                                                {"text": time["time"]} for time in (time_list)
                                             ]
                                         }
                                     ]
@@ -329,23 +317,42 @@ async def is_valid_select_time(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')
+        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))
+
         time_list: List[Dict[str, any]] = parameters.get("time_list", [])
         time = parameters.get("time")
         route_name = parameters.get("route_name")
         raw_input = body.get("text","")
         if raw_input:
             raw_input = raw_input.strip()
-        if raw_input in time_list:
-            parameters = {
-                "is_valid_time": True,
-                "departure_time": raw_input
-            }
-            text = [f' Quý khách chọn chuyến {raw_input} | {route_name}']
-        else:
-            parameters = {
+        for time in time_list:
+            if raw_input == time["time"]:
+                id = int(time["id"])
+                trip = await dialog_service.search_trip_by_id(id, from_time, to_time, routes_ids, ticket_count)
+                parameters = {
+                    "is_valid_time": True,
+                    "departure_time": raw_input,
+                    "trip": trip,
+                }
+                text = [f' Quý khách chọn chuyến {raw_input} | {route_name}']
+                return DialogFlowResponseAPI(text=text, parameters=parameters)
+                
+        parameters = {
                 "is_valid_time": False
             }
-            text = []
+        text = []
         return DialogFlowResponseAPI(text=text, parameters=parameters)
     except Exception as e:
         print(e)
@@ -359,12 +366,15 @@ async def seats_trip(request: Request) -> Response:
         session_info = body.get("sessionInfo", {})
         parameters = session_info.get("parameters")
         
-        trip_id: int = parameters.get("trip_id", None)
+        trip = parameters.get("trip", None)
         route_id: int = parameters.get("route_id", None)
         departure_date: str = parameters.get("departure_date", None)
         departure_time: str = parameters.get("departure_time", None)
         kind: str = parameters.get("kind", None)
-        seats_empty, seats = await dialog_service.seats_trip(route_id, trip_id, departure_date, departure_time, kind)
+
+        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 ]
         text=["Vui lòng chọn ghế"]
         payload={
                                 "richContent": [
@@ -379,12 +389,199 @@ async def seats_trip(request: Request) -> Response:
                                 ]
                             }
         parameters = {
-            "seats": seats
+            "seat_list": seats
         }
         return DialogFlowResponseAPI(text=text, payload=payload, parameters=parameters)
     except Exception as e:
         print(e)
         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/check-seat-select')
+async def is_valid_select_seat(request: Request) -> Response:
+    try:
+        body = await request.json()
+        session_info = body.get("sessionInfo", {})
+        parameters = session_info.get("parameters")
+        
+        trip = parameters.get("trip", None)
+        route_id: int = parameters.get("route_id", 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
+
+        is_valid = await dialog_service.is_valid_select_seat(seat, route_id, trip_id, departure_date, departure_time, kind)
+        if is_valid:
+            parameters = {
+                "is_valid_seat": True,
+                "seat": seat
+            }
+            text = [f"Quý khách chọn ghế {seat}"]
+        else:
+            parameters = {
+                "is_valid_seat": False,
+                "seat": None        
+            }
+            text = [f"Ghế {seat} đã được đặt. Quý khách vui lòng chọn ghế khác"]
+        return DialogFlowResponseAPI(text=text, parameters=parameters)
+        
+    except Exception as e:
+        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/stop/pickup')
+async def 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"]
+    way_id: int = trip["way_id"]
+    pickup_list = await dialog_service.pickup_list(route_id, way_id)
+    
+    text=["Quý khách vui lòng chọn điểm đón"]
+    payload={
+                                "richContent": [
+                                    [
+                                        {
+                                            "type": "chips",
+                                            "options": [ 
+                                                {"text": pickup["name"]} for pickup in (pickup_list)
+                                            ]
+                                        }
+                                    ]
+                                ]
+                            }
+    parameters = {
+        "pickup_list": pickup_list
+    }
+    
+    return DialogFlowResponseAPI(text=text, payload=payload, parameters=parameters)
+
+@router.post('/trip/check-pickup-select')
+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"]
+    way_id: int = trip["way_id"]
+    raw_input = (body.get("text",""))
+    pickup = raw_input.strip()
+
+    is_valid = await dialog_service.is_valid_pickup(pickup, route_id, way_id)
+
+    if is_valid:
+        parameters = {
+            "is_valid_pickup": True,
+            "pick_up": pickup
+        }
+        text = [f"Quý khách chọn điểm đón {pickup}"]
+    else:
+        parameters = {
+            "is_valid_pickup": False,
+        }
+        text = [f"Điểm đón không hợp lệ. Quý khách vui lòng chọn điểm đón khác"]
+
+    return DialogFlowResponseAPI(text=text, parameters=parameters)
+
+@router.post('/trip/stop/dropoff')
+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"]
+    way_id: int = trip["way_id"]
+    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"]
+    payload={
+                                "richContent": [
+                                    [
+                                        {
+                                            "type": "chips",
+                                            "options": [ 
+                                                {"text": dropoff["name"]} for dropoff in (dropoff_list)
+                                            ]
+                                        }
+                                    ]
+                                ]
+                            }
+    parameters = {
+        "dropoff_list": dropoff_list
+    }
+    
+    return DialogFlowResponseAPI(text=text, payload=payload, parameters=parameters)
+
+@router.post('/trip/check-dropoff-select')
+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"]
+    way_id: int = trip["way_id"]
+    raw_input = (body.get("text",""))
+    dropoff = raw_input.strip()
+
+    is_valid = await dialog_service.is_valid_dropoff(dropoff, route_id, way_id)
+
+    if is_valid:
+        parameters = {
+            "is_valid_dropoff": True,
+            "drop_off": dropoff
+        }
+        text = [f"Quý khách chọn điểm trả khách {dropoff}"]
+    else:
+        parameters = {
+            "is_valid_dropoff": False,
+        }
+        text = [f"Điểm trả khách không hợp lệ. Quý khách vui lòng chọn điểm trả khách khác"]
+
+    return DialogFlowResponseAPI(text=text, parameters=parameters)
+
+@router.post('/trip/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)
+
+    trip = parameters.get("trip", None)
+
+    route_name = trip["route"]["name"]
+    time = trip["raw_departure_time"]
+    date = trip["raw_departure_date"]
+    price = trip["price"]
+
+    text = [
+        f"""
+        **Thông tin hành khách**
+
+        Họ và tên {user_name}
+        Số điện thoại {phone_number}
+        Email {email}
+
+        **Thông tin lượt đi**
+
+        Tuyến xe {route_name}
+        Thời gian xuất bến {time} {date}
+        Số ghế {seat}
+        Điểm lên xe {pickup}
+        Điểm trả khách {dropoff}
+        Tổng tiền lượt đi {price} VND
+        """
+        ]
+    return DialogFlowResponseAPI(text=text)
+
+
 @router.get("/")
 def home():
     return "Hello World!"

app/dialogflow/services/dialog_service.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 
 from common.external.external_api import api
+from core.conf import settings
 
 class DialogService:
     @staticmethod
@@ -19,7 +20,6 @@ class DialogService:
             to_time = datetime.combine(today, datetime.max.time()) - timedelta(microseconds=1)
 
         return int(from_time.timestamp()) * 1000 , int(to_time.timestamp()) * 1000
-    
 
     def get_param_from_dialogflow(self, body: any):
         session_info = body.get("sessionInfo", {})
@@ -49,13 +49,112 @@ class DialogService:
                 "departureTime": departure_time,
                 "kind": kind,
             }
-            response = api.get(api_base="https://api-busline-dev.vato.vn/api", endpoint=f"/buslines/futa/booking/seats/{route_id}/{trip_id}" , params=params)
+            response = api.get(api_base=settings.API_BASE_URL_VATO, endpoint=f"/seats/{route_id}/{trip_id}" , params=params)
             seats = response["data"]
-            seats_empty = [ seat for seat in seats if seat["bookStatus"] == 0 ]
-            return seats_empty, seats
+            return seats
         except Exception as e:
             print(e)
             raise Exception("Error fetching seats data")
+    
+    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:
+            return False
+        seats = await self.seats_trip(route_id, trip_id, departure_date, departure_time, kind)
+        for seat_data in seats:
+            if seat_data['chair'] == seat and seat_data['bookStatus'] == 'available':
+                return True
+        return False
+
+    @staticmethod
+    async def search_trip(from_time: int, to_time: int, route_ids: list[int], ticket_count: int = 1):
+        try:
+            payload = {
+                "from_time": from_time,
+                "to_time": to_time,
+                "route_ids": route_ids,
+                "ticket_count": ticket_count,
+                "sort_by": ["price", "departure_time"]
+            }
+
+            response = await api.post("/search/trips", payload=payload)
+            data = response["data"]["items"]
+            return data
+        except Exception as e:
+            print(e)
+            raise Exception("Error fetching trip data")
+    async def search_trip_by_id(self, trip_id: int, from_time: int, to_time: int, route_ids: list[int], ticket_count: int = 1):
+        trip = self.search_trip(from_time, to_time, route_ids, ticket_count)
+        for item in trip:
+            if trip_id == item["id"]:
+                return item
+        return None
+    
+    @staticmethod
+    async def stops(route_id: int, way_id: int):
+        try:
+            params = {
+                "wayId": way_id,
+            }
+            response = await api.get(api_base=settings.API_BASE_URL_VATO, endpoint=f"/stops/{route_id}", params=params)
+            data = response["data"]
+            return data
+        except Exception as e:
+            print(e)
+            raise Exception("Error fetching stops data")
+
+
+    async def pickup_list(self, route_id: int, way_id: int):
+        try:
+            data = self.stops(route_id, way_id)
+            if not data:
+                return []
+            
+            pickup_list = []
+
+            for pickup in data:
+                if pickup["type"] == 0 or ( pickup["type"] == -1 and pickup["presentBeforeMinutes"] < 0 ):
+                    pickup_list.append(pickup)
+            return pickup_list
+        
+        except Exception as e:
+            print(e)
+            raise Exception("Error fetching pickup list data")
+    
+    async def is_valid_pickup(self, pickup: str, route_id: int, way_id: int):
+        if pickup is None:
+            return False
+        pickup_list = await self.pickup_list(route_id, way_id)
+        for pickup_data in pickup_list:
+            if pickup_data['name'] == pickup:
+                return True
+        return False
+
+    async def dropoff_list(self, route_id: int, way_id: int):
+        try:
+            data = self.stops(route_id, way_id)
+            if not data:
+                return []
+            
+            dropoff_list = []
+
+            for dropoff in data:
+                if dropoff["type"] == 1 or ( dropoff["type"] == -1 and dropoff["presentBeforeMinutes"] >= 0 ):
+                    dropoff_list.append(dropoff)
+            return dropoff_list
+        
+        except Exception as e:
+            print(e)
+            raise Exception("Error fetching dropoff list data")
         
+    async def is_valid_dropoff(self, dropoff: str, route_id: int, way_id: int):
+        if dropoff is None:
+            return False
+        dropoff_list = await self.dropoff_list(route_id, way_id)
+        for dropoff_data in dropoff_list:
+            if dropoff_data['name'] == dropoff:
+                return True
+        return False
+
+
 dialog_service: DialogService = DialogService()
     

core/conf.py

@@ -22,6 +22,7 @@ class Settings(BaseSettings):
 
 
     API_BASE_URL: str
+    API_BASE_URL_VATO: str
     API_BASE_URL_ACCESS_TOKEN: str
 
     # DATABASE_TYPE: Literal['mysql', 'postgresql']
@@ -99,7 +100,6 @@ class Settings(BaseSettings):
     @model_validator(mode='before')
     @classmethod
     def check_env(cls, values: Any) -> Any:
-        """生产环境下禁用 OpenAPI 文档和静态文件服务"""
         if values.get('ENVIRONMENT') == 'pro':
             values['FASTAPI_OPENAPI_URL'] = None
             values['FASTAPI_STATIC_FILES'] = False