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

Added person lookup by email and other minor changes.

Browse Source
This commit is contained in:
Scott Idem
2021-12-01 18:19:36 -05:00
parent 6883bebd16
commit 2c0af0a321
5 changed files with 105 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/methods/order_methods.py
View File

@@ -277,7 +277,7 @@ def load_order_obj(
# ### BEGIN ### API Order Methods ### get_order_rec_list() ###
# Updated 2021-11-22
# Updated 2021-12-01
def get_order_rec_list(
for_obj_type: str,
for_obj_id: str,
@@ -366,9 +366,9 @@ def get_order_rec_list(
if order_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
order_rec_li = order_rec_li_result
else:
order_rec_li = None
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
else: # None or False
order_rec_li = order_rec_li_result
log.debug(order_rec_li_result)
return order_rec_li

51
app/methods/person_methods.py
View File

@@ -286,6 +286,7 @@ def load_person_obj(
def get_person_rec_list(
for_obj_type: str,
for_obj_id: str,
email: str,
limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all
) -> list|bool:
@@ -294,18 +295,22 @@ def get_person_rec_list(
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'
data['email'] = email
sql_obj_type_id = f'`person`.{for_obj_type}_id = :{for_obj_type}_id'
if email:
sql_where_email = 'AND (user.email = :email OR contact.email = :email)'
# if enabled in ['enabled', 'disabled', 'all']:
# if enabled == 'enabled':
# data['enable'] = True
# sql_enabled = f'AND `tbl`.enable = :enable'
# sql_enabled = f'AND `person`.enable = :enable'
# elif enabled == 'disabled':
# data['enable'] = False
# sql_enabled = f'AND `tbl`.enable = :enable'
# sql_enabled = f'AND `person`.enable = :enable'
# elif enabled == 'all':
# sql_enabled = ''
sql_enabled = ''
@@ -316,21 +321,35 @@ def get_person_rec_list(
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 not email:
sql = f"""
SELECT `person`.id AS 'person_id', `person`.id_random AS 'person_id_random'
FROM `person` AS `person`
WHERE
{sql_obj_type_id}
{sql_enabled}
ORDER BY `person`.created_on DESC, `person`.updated_on DESC
{sql_limit};
"""
else:
sql = f"""
SELECT `person`.id AS 'person_id', `person`.id_random AS 'person_id_random'
FROM `person` AS `person`
LEFT JOIN `user` ON person.user_id = user.id
LEFT JOIN `contact` AS `contact` ON person.id = contact.for_id AND contact.for_type = 'person'
WHERE
{sql_obj_type_id}
{sql_where_email}
{sql_enabled}
ORDER BY `person`.priority DESC, `person`.sort ASC,`person`.given_name ASC, `person`.family_name ASC, `person`.created_on DESC, `person`.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
else: # None or False
person_rec_li = person_rec_li_result
log.debug(person_rec_li_result)
return person_rec_li