fix

app/dialogflow/api/v1/dialogflow.py

@@ -7,7 +7,7 @@ from app.dialogflow.services.dialog_service import dialog_service
 from utils.format_data_dialog import format_time, get_weekday_name
 
 from common.external.external_api import api
-from app.dialogflow.services.origin_codes import origin_codes
+from app.dialogflow.services.origin_codes import origin_codes, get_origin_id_and_code
 from common.response.respone_dialogflow import DialogFlowResponseAPI
 router = APIRouter()
 
@@ -109,15 +109,15 @@ async def route(request: Request):
     
     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_id, origin_code = 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)
+        origin_id, origin_code = get_origin_id_and_code(raw_departure_city)
     if dest_office:
-        dest_code, dest_id = await dialog_service.find_id_and_code_provine_by_name_office(dest_office)
+        dest_id, dest_code  = 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)
+        dest_id, dest_code = get_origin_id_and_code(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 = {
@@ -196,15 +196,15 @@ async def price(request: Request):
     
     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_id, origin_code = 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)
+        origin_id, origin_code = get_origin_id_and_code(raw_departure_city)
     if dest_office:
-        dest_code, dest_id = await dialog_service.find_id_and_code_provine_by_name_office(dest_office)
+        dest_id, dest_code  = 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)
+        dest_id, dest_code = get_origin_id_and_code(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 = {
@@ -278,12 +278,12 @@ async def booking_trip(request: Request) -> Response:
         origin_id, origin_code = 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)
+        origin_id, origin_code = get_origin_id_and_code(raw_departure_city)
     if dest_office:
         dest_id, dest_code  = 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)
+        dest_id, dest_code = get_origin_id_and_code(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, route_ids, ticket_count)

app/dialogflow/services/dialog_service.py

@@ -88,7 +88,6 @@ class DialogService:
                 if response.get("data"):
                     if response["data"].get("total") > 0:
                         data = response["data"]["items"]
-            print(data)
             return data
         except Exception as e:
             print(e)

app/dialogflow/services/origin_codes.py

@@ -1,4 +1,13 @@
 import json
 
-with open("static/files/code_province.json", "r", encoding="utf-8") as file:
-    origin_codes = json.load(file)
+with open("static/files/origin-codes.json", "r", encoding="utf-8") as file:
+    origin_codes = json.load(file)
+
+def get_origin_id_and_code(origin: str):
+    for x in origin_codes:
+        if x and x.get("name"):
+            if origin == x["name"]:
+                    id = x["id"],
+                    code = x["code"]
+                    return id, code
+    return None, None

static/files/origin-codes.json

@@ -278,6 +278,15 @@
         "code": "TPHCM",
         "id": 31
     },
+    {
+        "parentId": 11927,
+        "type": "1",
+        "name": "Thành phố Hồ Chí Minh",
+        "tags": "TP. Ho Chi Minh",
+        "level": 2,
+        "code": "TPHCM",
+        "id": 31
+    },
     {
         "parentId": 11924,
         "type": "1",
@@ -764,6 +773,15 @@
         "code": "DALAT",
         "id": 474
     },
+    {
+        "parentId": 38,
+        "type": "2",
+        "name": "Thành phố Đà Lạt",
+        "tags": "Da Lat",
+        "level": 3,
+        "code": "DALAT",
+        "id": 474
+    },
     {
         "parentId": 38,
         "type": "2",