Working on membership, person, and user
This commit is contained in:
@@ -4,62 +4,19 @@ import datetime
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_insert_or_update, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from app.methods.address_methods import load_address_obj
|
||||
from app.methods.contact_methods import create_contact_obj, load_contact_obj, update_contact_obj
|
||||
# from app.methods.address_methods import load_address_obj
|
||||
from app.methods.contact_methods import create_contact_obj, create_update_contact_obj, load_contact_obj, update_contact_obj
|
||||
from app.methods.order_methods import load_order_obj, get_order_rec_list
|
||||
from app.methods.organization_methods import load_organization_obj, update_organization_obj
|
||||
from app.methods.organization_methods import create_update_organization_obj, load_organization_obj, update_organization_obj
|
||||
# from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj
|
||||
|
||||
from app.models.common_field_schema import default_num_bytes
|
||||
from app.models.person_models import Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### create_person_obj() ###
|
||||
def create_person_obj(person_obj_new:Person_Base):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if not person_obj_new:
|
||||
return False
|
||||
|
||||
person_obj_data = person_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'contact', 'organization', 'created_on', 'updated_on'})
|
||||
|
||||
if person_obj_in_result := sql_insert(data=person_obj_data, table_name='person', rm_id_random=True, id_random_length=8): pass
|
||||
else:
|
||||
return False
|
||||
|
||||
#log.setLevel(logging.DEBUG)
|
||||
log.debug(person_obj_in_result)
|
||||
|
||||
person_id = person_obj_in_result
|
||||
|
||||
if person_obj_new.contact:
|
||||
contact_obj_new = person_obj_new.contact
|
||||
contact_obj_new.for_type = 'person'
|
||||
contact_obj_new.for_id = person_id
|
||||
create_contact_obj_result = create_contact_obj(contact_obj_new=contact_obj_new)
|
||||
if isinstance(create_contact_obj_result, int):
|
||||
contact_id = create_contact_obj_result
|
||||
log.debug(f'Update person with new contact_id: {contact_id}')
|
||||
# Need to update the person with the new contact_id
|
||||
person_obj_up = {}
|
||||
person_obj_up['id'] = person_id
|
||||
person_obj_up['contact_id'] = contact_id
|
||||
if person_obj_up_result := sql_update(data=person_obj_up, table_name='person'): pass
|
||||
else:
|
||||
return False
|
||||
log.debug(person_obj_up_result)
|
||||
else:
|
||||
log.debug(f'No contact_id was returned when tyring to create_contact_obj(): {create_contact_obj_result}')
|
||||
contact_id = None
|
||||
|
||||
log.debug(f'Returning the new person_id: {person_id}')
|
||||
return person_id
|
||||
# ### END ### API Person Methods ### create_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### load_person_obj() ###
|
||||
def load_person_obj(
|
||||
person_id: int|str,
|
||||
@@ -180,6 +137,105 @@ def load_person_obj(
|
||||
# ### END ### API Person Methods ### load_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### get_person_rec_list() ###
|
||||
def get_person_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
# data['for_obj_type'] = for_obj_type
|
||||
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
# if enabled in ['enabled', 'disabled', 'all']:
|
||||
# if enabled == 'enabled':
|
||||
# data['enable'] = True
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'disabled':
|
||||
# data['enable'] = False
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'all':
|
||||
# sql_enabled = ''
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'person_id', `tbl`.id_random AS 'person_id_random'
|
||||
FROM `person` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if person_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
person_rec_li = person_rec_li_result
|
||||
else:
|
||||
person_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(person_rec_li_result)
|
||||
|
||||
return person_rec_li
|
||||
# ### END ### API Person Methods ### get_person_rec_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### create_person_obj() ###
|
||||
def create_person_obj(person_obj_new:Person_Base):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if not person_obj_new:
|
||||
return False
|
||||
|
||||
person_obj_data = person_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'contact', 'organization', 'created_on', 'updated_on'})
|
||||
|
||||
if person_obj_in_result := sql_insert(data=person_obj_data, table_name='person', rm_id_random=True, id_random_length=8): pass
|
||||
else:
|
||||
return False
|
||||
|
||||
#log.setLevel(logging.DEBUG)
|
||||
log.debug(person_obj_in_result)
|
||||
|
||||
person_id = person_obj_in_result
|
||||
|
||||
if person_obj_new.contact:
|
||||
contact_obj_new = person_obj_new.contact
|
||||
contact_obj_new.for_type = 'person'
|
||||
contact_obj_new.for_id = person_id
|
||||
create_contact_obj_result = create_contact_obj(contact_obj_new=contact_obj_new)
|
||||
if isinstance(create_contact_obj_result, int):
|
||||
contact_id = create_contact_obj_result
|
||||
log.debug(f'Update person with new contact_id: {contact_id}')
|
||||
# Need to update the person with the new contact_id
|
||||
person_obj_up = {}
|
||||
person_obj_up['id'] = person_id
|
||||
person_obj_up['contact_id'] = contact_id
|
||||
if person_obj_up_result := sql_update(data=person_obj_up, table_name='person'): pass
|
||||
else:
|
||||
return False
|
||||
log.debug(person_obj_up_result)
|
||||
else:
|
||||
log.debug(f'No contact_id was returned when tyring to create_contact_obj(): {create_contact_obj_result}')
|
||||
contact_id = None
|
||||
|
||||
log.debug(f'Returning the new person_id: {person_id}')
|
||||
return person_id
|
||||
# ### END ### API Person Methods ### create_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### update_person_obj() ###
|
||||
def update_person_obj(
|
||||
person_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
@@ -293,56 +349,99 @@ def update_person_obj(
|
||||
# ### END ### API Person Methods ### update_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person Methods ### get_person_rec_list() ###
|
||||
def get_person_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
# ### BEGIN ### API Person Methods ### create_update_person_obj() ###
|
||||
def create_update_person_obj(
|
||||
person_id: int|str|None, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
person_obj: Person_Base,
|
||||
process_contact: bool = False,
|
||||
process_organization: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
# data['for_obj_type'] = for_obj_type
|
||||
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
# if enabled in ['enabled', 'disabled', 'all']:
|
||||
# if enabled == 'enabled':
|
||||
# data['enable'] = True
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'disabled':
|
||||
# data['enable'] = False
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'all':
|
||||
# sql_enabled = ''
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
if person_id:
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
else: return False
|
||||
person_obj.id = person_id
|
||||
else:
|
||||
sql_limit = ''
|
||||
# Insert record now and update later
|
||||
person_dict_in = person_obj.dict(by_alias=False, exclude_unset=True, exclude={'contact', 'organization', 'user'})
|
||||
log.debug(person_dict_in)
|
||||
person_in_result = sql_insert(
|
||||
data = person_dict_in,
|
||||
table_name = 'person',
|
||||
rm_id_random = True,
|
||||
id_random_length = default_num_bytes,
|
||||
)
|
||||
log.debug(person_in_result)
|
||||
if isinstance(person_in_result, bool) and person_in_result is True:
|
||||
return person_in_result
|
||||
elif isinstance(person_in_result, int):
|
||||
person_id = person_in_result
|
||||
person_obj.id = person_id
|
||||
else:
|
||||
return False # This should not happen.
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'person_id', `tbl`.id_random AS 'person_id_random'
|
||||
FROM `person` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
# Process contact data
|
||||
if process_contact and person_obj.contact:
|
||||
contact_obj = person_obj.contact
|
||||
contact_obj.for_type = 'person'
|
||||
contact_obj.for_id = person_id
|
||||
contact_id = person_obj.contact_id_random
|
||||
contact_result = create_update_contact_obj(
|
||||
contact_id = contact_id,
|
||||
contact_obj = contact_obj,
|
||||
process_address = True, # Setting to True under the assumption that if there is contact information then there is probably an address.
|
||||
)
|
||||
log.debug(contact_result)
|
||||
if isinstance(contact_result, bool) and contact_result is True:
|
||||
pass # Do not need to update person object.
|
||||
elif isinstance(contact_result, bool) and contact_result is False:
|
||||
pass # Do not need to update person object.
|
||||
elif isinstance(contact_result, int):
|
||||
person_obj.contact_id = contact_result
|
||||
# pass # Do not need to update person object.
|
||||
else:
|
||||
log.warning('Something may have gone wrong while trying to create or update a contact.')
|
||||
|
||||
if person_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
person_rec_li = person_rec_li_result
|
||||
# Process organization data
|
||||
if process_organization and person_obj.organization:
|
||||
organization_obj = person_obj.organization
|
||||
organization_id = person_obj.organization_id_random
|
||||
organization_result = create_update_organization_obj(
|
||||
organization_id = organization_id,
|
||||
organization_obj = organization_obj,
|
||||
process_contact = True, # Setting to True under the assumption that if there is organization information then there is probably a contact (and address).
|
||||
)
|
||||
log.debug(organization_result)
|
||||
if isinstance(organization_result, bool) and organization_result is True:
|
||||
pass # Do not need to update person object.
|
||||
elif isinstance(organization_result, bool) and organization_result is False:
|
||||
pass # Do not need to update person object.
|
||||
elif isinstance(organization_result, int):
|
||||
person_obj.organization_id = organization_result
|
||||
else:
|
||||
log.warning('Something may have gone wrong while trying to create or update a organization.')
|
||||
|
||||
# Process person data
|
||||
person_dict_up = person_obj.dict(by_alias=False, exclude_unset=True, exclude={'contact', 'organization', 'user'})
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(person_obj)
|
||||
log.debug(person_dict_up)
|
||||
|
||||
# Update record
|
||||
person_up_result = sql_update(
|
||||
data = person_dict_up,
|
||||
table_name = 'person',
|
||||
rm_id_random = True,
|
||||
)
|
||||
log.debug(person_up_result)
|
||||
if isinstance(person_up_result, bool) and person_up_result is True:
|
||||
return person_id
|
||||
elif isinstance(person_up_result, bool) and person_up_result is False:
|
||||
return False
|
||||
elif isinstance(person_up_result, int):
|
||||
return person_up_result
|
||||
else:
|
||||
person_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(person_rec_li_result)
|
||||
|
||||
return person_rec_li
|
||||
# ### END ### API Person Methods ### get_person_rec_list() ###
|
||||
return False
|
||||
# ### END ### API Person Methods ### create_update_person_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user