yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update APIs to include GLS lpcation

Browse Source
This commit is contained in:
yaso
2024-10-23 12:17:27 +02:00
parent 5f628f62dd
commit ff970efb65
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/routers/business.py
View File

@@ -24,6 +24,7 @@ class businessInsertRequest(BaseModel):
logo_path: str logo_path: str
contact_no: str contact_no: str
bus_email: str bus_email: str
gps_location: str
class businessUpdateRequest(BaseModel): class businessUpdateRequest(BaseModel):
business_id: str business_id: str
@@ -34,6 +35,7 @@ class businessUpdateRequest(BaseModel):
logo_path: str logo_path: str
contact_no: str contact_no: str
bus_email: str bus_email: str
gps_location: str
# Get List of all files # Get List of all files
@@ -41,7 +43,7 @@ class businessUpdateRequest(BaseModel):
async def read_business_by_business_id(business_id: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) async def read_business_by_business_id(business_id: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session())
db = database.dbConnection.dbAppDataConnect() db = database.dbConnection.dbAppDataConnect()
cursor = db.cursor() cursor = db.cursor()
query = "SELECT business.business_id, business.Name, business.type, business.registration_no, business.logo_name, business.logo_path, business.contact_no, business.bus_email, business_users.app_id " query = "SELECT business.business_id, business.Name, business.type, business.registration_no, business.logo_name, business.logo_path, business.contact_no, business.bus_email, business_users.app_id, business.gps_location "
query += "FROM business " query += "FROM business "
query += "inner join business_users " query += "inner join business_users "
query += "on business.business_id=business_users.business_id " query += "on business.business_id=business_users.business_id "
@@ -61,6 +63,7 @@ async def read_business_by_business_id(business_id: str, session: SessionContain
"contact_no": item[6], "contact_no": item[6],
"bus_email": item[7], "bus_email": item[7],
"app_id": item[8], "app_id": item[8],
"gps_location": item[9],
} }
for item in cursor.fetchall() for item in cursor.fetchall()
] ]
@@ -78,7 +81,7 @@ async def read_business_by_business_id(business_id: str, session: SessionContain
async def read_business_by_app_id(app_id: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) async def read_business_by_app_id(app_id: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session())
db = database.dbConnection.dbAppDataConnect() db = database.dbConnection.dbAppDataConnect()
cursor = db.cursor() cursor = db.cursor()
query = "SELECT business.business_id, business.Name, business.type, business.registration_no, business.logo_name, business.logo_path, business.contact_no, business.bus_email, business_users.app_id " query = "SELECT business.business_id, business.Name, business.type, business.registration_no, business.logo_name, business.logo_path, business.contact_no, business.bus_email, business_users.app_id, business.gps_location "
query += "FROM business " query += "FROM business "
query += "inner join business_users " query += "inner join business_users "
query += "on business.business_id=business_users.business_id " query += "on business.business_id=business_users.business_id "
@@ -98,6 +101,7 @@ async def read_business_by_app_id(app_id: str, session: SessionContainer = Depen
"contact_no": item[6], "contact_no": item[6],
"bus_email": item[7], "bus_email": item[7],
"app_id": item[8], "app_id": item[8],
"gps_location": item[9],
} }
for item in cursor.fetchall() for item in cursor.fetchall()
] ]
@@ -114,8 +118,8 @@ async def insert_business_details(itemRequest : businessInsertRequest, session:
db = database.dbConnection.dbAppDataConnect() db = database.dbConnection.dbAppDataConnect()
cursor = db.cursor() cursor = db.cursor()
query = "insert into business " query = "insert into business "
query += "(business_id, Name, type, registration_no, logo_name, logo_path, contact_no, bus_email) " query += "(business_id, Name, type, registration_no, logo_name, logo_path, contact_no, bus_email, gps_location) "
query += "values (%s, %s, %s, %s, %s, %s, %s, %s)" query += "values (%s, %s, %s, %s, %s, %s, %s, %s, %s)"
uuidString = str(uuid.uuid1()) uuidString = str(uuid.uuid1())
userData = (uuidString, userData = (uuidString,
itemRequest.Name, itemRequest.Name,
@@ -124,7 +128,8 @@ async def insert_business_details(itemRequest : businessInsertRequest, session:
itemRequest.logo_name, itemRequest.logo_name,
itemRequest.logo_path, itemRequest.logo_path,
itemRequest.contact_no, itemRequest.contact_no,
itemRequest.bus_email,) itemRequest.bus_email,
itemRequest.gps_location,)
try: try:
cursor.execute(query, userData) cursor.execute(query, userData)
except Exception as error: except Exception as error:
@@ -138,9 +143,10 @@ async def insert_business_details(itemRequest : businessInsertRequest, session:
@router.put("/business/update/", tags=["MIH Business"]) @router.put("/business/update/", tags=["MIH Business"])
async def Update_Business_details(itemRequest : businessUpdateRequest, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) async def Update_Business_details(itemRequest : businessUpdateRequest, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session())
db = database.dbConnection.dbAppDataConnect() db = database.dbConnection.dbAppDataConnect()
# print(itemRequest.gps_location)
cursor = db.cursor() cursor = db.cursor()
query = "update business " query = "update business "
query += "set Name=%s, type=%s, registration_no=%s, logo_name=%s, logo_path=%s, contact_no=%s, bus_email=%s " query += "set Name=%s, type=%s, registration_no=%s, logo_name=%s, logo_path=%s, contact_no=%s, bus_email=%s, gps_location=%s "
query += "where business_id=%s" query += "where business_id=%s"
userData = (itemRequest.Name, userData = (itemRequest.Name,
itemRequest.type, itemRequest.type,
@@ -149,7 +155,9 @@ async def Update_Business_details(itemRequest : businessUpdateRequest, session:
itemRequest.logo_path, itemRequest.logo_path,
itemRequest.contact_no, itemRequest.contact_no,
itemRequest.bus_email, itemRequest.bus_email,
itemRequest.business_id) itemRequest.gps_location,
itemRequest.business_id,
)
try: try:
cursor.execute(query, userData) cursor.execute(query, userData)
except Exception as error: except Exception as error: