Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code clean up. Work on event session and file counts for event models

Browse Source
This commit is contained in:
Scott Idem
2021-09-28 18:06:35 -04:00
parent fb7efa9930
commit e231090168
10 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/methods/event_presentation_methods.py
View File

@@ -23,6 +23,8 @@ from app.models.event_presentation_models import Event_Presentation_Base
def load_event_presentation_obj(
event_presentation_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
hidden: str = 'not_hidden', # hidden, not_hidden, all
inc_file_count: bool = False, # NOTE: file counts are from separate views
limit: int = 1000,
by_alias: bool = True,
exclude_unset: bool = True,
@@ -54,8 +56,13 @@ def load_event_presentation_obj(
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
else: return False
if event_presentation_rec := sql_select(table_name='v_event_presentation', record_id=event_presentation_id): pass
else: return False
if inc_file_count:
log.info('Using view with file count')
if event_presentation_rec := sql_select(table_name='v_event_presentation_w_file_count', record_id=event_presentation_id): pass
else: return False
else:
if event_presentation_rec := sql_select(table_name='v_event_presentation', record_id=event_presentation_id): pass
else: return False
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_rec)
@@ -125,6 +132,10 @@ def load_event_presentation_obj(
if event_presenter_obj := load_event_presenter_obj(
event_presenter_id = event_presenter_id,
enabled = enabled,
# review = review,
# approved = approved,
hidden = hidden,
inc_file_count = inc_file_count,
inc_address = inc_address,
inc_contact = inc_contact,
inc_event_abstract_list = inc_event_abstract_list,

11
app/methods/event_presenter_methods.py
View File

@@ -19,6 +19,8 @@ from app.models.event_presenter_models import Event_Presenter_Base
def load_event_presenter_obj(
event_presenter_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
hidden: str = 'not_hidden', # hidden, not_hidden, all
inc_file_count: bool = False, # NOTE: file counts are from separate views
limit: int = 1000,
by_alias: bool = True,
exclude_unset: bool = True,
@@ -48,8 +50,13 @@ def load_event_presenter_obj(
if event_presenter_id := redis_lookup_id_random(record_id_random=event_presenter_id, table_name='event_presenter'): pass
else: return False
if event_presenter_rec := sql_select(table_name='v_event_presenter', record_id=event_presenter_id): pass
else: return False
if inc_file_count:
log.info('Using view with file count')
if event_presenter_rec := sql_select(table_name='v_event_presenter_w_file_count', record_id=event_presenter_id): pass
else: return False
else:
if event_presenter_rec := sql_select(table_name='v_event_presenter', record_id=event_presenter_id): pass
else: return False
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_rec)

28
app/methods/event_session_methods.py
View File

@@ -27,6 +27,8 @@ def load_event_session_obj(
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
hidden: str = 'not_hidden', # hidden, not_hidden, all
inc_file_count: bool = False, # NOTE: file counts are from separate views
event_file_file_purpose_id: int = None,
event_file_file_purpose: str = None,
event_file_priority: bool = None,
@@ -57,9 +59,15 @@ def load_event_session_obj(
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
else: return False
if event_session_rec := sql_select(table_name='v_event_session', record_id=event_session_id): pass
if inc_file_count:
log.info('Using view with file count')
if event_session_rec := sql_select(table_name='v_event_session_w_file_count', record_id=event_session_id): pass
else:
return False
else:
return False
if event_session_rec := sql_select(table_name='v_event_session', record_id=event_session_id): pass
else:
return False
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_session_rec)
@@ -184,6 +192,10 @@ def load_event_session_obj(
if event_presentation_obj := load_event_presentation_obj(
event_presentation_id = event_presentation_id,
enabled = enabled,
# review = review,
# approved = approved,
hidden = hidden,
inc_file_count = inc_file_count,
inc_address = inc_address,
inc_contact = inc_contact,
inc_event_abstract_list = inc_event_abstract_list,
@@ -250,6 +262,7 @@ def get_event_session_rec_list(
event_id: str,
review: str = 'ready', # ready, not_ready, all
approved: str = 'approved', # approved, not_approved, all
hidden: str = 'hidden', # hidden, not_hidden, all
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 100,
) -> list|bool:
@@ -284,6 +297,16 @@ def get_event_session_rec_list(
elif approved == 'all':
sql_approved = ''
if hidden in ['hidden', 'not_hidden', 'all']:
if hidden == 'hidden':
data['hidden'] = True
sql_hidden = f'AND `event_session`.hidden = :hidden'
elif hidden == 'not_hidden':
data['hidden'] = False
sql_hidden = f'AND `event_session`.hidden = :hidden'
elif hidden == 'all':
sql_hidden = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
@@ -307,6 +330,7 @@ def get_event_session_rec_list(
{sql_where_event_id}
{sql_review}
{sql_approved}
{sql_hidden}
{sql_enabled}
ORDER BY `event_session`.created_on DESC, `event_session`.updated_on DESC
{sql_limit};