From 0e4230c4a4326ba0de6d10aaa0e6162f7440c45a Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 17 Jul 2025 14:49:27 +0200 Subject: [PATCH] update search criteria --- backend/routers/business.py | 5 +++-- backend/routers/users.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/routers/business.py b/backend/routers/business.py index 232c523d..7ea28092 100644 --- a/backend/routers/business.py +++ b/backend/routers/business.py @@ -72,9 +72,10 @@ async def read_all_businesses(search: str, session: SessionContainer = Depends(v query += "practice_no, vat_no, " query += "website, rating, mission_vision " query += "FROM business " - query += "WHERE LOWER(business.Name) LIKE %s OR LOWER(business.type) LIKE %s" + query += "WHERE LOWER(business.Name) LIKE %s OR LOWER(business.type) LIKE %s " + query += "OR LOWER(business.bus_email) LIKE %s OR LOWER(business.mission_vision) LIKE %s" search_term = f"%{search.lower()}%" # Add wildcards and lowercase - cursor.execute(query, (search_term, search_term)) + cursor.execute(query, (search_term, search_term, search_term, search_term)) items = [ { "business_id": item[0], diff --git a/backend/routers/users.py b/backend/routers/users.py index b4938efb..9d9a44c0 100644 --- a/backend/routers/users.py +++ b/backend/routers/users.py @@ -74,10 +74,12 @@ async def read_all_users(search: str, session: SessionContainer = Depends(verify cursor = db.cursor() query = "" query += "SELECT * FROM users " - query += "WHERE (LOWER(email) LIKE %s OR LOWER(username) LIKE %s) " + query += "WHERE (LOWER(email) LIKE %s OR LOWER(username) LIKE %s " + query += "OR LOWER(fname) LIKE %s OR LOWER(lname) LIKE %s " + query += "OR LOWER(purpose) LIKE %s) " query += "AND username != ''" search_term = f"%{search.lower()}%" # Add wildcards and lowercase - cursor.execute(query, (search_term, search_term)) + cursor.execute(query, (search_term, search_term,search_term, search_term, search_term)) items = [ { "idUser": item[0],