Work membership and general clean up
This commit is contained in:
@@ -5,8 +5,7 @@ from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from ..lib_general import *
|
||||
from ..log import *
|
||||
from .db_sql import sql_select
|
||||
from ..db_sql import sql_select
|
||||
|
||||
#from .address_model import Address_Base
|
||||
#from .contact_model import Contact_Base
|
||||
@@ -160,17 +159,16 @@ def save_membership_obj(order_obj_new:Membership_Base=None):
|
||||
else: return False
|
||||
log.debug(order_line_obj_resp)
|
||||
return order_id
|
||||
# ### END ### API Membership Model ### save_membership_obj() ###
|
||||
# ### END ### API Membership Model ### save_membership_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Model ### get_membership_obj() ###
|
||||
def get_membership_obj(membership_id=None, inc_membership_profile=None, inc_membership_cfg=None, inc_cust_profile=None):
|
||||
# ### BEGIN ### API Membership Model ### load_membership_obj() ###
|
||||
def load_membership_obj(membership_id:int|str, inc_membership_profile:bool=False, inc_membership_cfg:bool=False, inc_extended_profile:bool=False) -> Membership_Base:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_id := redis_lookup_id_random(record_id_random=membership_id, table_name='membership'): pass
|
||||
else:
|
||||
return False
|
||||
else: return False
|
||||
|
||||
if membership_rec := sql_select(table_name='v_membership', record_id=membership_id):
|
||||
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
@@ -190,14 +188,14 @@ def get_membership_obj(membership_id=None, inc_membership_profile=None, inc_memb
|
||||
|
||||
membership_rec['cfg'] = membership_cfg_rec
|
||||
|
||||
if inc_cust_profile:
|
||||
if inc_extended_profile:
|
||||
account_code = membership_rec.get('account_code', None)
|
||||
table_name = f'c_{account_code}_membership_profile'
|
||||
if cust_profile_rec := sql_select(table_name=table_name, field_name='membership_id', field_value=membership_id):
|
||||
if extended_profile_rec := sql_select(table_name=table_name, field_name='membership_id', field_value=membership_id):
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(cust_profile_rec)
|
||||
log.debug(extended_profile_rec)
|
||||
|
||||
membership_rec['cust_profile'] = cust_profile_rec
|
||||
membership_rec['extended_profile'] = extended_profile_rec
|
||||
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_rec)
|
||||
@@ -211,4 +209,4 @@ def get_membership_obj(membership_id=None, inc_membership_profile=None, inc_memb
|
||||
log.error(e.json())
|
||||
|
||||
return membership_obj
|
||||
# ### END ### API Membership Model ### get_membership_obj() ###
|
||||
# ### END ### API Membership Model ### load_membership_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user