From 2fef4a6ce15d34ddbd5fd825b429dab41d29a68c Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Tue, 20 Aug 2024 11:29:55 +0200 Subject: [PATCH] update object to include business email --- backend/routers/business.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/backend/routers/business.py b/backend/routers/business.py index cc004fb2..0c6e4caf 100644 --- a/backend/routers/business.py +++ b/backend/routers/business.py @@ -23,6 +23,7 @@ class businessInsertRequest(BaseModel): logo_name: str logo_path: str contact_no: str + bus_email: str class businessUpdateRequest(BaseModel): business_id: str @@ -32,6 +33,7 @@ class businessUpdateRequest(BaseModel): logo_name: str logo_path: str contact_no: str + bus_email: str # Get List of all files @@ -39,7 +41,7 @@ class businessUpdateRequest(BaseModel): async def read_business_by_business_id(business_id: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session()) db = database.dbConnection.dbAppDataConnect() 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_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 " query += "FROM business " query += "inner join business_users " query += "on business.business_id=business_users.business_id " @@ -57,7 +59,8 @@ async def read_business_by_business_id(business_id: str, session: SessionContain "logo_name": item[4], "logo_path": item[5], "contact_no": item[6], - "app_id": item[7], + "bus_email": item[7], + "app_id": item[8], } for item in cursor.fetchall() ] @@ -75,7 +78,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()) db = database.dbConnection.dbAppDataConnect() 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_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 " query += "FROM business " query += "inner join business_users " query += "on business.business_id=business_users.business_id " @@ -93,7 +96,8 @@ async def read_business_by_app_id(app_id: str, session: SessionContainer = Depen "logo_name": item[4], "logo_path": item[5], "contact_no": item[6], - "app_id": item[7], + "bus_email": item[7], + "app_id": item[8], } for item in cursor.fetchall() ] @@ -110,8 +114,8 @@ async def insert_business_details(itemRequest : businessInsertRequest, session: db = database.dbConnection.dbAppDataConnect() cursor = db.cursor() query = "insert into business " - query += "(business_id, Name, type, registration_no, logo_name, logo_path, contact_no) " - query += "values (%s, %s, %s, %s, %s, %s, %s)" + query += "(business_id, Name, type, registration_no, logo_name, logo_path, contact_no, bus_email) " + query += "values (%s, %s, %s, %s, %s, %s, %s, %s)" uuidString = str(uuid.uuid1()) userData = (uuidString, itemRequest.Name, @@ -119,7 +123,8 @@ async def insert_business_details(itemRequest : businessInsertRequest, session: itemRequest.registration_no, itemRequest.logo_name, itemRequest.logo_path, - itemRequest.contact_no) + itemRequest.contact_no, + itemRequest.bus_email,) try: cursor.execute(query, userData) except Exception as error: @@ -135,7 +140,7 @@ async def Update_Business_details(itemRequest : businessUpdateRequest, session: db = database.dbConnection.dbAppDataConnect() cursor = db.cursor() query = "update business " - query += "set Name=%s, type=%s, registration_no=%s, logo_name=%s, logo_path=%s, contact_no=%s " + query += "set Name=%s, type=%s, registration_no=%s, logo_name=%s, logo_path=%s, contact_no=%s, bus_email=%s " query += "where business_id=%s" userData = (itemRequest.Name, itemRequest.type, @@ -143,6 +148,7 @@ async def Update_Business_details(itemRequest : businessUpdateRequest, session: itemRequest.logo_name, itemRequest.logo_path, itemRequest.contact_no, + itemRequest.bus_email, itemRequest.business_id) try: cursor.execute(query, userData)