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

Work on event related routes, methods, and models

Browse Source
This commit is contained in:
Scott Idem
2021-11-09 15:23:12 -05:00
parent 567223ed66
commit 093cc3913b
8 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/methods/event_methods.py
View File

@@ -73,8 +73,15 @@ def load_event_obj(
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: return False else: return False
if event_rec := sql_select(table_name='v_event', record_id=event_id): pass if inc_file_count:
else: return False log.info('Using view with file count')
if event_rec := sql_select(table_name='v_event_w_file_count', record_id=event_id): pass
else:
return False
else:
if event_rec := sql_select(table_name='v_event', record_id=event_id): pass
else:
return False
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_rec) log.debug(event_rec)
@@ -318,7 +325,7 @@ def get_event_rec_list(
archived: str = 'archived', # archived, not_archived, all archived: str = 'archived', # archived, not_archived, all
conference: bool = False, # If it is a conference then organization, person, and user are queried as participants (not the owner/organizer) conference: bool = False, # If it is a conference then organization, person, and user are queried as participants (not the owner/organizer)
) -> list|bool: ) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if account_id or organization_id or person_id or user_id: pass if account_id or organization_id or person_id or user_id: pass

12
app/methods/event_presentation_methods.py
View File

@@ -51,7 +51,7 @@ def load_event_presentation_obj(
exclude_unset: bool = True, exclude_unset: bool = True,
model_as_dict: bool = False, model_as_dict: bool = False,
) -> Event_Presentation_Base|bool: ) -> Event_Presentation_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
@@ -89,7 +89,7 @@ def load_event_presentation_obj(
# Updated 2021-11-05 # Updated 2021-11-05
if inc_event_file_list: if inc_event_file_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Need to include event file list...') log.info('Need to include event file list...')
from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
@@ -126,7 +126,7 @@ def load_event_presentation_obj(
if inc_event_person_list: pass if inc_event_person_list: pass
if inc_event_presenter_list: if inc_event_presenter_list:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
data = {} data = {}
data['event_presentation_id'] = event_presentation_id data['event_presentation_id'] = event_presentation_id
@@ -236,7 +236,7 @@ def get_event_presentation_rec_list(
review: str = 'all', # ready, not_ready, all review: str = 'all', # ready, not_ready, all
limit: int = 100, limit: int = 100,
) -> list|bool: ) -> list|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_person_id := redis_lookup_id_random(record_id_random=event_person_id, table_name='event_person'): pass if event_person_id := redis_lookup_id_random(record_id_random=event_person_id, table_name='event_person'): pass
@@ -302,7 +302,7 @@ def get_event_presentation_rec_list(
event_presentation_rec_li = event_presentation_rec_li_result event_presentation_rec_li = event_presentation_rec_li_result
else: else:
event_presentation_rec_li = [] event_presentation_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_rec_li_result) log.debug(event_presentation_rec_li_result)
log.debug(type(event_presentation_rec_li)) log.debug(type(event_presentation_rec_li))
log.debug(len(event_presentation_rec_li)) log.debug(len(event_presentation_rec_li))
@@ -332,9 +332,7 @@ def get_event_id_w_event_session_id(
LIMIT 1; LIMIT 1;
""" """
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_session_data_result := sql_select(data=data, sql=sql): if event_session_data_result := sql_select(data=data, sql=sql):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_session_data_result) log.debug(event_session_data_result)
if event_id := event_session_data_result.get('event_id', None): return event_id if event_id := event_session_data_result.get('event_id', None): return event_id
else: return False else: return False

10
app/methods/event_session_methods.py
View File

@@ -91,7 +91,7 @@ def load_event_session_obj(
if inc_event_device_list: pass if inc_event_device_list: pass
if inc_event_file_list: if inc_event_file_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Need to include event file list...') log.info('Need to include event file list...')
from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
@@ -150,7 +150,7 @@ def load_event_session_obj(
if inc_event_person_list: pass if inc_event_person_list: pass
if inc_event_presentation_list: if inc_event_presentation_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Need to include event presentation list...') log.info('Need to include event presentation list...')
data = {} data = {}
@@ -192,9 +192,7 @@ def load_event_session_obj(
ORDER BY `event_presentation`.priority DESC, `event_presentation`.sort ASC, `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC; ORDER BY `event_presentation`.priority DESC, `event_presentation`.sort ASC, `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC;
""" """
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_presentation_rec_li_result := sql_select(data=data, sql=sql, as_list=True): if event_presentation_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_rec_li_result) log.debug(event_presentation_rec_li_result)
event_presentation_obj_li = [] event_presentation_obj_li = []
for event_presentation_rec in event_presentation_rec_li_result: for event_presentation_rec in event_presentation_rec_li_result:
@@ -229,8 +227,8 @@ def load_event_session_obj(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if inc_event_presenter_cat: if inc_event_presenter_cat:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info(f'Need to get event presenter cat list for session. Event Session ID: {event_session_id}') log.info(f'Need to get event presenter cat list for session. Event Session ID: {event_session_id}')
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
data = {} data = {}
data['event_session_id'] = event_session_id data['event_session_id'] = event_session_id
@@ -281,7 +279,7 @@ def get_event_session_rec_list(
review: str = 'all', # ready, not_ready, all review: str = 'all', # ready, not_ready, all
limit: int = 100, limit: int = 100,
) -> list|bool: ) -> list|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass

2
app/models/event_file_models.py
View File

@@ -59,7 +59,7 @@ class Event_File_Base(BaseModel):
#### NOTE ***** NOTE #### NOTE ***** NOTE
internal_os: Optional[str] internal_os: Optional[str]
public_use: Optional[bool] public_use: Optional[bool] = False
public: Optional[bool] public: Optional[bool]
approve: Optional[bool] approve: Optional[bool]
#### internal_os needs to be set #### internal_os needs to be set

8
app/routers/event.py
View File

@@ -113,7 +113,7 @@ async def get_event_obj_li(
exclude_unset: bool = True, exclude_unset: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
data = {} data = {}
@@ -242,13 +242,14 @@ async def get_event_obj(
inc_product: bool = False, inc_product: bool = False,
inc_product_list: bool = False, inc_product_list: bool = False,
inc_user: bool = False, inc_user: bool = False,
inc_file_count: bool = False, # NOTE: file counts are from separate views
x_account_id: str = Header(...), x_account_id: str = Header(...),
limit: int = 500, # For now this covers any included objects or object lists limit: int = 500, # For now this covers any included objects or object lists
by_alias: Optional[bool] = True, by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
@@ -261,6 +262,7 @@ async def get_event_obj(
approved = approved, approved = approved,
hidden = hidden, hidden = hidden,
review = review, review = review,
inc_file_count = inc_file_count,
inc_address = inc_address, inc_address = inc_address,
# inc_address_location = inc_address_location, # inc_address_location = inc_address_location,
inc_contact = inc_contact, inc_contact = inc_contact,
@@ -346,7 +348,7 @@ async def get_account_obj_event_list(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass

4
app/routers/event_presentation.py
View File

@@ -140,7 +140,7 @@ async def get_event_presentation_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
@@ -202,7 +202,7 @@ async def get_event_session_event_presentation_li(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass

20
app/routers/event_session.py
View File

@@ -140,7 +140,7 @@ async def post_event_session_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
obj_type = 'event_session' obj_type = 'event_session'
@@ -168,7 +168,7 @@ async def post_event_session_obj_new_v3(
exclude_unset: bool = True, exclude_unset: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
# There should probably be a check for the event ID before calling the create function? # There should probably be a check for the event ID before calling the create function?
@@ -214,7 +214,7 @@ async def patch_event_session_obj_exist_v3(
exclude_none: Optional[bool] = True, exclude_none: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -255,7 +255,7 @@ async def patch_event_session_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
obj_type = 'event_session' obj_type = 'event_session'
@@ -296,7 +296,7 @@ async def patch_event_session_json(
exclude_none: Optional[bool] = True, exclude_none: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -370,7 +370,7 @@ async def get_event_session_obj_li(
exclude_unset: bool = True, exclude_unset: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
data = {} data = {}
@@ -495,7 +495,7 @@ async def get_event_session_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -564,7 +564,7 @@ async def get_event_event_session_obj_li(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
@@ -628,7 +628,7 @@ async def search_event_session_obj_li(
exclude_unset: bool = True, exclude_unset: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
data = {} data = {}
@@ -689,7 +689,7 @@ async def delete_event_session_obj(
x_account_id: str = Header(...), x_account_id: str = Header(...),
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
obj_type = 'event_session' obj_type = 'event_session'

7
app/routers/hosted_file.py
View File

@@ -188,6 +188,9 @@ async def upload_files_fake(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(file_info) log.debug(file_info)
original_filename = file_info.get('filename', None)
original_extension = file_info.get('extension', None)
# "saved" means that the file was or is now saved on the file server # "saved" means that the file was or is now saved on the file server
if file_info['saved']: if file_info['saved']:
# Create a new host_file object entry # Create a new host_file object entry
@@ -342,6 +345,10 @@ async def upload_files_fake(
hosted_file_dict['already_exists'] = file_info['already_exists'] hosted_file_dict['already_exists'] = file_info['already_exists']
hosted_file_dict['saved'] = file_info['saved'] hosted_file_dict['saved'] = file_info['saved']
hosted_file_dict['copy_timer'] = file_info['copy_timer'] hosted_file_dict['copy_timer'] = file_info['copy_timer']
hosted_file_dict['filename'] = file_info['filename']
hosted_file_dict['extension'] = file_info['extension']
log.debug(hosted_file_dict) log.debug(hosted_file_dict)
hosted_file_list.append(hosted_file_dict) hosted_file_list.append(hosted_file_dict)