diff --git a/app/methods/event_badge_template_methods.py b/app/methods/event_badge_template_methods.py index 1174f2d..1c03103 100644 --- a/app/methods/event_badge_template_methods.py +++ b/app/methods/event_badge_template_methods.py @@ -6,10 +6,12 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v from app.db_sql import redis_lookup_id_random, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update from app.lib_general import log, logging, logger_reset -from app.models.event_badge_template_models import Event_Badge_Template_Base +from app.models.event_badge_template_models import Event_Badge_Template_Base, Event_Badge_Template_Base_In, Event_Badge_Template_Base_Out # ### BEGIN ### API Event Badge Template Methods ### load_event_badge_template_obj() ### +# Updated 2022-07-25 +@logger_reset def load_event_badge_template_obj( event_badge_template_id: int|str, inc_event_badge_list: bool = False, @@ -19,7 +21,7 @@ def load_event_badge_template_obj( exclude_unset: bool = True, model_as_dict: bool = False, enabled: str = 'enabled', # enabled, disabled, all - ) -> Event_Badge_Template_Base|dict|bool: + ) -> Event_Badge_Template_Base_Out|dict|bool: # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -30,7 +32,7 @@ def load_event_badge_template_obj( else: return False try: - event_badge_template_obj = Event_Badge_Template_Base(**event_badge_template_rec) + event_badge_template_obj = Event_Badge_Template_Base_Out(**event_badge_template_rec) log.debug(event_badge_template_obj) except ValidationError as e: log.error(e.json()) @@ -84,3 +86,86 @@ def get_event_badge_template_rec_list( return event_badge_template_rec_li # ### END ### API Event Badge Template Methods ### get_event_badge_template_rec_list() ### + + +# ### BEGIN ### API Event Badge Template Methods ### create_update_event_badge_template_obj_v4() ### +# Updated 2022-07-25 +@logger_reset +def create_update_event_badge_template_obj_v4( + event_badge_template_dict_obj: Event_Badge_Template_Base_In|dict, + event_badge_template_id: int|str = None, + event_id: int|str = None, + return_outline: bool = False, + ) -> int|bool: + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + # ### SECTION ### Secondary data validation + log.info('Checking requirements...') + if event_badge_template_id: + log.info(f'Event Badge Template ID passed. Update existing Event Badge Template. Event Badge Template ID: {event_badge_template_id}') + + if event_badge_template_id := redis_lookup_id_random(record_id_random=event_badge_template_id, table_name='event_badge_template'): pass + else: + log.error('Event Badge Template ID passed but is invalid. Failed requirement.') + return False + else: + log.info('No Event Badge Template ID passed. Create new Event Badge Template. Required: Event ID') + + if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass + else: + log.error('Missing or invalid Event ID passed. Failed requirement.') + log.info(f'Event ID: {event_id}') + return False + + log.info('Create dictionary or Pydantic object') + log.debug(type(event_badge_template_dict_obj)) + if isinstance(event_badge_template_dict_obj, dict): + event_badge_template_dict = event_badge_template_dict_obj + if event_badge_template_id: + event_badge_template_dict['event_badge_template_id'] = event_badge_template_id + try: + event_badge_template_obj = Event_Badge_Template_Base_In(**event_badge_template_dict) + except ValidationError as e: + log.error(e.json()) + return False + else: + event_badge_template_obj = event_badge_template_dict_obj + if event_badge_template_id: + # NOTE: Can't update the ID alias if it was never set. + event_badge_template_obj.id = event_badge_template_id + log.debug(event_badge_template_obj) + + event_badge_template_dict = event_badge_template_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_badge_list', 'event_id_random', 'created_on', 'updated_on'}) + + # ### SECTION ### Process data + if event_id: pass + elif event_id := event_badge_template_obj.event_id: pass + + if event_badge_template_id: + if event_badge_template_dict_up_result := sql_update(data=event_badge_template_dict, table_name='event_badge_template', rm_id_random=True): pass + else: + log.warning(f'Event Badge Template not updated. Event Badge Template ID: {event_badge_template_id}') + log.debug(event_badge_template_dict_up_result) + return False + log.debug(event_badge_template_dict_up_result) + else: + if event_badge_template_dict_in_result := sql_insert(data=event_badge_template_dict, table_name='event_badge_template', rm_id_random=True): pass + else: + log.warning(f'Event Badge Template not created.') + log.debug(event_badge_template_dict_in_result) + return False + log.debug(event_badge_template_dict_in_result) + + event_badge_template_id = event_badge_template_dict_in_result + + event_badge_template_outline = {} + event_badge_template_outline['event_badge_template_id'] = event_badge_template_id + + if return_outline: + log.debug(f'Returning the Event Badge Outline: {event_badge_template_outline}') + return event_badge_template_outline + else: + log.debug(f'Returning the Event Badge ID: {event_badge_template_id}') + return event_badge_template_id +# ### END ### API Event Badge Methods ### create_update_event_badge_template_obj_v4() ### diff --git a/app/models/event_badge_template_models.py b/app/models/event_badge_template_models.py index 7dfc3fe..399d6ce 100644 --- a/app/models/event_badge_template_models.py +++ b/app/models/event_badge_template_models.py @@ -10,9 +10,11 @@ from app.models.common_field_schema import base_fields, default_num_bytes class Event_Badge_Template_Base(BaseModel): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) + log.info('Using base template') + id_random: Optional[str] = Field( **base_fields['event_badge_template_id_random'], alias = 'event_badge_template_id_random', @@ -45,6 +47,8 @@ class Event_Badge_Template_Base(BaseModel): footer_right: Optional[str] footer_background: Optional[str] + badge_type_list: Optional[Json] + ticket_1_text: Optional[str] ticket_2_text: Optional[str] ticket_3_text: Optional[str] @@ -70,20 +74,9 @@ class Event_Badge_Template_Base(BaseModel): passcode: Optional[str] notes: Optional[str] - created_on: Optional[datetime.datetime] = None - updated_on: Optional[datetime.datetime] = None _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) - #@validator('event_badge_template_id_random', always=True) - def event_badge_template_id_random_copy(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['id_random']: - return values['id_random'] - return None - @validator('id', always=True) def event_badge_template_id_lookup(cls, v, values, **kwargs): if isinstance(v, int) and v > 0: return v @@ -102,3 +95,26 @@ class Event_Badge_Template_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields + + +class Event_Badge_Template_Base_In(Event_Badge_Template_Base): + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + log.info('Using In template') + print('IN TEMPLATE') + + badge_type_list: Optional[str] + + +class Event_Badge_Template_Base_Out(Event_Badge_Template_Base): + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + log.info('Using Out template') + print('OUT TEMPLATE') + + # badge_type_list: Optional[Json] + + created_on: Optional[datetime.datetime] = None + updated_on: Optional[datetime.datetime] = None \ No newline at end of file diff --git a/app/routers/event_badge_template.py b/app/routers/event_badge_template.py index f3af189..c8249dd 100644 --- a/app/routers/event_badge_template.py +++ b/app/routers/event_badge_template.py @@ -9,15 +9,62 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template -from app.methods.event_badge_template_methods import get_event_badge_template_rec_list, load_event_badge_template_obj +from app.methods.event_badge_template_methods import get_event_badge_template_rec_list, load_event_badge_template_obj, create_update_event_badge_template_obj_v4 -from app.models.event_badge_template_models import Event_Badge_Template_Base +from app.models.event_badge_template_models import Event_Badge_Template_Base, Event_Badge_Template_Base_In from app.models.response_models import Resp_Body_Base, mk_resp router = APIRouter() +# ### BEGIN ### API Event Badge Template ### patch_event_badge_template_obj() ### +# Updated 2022-07-25 +@router.patch('/event/badge/template/{event_badge_template_id}', response_model=Resp_Body_Base) +async def patch_event_badge_template_obj( + event_badge_template_obj: Event_Badge_Template_Base_In, + event_badge_template_id: str = Query(..., min_length=11, max_length=22), + + inc_event_badge_list: bool = False, + + return_obj: Optional[bool] = True, + + commons: Common_Route_Params = Depends(common_route_params), + ): + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + if event_badge_template_id := redis_lookup_id_random(record_id_random=event_badge_template_id, table_name='event_badge_template'): pass + else: return mk_resp(data=None, status_code=404, response=commons.response) + + if update_event_badge_template_obj_result := create_update_event_badge_template_obj_v4( + event_badge_template_dict_obj = event_badge_template_obj, + event_badge_template_id = event_badge_template_id, + event_id = event_badge_template_obj.event_id, + return_outline = False, + ): pass + else: return mk_resp(data=False, status_code=400, response=commons.response, status_message='The event badge_template was not created. Check the field names and data types.') + + if update_event_badge_template_obj_result: + if return_obj: + if load_event_badge_template_obj_result := load_event_badge_template_obj( + event_badge_template_id = event_badge_template_id, + inc_event_badge_list = inc_event_badge_list, + ): + data = load_event_badge_template_obj_result + else: + data = False + else: + event_badge_template_id_random = get_id_random(record_id=event_badge_template_id, table_name='event_badge_template') + data = {} + data['event_badge_template_id'] = event_badge_template_id + data['event_badge_template_id_random'] = event_badge_template_id_random + return mk_resp(data=data, response=commons.response, status_message='The event badge template was created.') + else: + return mk_resp(data=False, status_code=400, response=commons.response, status_message='The result from trying to create an event badge template was unexpected.') +# ### END ### API Event Badge Template ### patch_event_badge_template_obj() ### + + # ### BEGIN ### API Event Badge ### get_event_event_badge_template_obj() ### # NOTE: This should probably return a list in the future :NOTE # Updated 2022-06-22