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

add business name

Browse Source
This commit is contained in:
Yasien Mac Mini
2025-07-30 10:52:17 +02:00
parent edccc9a2a4
commit 9dfeaa5bed
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/routers/mzansi_directory.py
View File

@@ -43,6 +43,7 @@ class BusinessRatingUpdateRequest(BaseModel):
class BookmarkedBusinessInsertRequest(BaseModel): class BookmarkedBusinessInsertRequest(BaseModel):
app_id: str app_id: str
business_id: str business_id: str
business_name: str
class BookmarkedBusinessDeleteRequest(BaseModel): class BookmarkedBusinessDeleteRequest(BaseModel):
idbookmarked_businesses: int idbookmarked_businesses: int
@@ -317,7 +318,8 @@ async def read_all_ratings_by_business_id(app_id: str,business_id: str, session:
dbEngine = mih_database.mihDbConnections.dbAllConnect() dbEngine = mih_database.mihDbConnections.dbAllConnect()
dbSession = Session(dbEngine) dbSession = Session(dbEngine)
try: try:
queryResults = dbSession.query(BookmarkedBusiness).\ queryResults = dbSession.query(BookmarkedBusiness, Business).\
join(Business, BookmarkedBusiness.business_id == Business.business_id).\
filter( filter(
BookmarkedBusiness.business_id == business_id, BookmarkedBusiness.business_id == business_id,
BookmarkedBusiness.app_id == app_id, BookmarkedBusiness.app_id == app_id,
@@ -325,11 +327,12 @@ async def read_all_ratings_by_business_id(app_id: str,business_id: str, session:
desc(BookmarkedBusiness.created_date) desc(BookmarkedBusiness.created_date)
).first() ).first()
if queryResults: if queryResults:
bookmark_obj = queryResults bookmark_obj, bus_obj = queryResults
return { return {
"idbookmarked_businesses": bookmark_obj.idbookmarked_businesses, "idbookmarked_businesses": bookmark_obj.idbookmarked_businesses,
"app_id": bookmark_obj.app_id, "app_id": bookmark_obj.app_id,
"business_id": bookmark_obj.business_id, "business_id": bookmark_obj.business_id,
"business_name": bus_obj.Name,
"created_date": bookmark_obj.created_date, "created_date": bookmark_obj.created_date,
} }
else: else:
@@ -357,18 +360,20 @@ async def read_all_ratings_by_business_id(app_id: str, session: SessionContainer
dbEngine = mih_database.mihDbConnections.dbAllConnect() dbEngine = mih_database.mihDbConnections.dbAllConnect()
dbSession = Session(dbEngine) dbSession = Session(dbEngine)
try: try:
queryResults = dbSession.query(BookmarkedBusiness).\ queryResults = dbSession.query(BookmarkedBusiness, Business).\
join(Business, BookmarkedBusiness.business_id == Business.business_id).\
filter( filter(
BookmarkedBusiness.app_id == app_id, BookmarkedBusiness.app_id == app_id,
).order_by( ).order_by(
desc(BookmarkedBusiness.created_date) desc(BookmarkedBusiness.created_date)
).all() ).all()
response_data = [] response_data = []
for rating_obj in queryResults: for rating_obj, bus_obj in queryResults:
response_data.append({ response_data.append({
"idbookmarked_businesses": rating_obj.idbookmarked_businesses, "idbookmarked_businesses": rating_obj.idbookmarked_businesses,
"app_id": rating_obj.app_id, "app_id": rating_obj.app_id,
"business_id": rating_obj.business_id, "business_id": rating_obj.business_id,
"business_name": bus_obj.Name,
"created_date": rating_obj.created_date, "created_date": rating_obj.created_date,
}) })
if len(response_data) > 0: if len(response_data) > 0: