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

Working on general code clean up and Cvent API related

Browse Source
This commit is contained in:
Scott Idem
2022-02-01 12:17:25 -05:00
parent 779bbb2f82
commit 4abf02aa15
7 changed files with 89 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/address_models.py
View File

@@ -84,9 +84,9 @@ class Address_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('id_random', None): # values['id_random']:
log.debug(values['id_random'])
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='address')
if isinstance(v, int) and v > 0: return v
elif id_random := values.get('id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='address')
return None
@validator('account_id', always=True)
@@ -94,8 +94,9 @@ class Address_Base(BaseModel):
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)
@@ -103,19 +104,11 @@ class Address_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('contact_id_random', None): # 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']:
#return redis_lookup_id_random(record_id_random=values['organization_id'], table_name='organization')
#return None
@validator('for_id', always=True)
def for_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)