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

Work on event launcher and related

Browse Source
This commit is contained in:
Scott Idem
2021-10-22 04:07:41 -04:00
parent bde6ec1a2b
commit 661e9ca417
10 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/methods/event_file_methods.py
View File

@@ -37,7 +37,6 @@ def create_event_file_obj(event_file_obj_new:Event_File_Base):
# ### BEGIN ### API Event File Methods ### load_event_file_obj() ###
def load_event_file_obj(
event_file_id: int|str,
limit: int = 100,
model_as_dict: bool = True,
by_alias: bool = True,
exclude_unset: bool = False,
@@ -91,7 +90,6 @@ def load_event_file_obj(
# model_as_dict = True
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if model_as_dict:
log.debug(event_file_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)) # pylint: disable=no-member)
return event_file_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
@@ -262,7 +260,6 @@ def load_event_file_obj_list(
event_file_id = event_file_rec.get('event_file_id', None)
if event_file_result := load_event_file_obj(
event_file_id = event_file_id,
limit = limit,
model_as_dict = True, # NOTE: This is overriding the model_as_dict param!
enabled = enabled,
inc_hosted_file = inc_hosted_file,

1
app/methods/event_location_methods.py
View File

@@ -84,7 +84,6 @@ def load_event_location_obj(
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
limit = limit,
# inc_hosted_file = inc_hosted_file,
# model_as_dict = True,
# by_alias = by_alias,

1
app/methods/event_methods.py
View File

@@ -195,7 +195,6 @@ def load_event_obj(
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
limit = limit,
# inc_hosted_file = inc_hosted_file,
# model_as_dict = True,
# by_alias = by_alias,

2
app/methods/event_presentation_methods.py
View File

@@ -256,7 +256,7 @@ def get_event_presentation_rec_list(
{sql_where_event_session_id}
{sql_hidden}
{sql_enabled}
ORDER BY `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC
ORDER BY `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC
{sql_limit};
"""

1
app/methods/event_presenter_methods.py
View File

@@ -105,7 +105,6 @@ def load_event_presenter_obj(
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
limit = limit,
# inc_hosted_file = inc_hosted_file,
# by_alias = by_alias,
# exclude_unset = exclude_unset,

3
app/methods/event_session_methods.py
View File

@@ -111,7 +111,6 @@ def load_event_session_obj(
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
limit = limit,
inc_hosted_file = inc_hosted_file,
# model_as_dict = True,
# by_alias = by_alias,
@@ -353,7 +352,7 @@ def get_event_session_rec_list(
{sql_approved}
{sql_hidden}
{sql_enabled}
ORDER BY `event_session`.created_on DESC, `event_session`.updated_on DESC
ORDER BY `event_session`.start_datetime ASC, `event_session`.sort ASC, `event_session`.name ASC, `event_session`.created_on DESC, `event_session`.updated_on DESC
{sql_limit};
"""