From a13b72ec4458d4fbcf6065b957f5cb76d5b88347 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 25 Jul 2025 12:33:31 +0200 Subject: [PATCH 1/3] fix leted new score calc bug --- backend/mih_database/mihDbConnections.py | 14 +++++++------- backend/routers/mzansi_directory.py | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/mih_database/mihDbConnections.py b/backend/mih_database/mihDbConnections.py index 12526d06..2be1ea95 100644 --- a/backend/mih_database/mihDbConnections.py +++ b/backend/mih_database/mihDbConnections.py @@ -13,7 +13,7 @@ encoded_dbPass = quote_plus(dbPass) base_connect_url = f"mysql+mysqlconnector://{dbUser}:{encoded_dbPass}@{dbHost}:{dbPort}/" def dbPatientManagerConnect(): - return create_engine(base_connect_url+"patient_manager", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"patient_manager", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -22,7 +22,7 @@ def dbPatientManagerConnect(): # ) def dbAppDataConnect(): - return create_engine(base_connect_url+"app_data", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"app_data", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -31,7 +31,7 @@ def dbAppDataConnect(): # ) def dbDataAccessConnect(): - return create_engine(base_connect_url+"data_access", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"data_access", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -40,7 +40,7 @@ def dbDataAccessConnect(): # ) def dbMzansiWalletConnect(): - return create_engine(base_connect_url+"mzansi_wallet", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"mzansi_wallet", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -49,7 +49,7 @@ def dbMzansiWalletConnect(): # ) def dbMzansiDirectoryConnect(): - return create_engine(base_connect_url+"mzansi_directory", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"mzansi_directory", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -58,7 +58,7 @@ def dbMzansiDirectoryConnect(): # ) def dbMzansiCalendarConnect(): - return create_engine(base_connect_url+"mzansi_calendar", echo=True, pool_recycle=3600) + return create_engine(base_connect_url+"mzansi_calendar", echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, @@ -67,7 +67,7 @@ def dbMzansiCalendarConnect(): # ) def dbAllConnect(): - return create_engine(base_connect_url, echo=True, pool_recycle=3600) + return create_engine(base_connect_url, echo=False, pool_recycle=3600) # return mysql.connector.connect( # host="mysqldb", # user=dbUser, diff --git a/backend/routers/mzansi_directory.py b/backend/routers/mzansi_directory.py index 23fa9e9a..3ecc28ec 100644 --- a/backend/routers/mzansi_directory.py +++ b/backend/routers/mzansi_directory.py @@ -209,7 +209,10 @@ async def Delete_loyalty_card(itemRequest : BusinessRatingDeleteRequest, session dbSession.delete(rating_to_delete) dbSession.flush() # Ensure the new rating is added to the session # Calc New Rating and update business rating - newRating = ((float(itemRequest.current_rating) * businessReviewCount) - float(itemRequest.rating_score)) / (businessReviewCount - 1) + if(businessReviewCount <= 1): + newRating = "0.0" + else: + newRating = ((float(itemRequest.current_rating) * businessReviewCount) - float(itemRequest.rating_score)) / (businessReviewCount - 1) businessToUpdate = dbSession.query(Business).filter(Business.business_id == itemRequest.business_id).first() if businessToUpdate: businessToUpdate.rating = str(newRating) From 018e0e8c46d39fef1ca6cbc9861592ac8b82a2ac Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 25 Jul 2025 12:39:45 +0200 Subject: [PATCH 2/3] fix no review display bug --- Frontend/lib/mih_services/mih_mzansi_directory_services.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Frontend/lib/mih_services/mih_mzansi_directory_services.dart b/Frontend/lib/mih_services/mih_mzansi_directory_services.dart index 0a886723..710c2c3e 100644 --- a/Frontend/lib/mih_services/mih_mzansi_directory_services.dart +++ b/Frontend/lib/mih_services/mih_mzansi_directory_services.dart @@ -33,7 +33,10 @@ class MihMzansiDirectoryServices { List businessReviews = List.from( l.map((model) => BusinessReview.fromJson(model))); return businessReviews; - } else { + } else if (response.statusCode == 404){ + return []; + } + else { throw Exception('failed to fetch Business Reviews'); } } From 6751101720837ddf0e30432330256f7293693238 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 25 Jul 2025 12:40:03 +0200 Subject: [PATCH 3/3] change build to 88 --- Frontend/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index d33fb79a..abdf6bf0 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -1,7 +1,7 @@ name: mzansi_innovation_hub description: "" publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.1.13+87 +version: 1.1.13+88 environment: sdk: '>=3.5.3 <4.0.0'