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

Work on event session, presentation, and presenter

Browse Source
This commit is contained in:
Scott Idem
2022-09-21 18:46:19 -04:00
parent 7fe007a098
commit ed7e06b5b2
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/db_sql.py
View File

@@ -382,7 +382,7 @@ def sql_insert_or_update(
table_name: str|None = None, table_name: str|None = None,
rm_id_random: bool = False, rm_id_random: bool = False,
id_random_length: int|None = None, id_random_length: int|None = None,
log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log_lvl: int = logging.DEBUG, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
): ):
log.setLevel(log_lvl) log.setLevel(log_lvl)

4
app/methods/event_file_methods.py
View File

@@ -4,7 +4,7 @@ from fastapi import File, UploadFile
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from app.db_sql import get_id_random, redis_lookup_id_random, sql_delete, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update from app.db_sql import get_id_random, redis_lookup_id_random, sql_delete, sql_enable_part, sql_insert, sql_insert_or_update, sql_limit_offset_part, sql_select, sql_update
# from app.lib_general import log, logging, logger_reset # from app.lib_general import log, logging, logger_reset
from app.log import log, logging, logger_reset from app.log import log, logging, logger_reset
@@ -27,7 +27,7 @@ def create_event_file_obj(event_file_obj_new: Event_File_Base):
log.debug(event_file_obj_data) log.debug(event_file_obj_data)
if event_file_obj_in_result := sql_insert(data=event_file_obj_data, table_name='event_file', rm_id_random=True): pass if event_file_obj_in_result := sql_insert_or_update(data=event_file_obj_data, table_name='event_file', rm_id_random=True): pass
else: else:
return False return False

2
app/methods/hosted_file_methods.py
View File

@@ -414,7 +414,7 @@ def handle_delete_hosted_file(
): ):
log.info('The hosted file link record was deleted.') log.info('The hosted file link record was deleted.')
elif hosted_file_link_result is None: elif hosted_file_link_result is None:
log.warning('The hosted file link record was not found and may have already been deleted. Odd, but this can happen.') log.warning('The hosted file link record was not found and may have already been deleted. Odd, but this can happen. event_file has a trigger to delete hosted_file_link when being deleted.')
# return None # return None
else: else:
log.error('Something went wrong while trying to delete the hosted file link record.') log.error('Something went wrong while trying to delete the hosted file link record.')

2
app/routers/event_file.py
View File

@@ -60,7 +60,7 @@ async def create_from_hosted_file(
log.debug(locals()) log.debug(locals())
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
time.sleep(2.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # time.sleep(2.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
if load_hosted_file_obj_result := load_hosted_file_obj( if load_hosted_file_obj_result := load_hosted_file_obj(

25
app/routers/hosted_file.py
View File

@@ -208,7 +208,7 @@ async def upload_files(
log.debug(locals()) log.debug(locals())
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
time.sleep(2.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # time.sleep(2.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
account_id_random = account_id # This is for the account random str ID account_id_random = account_id # This is for the account random str ID
@@ -346,17 +346,20 @@ async def upload_files(
hosted_file_list.append(hosted_file_dict) hosted_file_list.append(hosted_file_dict)
# NOTE: Currently sql_insert does not handle all successful inserts correctly. If there is not an autonum ID then it will return 0 as the ID. # NOTE: Currently sql_insert does not handle all successful inserts correctly. If there is not an autonum ID then it will return 0 as the ID.
if create_hosted_file_link( if link_to_type in ['event', 'event_location', 'event_session', 'event_presentation', 'event_presenter', 'event_badge', 'event_exhibit', 'event_person']:
account_id = account_id, log.info('File is for event module. Trigger will create the hosted_file_link record.')
hosted_file_id = hosted_file_id,
link_to_type = link_to_type,
link_to_id = link_to_id,
): pass # This if statement should be improved
else: else:
# This if statement should be improved if create_hosted_file_link(
log.debug('Because the hosted_file_link table does not have a primary autonum this check is incorrect even when successful.') account_id = account_id,
log.debug('Something may have gone wrong while trying to create the hosted_file_link record.') hosted_file_id = hosted_file_id,
log.debug('The hosted_file_link was probably created fine though.') link_to_type = link_to_type,
link_to_id = link_to_id,
): pass # This if statement should be improved
else:
# This if statement should be improved
log.debug('Because the hosted_file_link table does not have a primary autonum this check is incorrect even when successful.')
log.debug('Something may have gone wrong while trying to create the hosted_file_link record.')
log.debug('The hosted_file_link was probably created fine though.')
log.debug(hosted_file_list) log.debug(hosted_file_list)
return mk_resp(data=hosted_file_list, response=response) return mk_resp(data=hosted_file_list, response=response)