A lot of general clean up of everything.
This commit is contained in:
@@ -4,10 +4,10 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_select
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from ..models.membership_models import Membership_Cfg_Base
|
||||
from app.models.membership_models import Membership_Cfg_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Account Methods ### load_account_cfg_obj() ###
|
||||
|
||||
@@ -4,10 +4,10 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from ..models.address_models import Address_Base
|
||||
from app.models.address_models import Address_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Address Methods ### create_address_obj() ###
|
||||
|
||||
@@ -4,12 +4,12 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from ..methods.address_methods import create_address_obj
|
||||
from app.methods.address_methods import create_address_obj
|
||||
|
||||
from ..models.contact_models import Contact_Base
|
||||
from app.models.contact_models import Contact_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Contact Methods ### create_contact_obj() ###
|
||||
|
||||
@@ -4,13 +4,13 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from ..methods.person_methods import load_person_obj
|
||||
from ..methods.user_methods import load_user_obj
|
||||
from app.methods.person_methods import load_person_obj
|
||||
from app.methods.user_methods import load_user_obj
|
||||
|
||||
from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
|
||||
from app.models.event_person_models import Event_Person_New_Base, Event_Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Person Methods ### create_event_person_obj() ###
|
||||
|
||||
@@ -4,12 +4,12 @@ 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 app.lib_general import *
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
|
||||
#from .address_models import Address_Base
|
||||
#from .contact_models import Contact_Base
|
||||
from ..models.membership_models import Membership_Base
|
||||
from app.models.membership_models import Membership_Base
|
||||
#from .organization_models import Organization_Base
|
||||
#from .person_models import Person_Base
|
||||
#from .user_models import User_Base
|
||||
|
||||
@@ -4,10 +4,10 @@ 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_or_update, sql_insert, sql_update, sql_select
|
||||
from app.lib_general import *
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
|
||||
|
||||
from ..models.order_cart_models import Order_Cart_Base
|
||||
from app.models.order_cart_models import Order_Cart_Base
|
||||
|
||||
|
||||
def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_li:bool=False):
|
||||
|
||||
@@ -4,12 +4,12 @@ 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 app.lib_general import *
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
|
||||
from ..models.order_models import Order_Base
|
||||
#from ..models.person_models import Person_Base
|
||||
#from ..models.user_models import User_Base
|
||||
from app.models.order_models import Order_Base
|
||||
#from app.models.person_models import Person_Base
|
||||
#from app.models.user_models import User_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### save_order_obj() ###
|
||||
|
||||
@@ -4,18 +4,18 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select
|
||||
from app.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 app.methods.address_methods import load_address_obj
|
||||
from app.methods.contact_methods import create_contact_obj, load_contact_obj
|
||||
|
||||
from ..models.organization_models import Organization_Base
|
||||
from app.models.organization_models import Organization_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Organization Methods ### load_organization_obj() ###
|
||||
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.setLevel(logging.WARNING) # 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
|
||||
|
||||
@@ -4,15 +4,15 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from ..lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.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 ..methods.organization_methods import load_organization_obj
|
||||
from ..methods.user_methods import load_user_obj
|
||||
from app.methods.address_methods import load_address_obj
|
||||
from app.methods.contact_methods import create_contact_obj, load_contact_obj
|
||||
from app.methods.organization_methods import load_organization_obj
|
||||
from app.methods.user_methods import load_user_obj
|
||||
|
||||
from ..models.person_models import Person_Base
|
||||
from app.models.person_models import Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### create_person_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user