Unknown

app/methods/event_exhibit_methods.py

@@ -127,12 +127,18 @@ def remove_event_exhibit_obj(
 @logger_reset
 def load_event_exhibit_obj(
         event_exhibit_id: int,
+
+        enabled: str = 'enabled', # enabled, disabled, all
+        approved: str = 'all', # approved, not_approved, all
+        hidden: str = 'not_hidden', # hidden, not_hidden, all
+        review: str = 'all', # ready, not_ready, all
+
         limit: int = 100,
         offset: int = 0,
+
         by_alias: bool = True,
         exclude_unset: bool = True,
         model_as_dict: bool = False,
-        enabled: str = 'enabled', # enabled, disabled, all
         inc_address: bool = False,
         inc_contact: bool = False,
         inc_event_badge: bool = False,
@@ -162,6 +168,7 @@ def load_event_exhibit_obj(
                 event_exhibit_id = event_exhibit_id,
                 limit = limit,
                 enabled = enabled,
+                hidden = hidden,
                 ):
             event_exhibit_tracking_result_list = []
             for event_exhibit_tracking_rec in event_exhibit_tracking_rec_list_result:

app/methods/event_exhibit_tracking_methods.py

@@ -211,6 +211,7 @@ def get_event_exhibit_tracking_rec_list(
         event_id: int|str = None,
         event_exhibit_id: int|str = None,
         event_person_id: int|str = None,
+        hidden: str = 'not_hidden', # hidden, not_hidden, all
         enabled: str = 'enabled', # enabled, disabled, all
         limit: int = 100,
         offset: int = 0,
@@ -247,6 +248,18 @@ def get_event_exhibit_tracking_rec_list(
         data['event_person_id'] = event_person_id
         sql_select_event_person_id = f'AND `event_exhibit_tracking`.event_person_id = :event_person_id'
 
+    sql_hidden = ''
+    if hidden in ['hidden', 'not_hidden', 'all']:
+        if hidden == 'hidden':
+            data['hide'] = True
+            sql_hidden = f'AND `event_exhibit_tracking`.hide = :hide'
+        elif hidden == 'not_hidden':
+            data['hide'] = False
+            sql_hidden = f'AND `event_exhibit_tracking`.hide = :hide'
+        elif hidden == 'all':
+            sql_hidden = ''
+
+
     sql_enabled, data['enable'] = sql_enable_part(table_name='event_exhibit_tracking', enabled=enabled) # Reasonably safe return str and bool
     sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str
 
@@ -268,6 +281,7 @@ def get_event_exhibit_tracking_rec_list(
             {sql_select_event_id}
             {sql_select_event_exhibit_id}
             {sql_select_event_person_id}
+            {sql_hidden}
             {sql_enabled}
         ORDER BY `event_exhibit_tracking`.priority DESC, `event_exhibit_tracking`.sort ASC, `event_exhibit_tracking`.created_on DESC, `event_exhibit_tracking`.updated_on DESC
         {sql_limit};

app/methods/event_methods.py

@@ -63,6 +63,7 @@ def load_event_obj(
         inc_product_list: bool = False,
         inc_user: bool = False,
         limit: int = 1000,
+        offset: int = 0,
         by_alias: bool = True,
         exclude_unset: bool = True,
         model_as_dict: bool = False,

app/models/event_person_models.py

@@ -79,6 +79,10 @@ class Event_Person_Base(BaseModel):
     event_badge_full_name: Optional[str]
     event_badge_affiliations: Optional[str]
     event_badge_email: Optional[str]
+    event_badge_city: Optional[str]
+    event_badge_state_province: Optional[str]
+    event_badge_country_alpha_2_code: Optional[str]
+    event_badge_country: Optional[str]
 
     event_person_informal_name: Optional[str]
     event_person_given_name: Optional[str]

app/routers/event_exhibit.py

@@ -104,6 +104,8 @@ async def get_event_exhibit_obj(
         inc_event_person: bool = False,
         # inc_event_person_profile: bool = False,
 
+        hidden: str = 'not_hidden', # hidden, not_hidden, all
+
         commons: Common_Route_Params = Depends(common_route_params),
         ):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -117,6 +119,8 @@ async def get_event_exhibit_obj(
     else: return mk_resp(data=None, status_code=404, response=commons.response, status_message='The Event Exhibit ID was invalid or not found.')
 
     if event_exhibit_obj_result := load_event_exhibit_obj(
+            enabled = commons.enabled,
+            hidden = hidden,
             event_exhibit_id = event_exhibit_id,
             inc_event_exhibit_tracking_list = inc_event_exhibit_tracking_list,
             inc_event_badge = inc_event_badge,