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

Working on membership, person, user, and order

Browse Source
This commit is contained in:
Scott Idem
2021-06-28 14:23:06 -04:00
parent f55d9c2c62
commit a0514b5179
8 changed files with 225 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/address_models.py
View File

@@ -84,7 +84,7 @@ class Address_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
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')
return None
@@ -103,7 +103,7 @@ class Address_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['contact_id_random']:
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')
return None

2
app/models/contact_models.py
View File

@@ -90,7 +90,7 @@ class Contact_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
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')
return None

8
app/models/person_models.py
View File

@@ -16,7 +16,7 @@ from app.models.organization_models import Organization_Base
class Person_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(
@@ -87,7 +87,7 @@ class Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
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')
return None
@@ -101,13 +101,12 @@ class Person_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['account_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']:
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')
return None
@@ -131,6 +130,7 @@ class Person_Base(BaseModel):
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
#from .supporting_core_models import Address_Base, Contact_Base, Organization_Base, User_Base