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, presentation, and presenter.

Browse Source
This commit is contained in:
Scott Idem
2021-09-28 18:32:19 -04:00
parent e231090168
commit b2c70c0c87
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/methods/event_presentation_methods.py
View File

@@ -97,6 +97,16 @@ def load_event_presentation_obj(
data = {}
data['event_presentation_id'] = event_presentation_id
if hidden in ['hidden', 'not_hidden', 'all']:
if hidden == 'hidden':
data['hidden'] = True
sql_hidden = f'AND `event_presenter`.hidden = :hidden'
elif hidden == 'not_hidden':
data['hidden'] = False
sql_hidden = f'AND `event_presenter`.hidden = :hidden'
elif hidden == 'all':
sql_hidden = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
@@ -118,7 +128,8 @@ def load_event_presentation_obj(
SELECT `event_presenter`.id AS 'event_presenter_id', `event_presenter`.id_random AS 'event_presenter_id_random'
FROM `event_presenter` AS `event_presenter`
WHERE `event_presenter`.event_presentation_id = :event_presentation_id
{sql_enabled}
{sql_hidden}
{sql_enabled}
ORDER BY `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC;
"""

13
app/methods/event_session_methods.py
View File

@@ -157,6 +157,16 @@ def load_event_session_obj(
data = {}
data['event_session_id'] = event_session_id
if hidden in ['hidden', 'not_hidden', 'all']:
if hidden == 'hidden':
data['hidden'] = True
sql_hidden = f'AND `event_presentation`.hidden = :hidden'
elif hidden == 'not_hidden':
data['hidden'] = False
sql_hidden = f'AND `event_presentation`.hidden = :hidden'
elif hidden == 'all':
sql_hidden = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
@@ -178,7 +188,8 @@ def load_event_session_obj(
SELECT `event_presentation`.id AS 'event_presentation_id', `event_presentation`.id_random AS 'event_presentation_id_random'
FROM `event_presentation` AS `event_presentation`
WHERE `event_presentation`.event_session_id = :event_session_id
{sql_enabled}
{sql_hidden}
{sql_enabled}
ORDER BY `event_presentation`.priority DESC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC;
"""

8
app/routers/event_presentation.py
View File

@@ -131,6 +131,10 @@ async def get_event_presentation_obj(
# inc_event_session: bool = False, # NOTE: Placehold for future?
inc_person: bool = False,
inc_user: bool = False,
review: str = 'ready', # ready, not_ready, all
approved: str = 'approved', # approved, not_approved, all
hidden: str = 'not_hidden', # hidden, not_hidden, all
inc_file_count: bool = False, # NOTE: file counts are from separate views
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
@@ -146,6 +150,10 @@ async def get_event_presentation_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,
limit = limit,
inc_address = inc_address,
inc_contact = inc_contact,