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

General clean up of everything.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 03:23:52 -04:00
parent 09c7b48223
commit 2167c7e897
31 changed files with 129 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/methods/account_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_select
from ..lib_general import log, logging
from ..models.membership_models import Membership_Cfg_Base

2
app/methods/address_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
from ..lib_general import log, logging
from ..models.address_models import Address_Base

12
app/methods/contact_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from ..methods.address_methods import create_address_obj
@@ -67,10 +67,12 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
log.debug(contact_rec)
if inc_address:
if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)):
contact_rec['address'] = address_rec
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(address_rec)
address_id = contact_rec.get('address_id', None)
if address_obj_result := load_address_obj(address_id=address_id):
address_obj = address_obj_result
contact_rec['address'] = address_obj
log.debug(contact_rec)
#else: contact_rec['address'] = None
else:
return False

2
app/methods/event_person_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from ..methods.person_methods import load_person_obj
from ..methods.user_methods import load_user_obj

25
app/methods/organization_methods.py
View File

@@ -4,15 +4,18 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
from ..lib_general import log, logging
from ..methods.address_methods import load_address_obj
from ..methods.contact_methods import create_contact_obj, load_contact_obj
from ..models.organization_models import Organization_Base
# ### BEGIN ### API Organization Methods ### load_organization_obj() ###
def load_organization_obj(organization_id:int|str) -> Organization_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
def load_organization_obj(organization_id:int|str, inc_contact:bool=False, inc_address:bool=False) -> Organization_Base|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if organization_id := redis_lookup_id_random(record_id_random=organization_id, table_name='organization'): pass
@@ -21,6 +24,22 @@ def load_organization_obj(organization_id:int|str) -> Organization_Base|bool:
if organization_rec := sql_select(table_name='v_organization', record_id=organization_id):
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(organization_rec)
if inc_contact:
contact_id = organization_rec.get('contact_id', None)
if contact_obj_result := load_contact_obj(contact_id=contact_id):
contact_obj = contact_obj_result
organization_rec['contact'] = contact_obj
log.debug(organization_rec)
#else: organization_rec['contact'] = None
if inc_address:
address_id = contact_obj.address_id
if address_obj_result := load_address_obj(address_id=address_id):
address_obj = address_obj_result
organization_rec['contact'].address = address_obj
log.debug(organization_rec)
#else: organization_rec['contact'].address = None
else:
return False

2
app/methods/person_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from ..methods.address_methods import load_address_obj
from ..methods.contact_methods import create_contact_obj, load_contact_obj

2
app/methods/user_methods.py
View File

@@ -4,8 +4,8 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from ..methods.contact_methods import load_contact_obj
from ..methods.organization_methods import load_organization_obj