From fdcfe753252ba353c328a583307afe15fc4fb812 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 24 May 2022 16:49:10 -0400 Subject: [PATCH] Sort of bug fixes and improvements for user model and other. --- app/models/user_models.py | 52 ++++++++++++++++----------------------- app/routers/user.py | 2 +- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/app/models/user_models.py b/app/models/user_models.py index 8c4b159..7427022 100644 --- a/app/models/user_models.py +++ b/app/models/user_models.py @@ -91,38 +91,30 @@ class User_New_Base(BaseModel): @validator('account_id', always=True) def account_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['account_id_random']: - return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('account_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='account') return None @validator('contact_id', always=True) def contact_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['contact_id_random']: - return redis_lookup_id_random(record_id_random=values['contact_id_random'], table_name='contact') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('contact_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='contact') return None @validator('organization_id', always=True) def organization_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['organization_id_random']: - return redis_lookup_id_random(record_id_random=values['organization_id_random'], table_name='organization') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('organization_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='organization') return None @validator('person_id', always=True) def person_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['person_id_random']: - return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('person_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='person') return None @validator('password', always=True) @@ -230,7 +222,7 @@ class User_Out_Base(BaseModel): # ### BEGIN ### API User Models ### User_Base() ### class User_Base(BaseModel): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) id_random: Optional[str] = Field( @@ -241,8 +233,10 @@ class User_Base(BaseModel): id: Optional[int] = Field( alias = 'user_id' ) + account_id_random: Optional[str] account_id: Optional[int] + account_name: Optional[str] # contact_id_random: Optional[str] @@ -348,20 +342,16 @@ class User_Base(BaseModel): @validator('organization_id', always=True) def organization_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['organization_id_random']: - return redis_lookup_id_random(record_id_random=values['organization_id_random'], table_name='organization') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('organization_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='organization') return None @validator('person_id', always=True) def person_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['person_id_random']: - return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') + if isinstance(v, int) and v > 0: return v + elif id_random := values.get('person_id_random'): + return redis_lookup_id_random(record_id_random=id_random, table_name='person') return None @validator('password', always=True) diff --git a/app/routers/user.py b/app/routers/user.py index 569f111..74efd78 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -150,7 +150,7 @@ async def patch_user_obj( return_obj: Optional[bool] = True, commons: Common_Route_Params = Depends(common_route_params), ): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) obj_type = 'user'