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

General code clean up. More work on event tracking related

Browse Source
This commit is contained in:
Scott Idem
2022-02-15 16:05:29 -05:00
parent 003ffb4adf
commit df6e860620
8 changed files with 208 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/methods/event_exhibit_tracking_methods.py
View File

@@ -4,7 +4,7 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from app.db_sql import get_account_id_w_for_type_id, redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.db_sql import get_account_id_w_for_type_id, redis_lookup_id_random, sql_delete, sql_insert, sql_select, sql_update
from app.lib_general import log, logging, logger_reset
from app.models.common_field_schema import default_num_bytes
@@ -15,7 +15,7 @@ from app.models.event_exhibit_tracking_models import Event_Exhibit_Tracking_Base
# Updated 2022-02-15
@logger_reset
def create_event_exhibit_tracking_obj(
exhibit_id: int|str,
event_exhibit_id: int|str,
event_exhibit_tracking_dict_obj: Event_Exhibit_Tracking_Base,
event_badge_id: int = None,
event_person_id: int = None,
@@ -30,7 +30,7 @@ def create_event_exhibit_tracking_obj(
log.debug(type(event_exhibit_tracking_dict_obj))
if isinstance(event_exhibit_tracking_dict_obj, dict):
event_exhibit_tracking_dict = event_exhibit_tracking_dict_obj
event_exhibit_tracking_dict['event_id'] = event_id
event_exhibit_tracking_dict['event_exhibit_id'] = event_exhibit_id
event_exhibit_tracking_dict['event_badge_id'] = event_badge_id
event_exhibit_tracking_dict['event_person_id'] = event_person_id
try:
@@ -40,7 +40,7 @@ def create_event_exhibit_tracking_obj(
return False
else:
event_exhibit_tracking_obj = event_exhibit_tracking_dict_obj
event_exhibit_tracking_obj.event_id = event_id
event_exhibit_tracking_obj.event_exhibit_id = event_exhibit_id
event_exhibit_tracking_obj.event_badge_id = event_badge_id
event_exhibit_tracking_obj.event_person_id = event_person_id
log.debug(event_exhibit_tracking_obj)
@@ -53,17 +53,13 @@ def create_event_exhibit_tracking_obj(
table_name = 'event_exhibit_tracking',
rm_id_random = True,
id_random_length = default_num_bytes
): pass
):
event_exhibit_tracking_id = event_exhibit_tracking_dict_in_result
log.info(f'Returning the new Event Exhibit Tracking ID: {event_exhibit_tracking_id}')
return event_exhibit_tracking_id
else:
log.warning(f'Event Exhibit Tracking not created.')
return False
log.debug(event_exhibit_tracking_dict_in_result)
event_exhibit_tracking_id = event_exhibit_tracking_dict_in_result
log.info(f'Returning the new Event Exhibit Tracking ID: {event_exhibit_tracking_id}')
return event_exhibit_tracking_id
return event_exhibit_tracking_dict_in_result # False or None
# ### END ### API Event Exhibit Tracking Methods ### create_event_exhibit_tracking_obj() ###
@@ -100,17 +96,37 @@ def update_event_exhibit_tracking_obj(
data = event_exhibit_tracking_dict,
table_name = 'event_exhibit_tracking',
rm_id_random = True,
): pass
):
log.info(f'Updated the Event Exhibit Tracking ID: {event_exhibit_tracking_id}')
return event_exhibit_tracking_id
else:
log.warning(f'Event Exhibit Tracking not updated.')
return False
log.debug(event_exhibit_tracking_dict_up_result)
return True
return event_exhibit_tracking_dict_up_result # False or None
# ### END ### API Event Exhibit Tracking Methods ### update_event_exhibit_tracking_obj() ###
# ### BEGIN ### API Event Exhibit Tracking Methods ### delete_event_exhibit_tracking_obj() ###
# Updated 2022-02-15
@logger_reset
def remove_event_exhibit_tracking_obj(
event_exhibit_tracking_id: int,
log_lvl: int = logging.DEBUG, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
) -> bool|None:
log.setLevel(log_lvl)
if event_exhibit_tracking_dict_del_result := sql_delete(
table_name = 'event_exhibit_tracking',
record_id = event_exhibit_tracking_id,
log_lvl = log_lvl,
):
log.info(f'Event Exhibit Tracking was deleted.')
return True
else:
log.warning(f'Event Exhibit Tracking not deleted.')
return event_exhibit_tracking_dict_del_result # False or None
# ### END ### API Event Exhibit Tracking Methods ### delete_event_exhibit_tracking_obj() ###
# ### BEGIN ### API Event Exhibit Tracking Methods ### load_event_exhibit_tracking_obj() ###
# Updated 2022-02-14
@logger_reset