diff --git a/app/routers/event_badge.py b/app/routers/event_badge.py index bd5d305..b57d850 100644 --- a/app/routers/event_badge.py +++ b/app/routers/event_badge.py @@ -154,9 +154,11 @@ async def search_event_badge_obj_li( family_name: str = Query('', max_length=25), email: str = Query('', max_length=50), + hidden: str = 'not_hidden', # hidden, not_hidden, all + commons: Common_Route_Params = Depends(common_route_params), ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # account_id = commons.x_account_id @@ -218,6 +220,16 @@ async def search_event_badge_obj_li( log.debug(data) + if hidden in ['hidden', 'not_hidden', 'all']: + if hidden == 'hidden': + data['hide'] = True + sql_hidden = f'AND `event_presentation`.hide = :hide' + elif hidden == 'not_hidden': + data['hide'] = False + sql_hidden = f'AND `event_presentation`.hide = :hide' + elif hidden == 'all': + sql_hidden = '' + sql_enabled, data['enable'] = sql_enable_part(table_name='event_badge', enabled=commons.enabled) # Reasonably safe return str and bool sql_limit = sql_limit_offset_part(limit=commons.limit, offset=commons.offset) # Reasonably safe return str @@ -227,6 +239,7 @@ async def search_event_badge_obj_li( FROM `v_event_badge` AS event_badge WHERE event_badge.event_id = :event_id AND event_badge.event_badge_id_random LIKE :event_badge_id_random + {sql_hidden} {sql_enabled} ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC {sql_limit}; @@ -237,6 +250,7 @@ async def search_event_badge_obj_li( FROM `v_event_badge` AS event_badge WHERE event_badge.event_id = :event_id AND event_badge.event_person_id_random LIKE :event_person_id_random + {sql_hidden} {sql_enabled} ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC {sql_limit}; @@ -247,6 +261,7 @@ async def search_event_badge_obj_li( FROM `v_event_badge` AS event_badge WHERE event_badge.event_id = :event_id AND event_badge.external_id LIKE :external_id + {sql_hidden} {sql_enabled} ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC {sql_limit}; @@ -284,6 +299,7 @@ async def search_event_badge_obj_li( WHERE event_badge.event_id = :event_id {sql_badge_type_code} AND event_badge.query_str LIKE :query_str + {sql_hidden} {sql_enabled} ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC {sql_limit}; @@ -309,6 +325,7 @@ async def search_event_badge_obj_li( AND (event_badge.given_name LIKE :given_name AND event_badge.family_name LIKE :family_name) AND event_badge.email LIKE :email + {sql_hidden} {sql_enabled} ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC {sql_limit};