General code clean up. More work on event, event exhibits, and event tracking related
This commit is contained in:
@@ -4,7 +4,7 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import get_account_id_w_for_type_id, redis_lookup_id_random, sql_delete, sql_insert, sql_select, sql_update
|
||||
from app.db_sql import get_account_id_w_for_type_id, redis_lookup_id_random, sql_enable_part, sql_delete, sql_insert, sql_limit_offset_part, sql_select, sql_update
|
||||
from app.lib_general import log, logging, logger_reset
|
||||
|
||||
from app.models.common_field_schema import default_num_bytes
|
||||
@@ -15,7 +15,7 @@ from app.models.event_exhibit_tracking_models import Event_Exhibit_Tracking_Base
|
||||
# Updated 2022-02-15
|
||||
@logger_reset
|
||||
def create_event_exhibit_tracking_obj(
|
||||
event_exhibit_id: int|str,
|
||||
event_exhibit_id: int,
|
||||
event_exhibit_tracking_dict_obj: Event_Exhibit_Tracking_Base,
|
||||
event_badge_id: int = None,
|
||||
event_person_id: int = None,
|
||||
@@ -131,7 +131,7 @@ def remove_event_exhibit_tracking_obj(
|
||||
# Updated 2022-02-14
|
||||
@logger_reset
|
||||
def load_event_exhibit_tracking_obj(
|
||||
event_exhibit_tracking_id: int|str,
|
||||
event_exhibit_tracking_id: int,
|
||||
limit: int = 100,
|
||||
offset: int = 0,
|
||||
by_alias: bool = True,
|
||||
@@ -147,8 +147,8 @@ def load_event_exhibit_tracking_obj(
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_exhibit_tracking_id := redis_lookup_id_random(record_id_random=event_exhibit_tracking_id, table_name='event_exhibit_tracking'): pass
|
||||
else: return False
|
||||
# if event_exhibit_tracking_id := redis_lookup_id_random(record_id_random=event_exhibit_tracking_id, table_name='event_exhibit_tracking'): pass
|
||||
# else: return False
|
||||
|
||||
if event_exhibit_tracking_rec := sql_select(table_name='v_event_exhibit_tracking', record_id=event_exhibit_tracking_id): pass
|
||||
else: return False
|
||||
@@ -175,7 +175,7 @@ def load_event_exhibit_tracking_obj(
|
||||
else: event_exhibit_tracking_obj.event_exhibit = None
|
||||
|
||||
if inc_event_person:
|
||||
log.info('Need to include Event Exhibit data...')
|
||||
log.info('Need to include Event Person data...')
|
||||
event_person_id = event_exhibit_tracking_rec.get('event_person_id', None)
|
||||
log.debug(event_person_id)
|
||||
from app.methods.event_person_methods import load_event_person_obj
|
||||
@@ -255,7 +255,7 @@ def get_event_exhibit_tracking_rec_list(
|
||||
|
||||
sql = f"""
|
||||
SELECT `event_exhibit_tracking`.id AS 'event_exhibit_tracking_id', `event_exhibit_tracking`.id_random AS 'event_exhibit_tracking_id_random'
|
||||
FROM `event_exhibit_tracking` AS `event_exhibit_tracking`
|
||||
FROM `v_event_exhibit_tracking` AS `event_exhibit_tracking`
|
||||
WHERE
|
||||
{sql_select_event_id}
|
||||
{sql_select_event_exhibit_id}
|
||||
@@ -265,7 +265,7 @@ def get_event_exhibit_tracking_rec_list(
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if event_exhibit_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
if event_exhibit_rec_li_result := sql_select(data=data, sql=sql, as_list=True, log_lvl=logging.WARNING):
|
||||
log.info('Got a list result')
|
||||
event_exhibit_rec_li = event_exhibit_rec_li_result
|
||||
else: # [] or False
|
||||
|
||||
Reference in New Issue
Block a user