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)

16
app/models/contact_models.py
View File

@@ -99,9 +99,9 @@ class Contact_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='contact')
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='contact')
return None
@validator('account_id', always=True)
@@ -109,8 +109,9 @@ class Contact_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('address_id', always=True)
@@ -118,8 +119,9 @@ class Contact_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('address_id_random', None):
return redis_lookup_id_random(record_id_random=values['address_id_random'], table_name='address')
if isinstance(v, int) and v > 0: return v
elif id_random := values.get('address_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='address')
return None
@validator('linked_address_id', always=True)

15
app/models/membership_person_models.py
View File

@@ -193,8 +193,7 @@ class Membership_Person_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('id_random'):
elif id_random := values.get('id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='membership_person')
return None
@@ -204,8 +203,7 @@ class Membership_Person_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('account_id_random'):
elif id_random := values.get('account_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='account')
return None
@@ -233,8 +231,7 @@ class Membership_Person_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('membership_type_id_random'):
elif id_random := values.get('membership_type_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='membership_type')
return None
@@ -244,8 +241,7 @@ class Membership_Person_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('membership_person_type_id_random'):
elif id_random := values.get('membership_person_type_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='membership_person_type')
return None
@@ -255,8 +251,7 @@ class Membership_Person_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('person_id_random'):
elif id_random := values.get('person_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='person')
return None

12
app/models/membership_person_type_models.py
View File

@@ -95,8 +95,7 @@ class Membership_Person_Type_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('id_random'):
elif id_random := values.get('id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='membership_person_type')
return None
@@ -106,8 +105,7 @@ class Membership_Person_Type_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('account_id_random'):
elif id_random := values.get('account_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='account')
return None
@@ -117,8 +115,7 @@ class Membership_Person_Type_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('membership_type_id_random'):
elif id_random := values.get('membership_type_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='membership_type')
return None
@@ -128,8 +125,7 @@ class Membership_Person_Type_Base(BaseModel):
log.debug(locals())
if isinstance(v, int) and v > 0: return v
if id_random := values.get('product_id_random'):
elif id_random := values.get('product_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='product')
return None

26
app/models/person_models.py
View File

@@ -159,9 +159,9 @@ class Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('id_random', None): # 'id_random' in values and values['id_random']:
log.debug(values['id_random'])
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='person')
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='person')
return None
@validator('account_id', always=True)
@@ -169,8 +169,9 @@ class Person_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)
@@ -178,8 +179,9 @@ class Person_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)
@@ -187,8 +189,9 @@ class Person_Base(BaseModel):
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('user_id', always=True)
@@ -196,8 +199,9 @@ class Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['user_id_random']:
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
if isinstance(v, int) and v > 0: return v
elif id_random := values.get('user_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='user')
return None
class Config: