General clean up of everything.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user