From ed7e06b5b220d040e8181e8809363b8e6c115d34 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 21 Sep 2022 18:46:19 -0400 Subject: [PATCH] Work on event session, presentation, and presenter --- app/db_sql.py | 2 +- app/methods/event_file_methods.py | 4 ++-- app/methods/hosted_file_methods.py | 2 +- app/routers/event_file.py | 2 +- app/routers/hosted_file.py | 25 ++++++++++++++----------- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/db_sql.py b/app/db_sql.py index d59a627..a154f5a 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -382,7 +382,7 @@ def sql_insert_or_update( table_name: str|None = None, rm_id_random: bool = False, 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) diff --git a/app/methods/event_file_methods.py b/app/methods/event_file_methods.py index ccc8ffd..e3f082f 100644 --- a/app/methods/event_file_methods.py +++ b/app/methods/event_file_methods.py @@ -4,7 +4,7 @@ from fastapi import File, UploadFile from typing import Dict, List, Optional, Set, Union 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.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) - 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: return False diff --git a/app/methods/hosted_file_methods.py b/app/methods/hosted_file_methods.py index 768d922..cfe1901 100644 --- a/app/methods/hosted_file_methods.py +++ b/app/methods/hosted_file_methods.py @@ -414,7 +414,7 @@ def handle_delete_hosted_file( ): log.info('The hosted file link record was deleted.') 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 else: log.error('Something went wrong while trying to delete the hosted file link record.') diff --git a/app/routers/event_file.py b/app/routers/event_file.py index d4b7200..19be08b 100644 --- a/app/routers/event_file.py +++ b/app/routers/event_file.py @@ -60,7 +60,7 @@ async def create_from_hosted_file( log.debug(locals()) # 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 if load_hosted_file_obj_result := load_hosted_file_obj( diff --git a/app/routers/hosted_file.py b/app/routers/hosted_file.py index 765a92a..7a1a730 100644 --- a/app/routers/hosted_file.py +++ b/app/routers/hosted_file.py @@ -208,7 +208,7 @@ async def upload_files( log.debug(locals()) # 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 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) # 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( - account_id = account_id, - 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 + if link_to_type in ['event', 'event_location', 'event_session', 'event_presentation', 'event_presenter', 'event_badge', 'event_exhibit', 'event_person']: + log.info('File is for event module. Trigger will create the hosted_file_link record.') 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.') + if create_hosted_file_link( + account_id = account_id, + 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: + # 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) return mk_resp(data=hosted_file_list, response=response)