Work on person methods and related and event badge everything
This commit is contained in:
Scott Idem
365
app/routers/event_badge.py
Normal file
365
app/routers/event_badge.py
Normal file
@@ -0,0 +1,365 @@
|
||||
import datetime
|
||||
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Response, status
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
from app.lib_general import log, logging
|
||||
from app.config import settings
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
|
||||
|
||||
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
|
||||
|
||||
# from app.methods.event_badge_methods import get_event_badge_rec_list, load_event_badge_obj
|
||||
from app.methods.event_badge_methods import load_event_badge_obj
|
||||
|
||||
from app.models.event_badge_models import Event_Badge_Base
|
||||
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post('/event/badge', response_model=Resp_Body_Base)
|
||||
async def post_event_badge_obj(
|
||||
obj: Event_Badge_Base,
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'event_badge'
|
||||
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
|
||||
result = post_obj_template(
|
||||
obj_type = obj_type,
|
||||
data = obj_data_dict,
|
||||
return_obj = True,
|
||||
by_alias = True,
|
||||
exclude_unset = True,
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.patch('/event/badge/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def patch_event_badge_obj(
|
||||
obj: Event_Badge_Base,
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'event_badge'
|
||||
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
|
||||
obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type)
|
||||
obj_data_dict['id_random'] = obj_id
|
||||
result = patch_obj_template(
|
||||
obj_type = obj_type,
|
||||
data = obj_data_dict,
|
||||
obj_id = obj_id,
|
||||
return_obj = True,
|
||||
by_alias = True,
|
||||
exclude_unset = True,
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/event/badge/list', response_model=Resp_Body_Base)
|
||||
async def get_event_badge_obj_li(
|
||||
for_obj_type: str = Query(None, min_length=2, max_length=50),
|
||||
for_obj_id: str = Query(None, min_length=1, max_length=22),
|
||||
group: str = Query(None, min_length=2, max_length=50),
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'event_badge'
|
||||
|
||||
if for_obj_type == 'event_exhibit' and for_obj_id:
|
||||
#base_name = obj_type_li[obj_type]['base_name']
|
||||
base_name = Event_Badge_Base
|
||||
|
||||
for_obj_id_random = for_obj_id
|
||||
for_obj_id = redis_lookup_id_random(record_id_random=for_obj_id_random, table_name=for_obj_type)
|
||||
|
||||
data = {}
|
||||
data['for_obj_type'] = for_obj_type
|
||||
data['for_obj_id'] = for_obj_id
|
||||
data['for_obj_id_random'] = for_obj_id_random
|
||||
data['group'] = group
|
||||
|
||||
if group:
|
||||
sql = """
|
||||
SELECT *
|
||||
FROM `event_badge` AS event_badge
|
||||
WHERE event_badge.for_type = :for_obj_type AND event_badge.for_id = :for_obj_id
|
||||
AND event_badge.group = :group
|
||||
"""
|
||||
else:
|
||||
sql = """
|
||||
SELECT *
|
||||
FROM `event_badge` AS event_badge
|
||||
WHERE event_badge.for_type = :for_obj_type AND event_badge.for_id = :for_obj_id
|
||||
"""
|
||||
|
||||
if sql_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
resp_data_li = []
|
||||
for record in sql_result:
|
||||
resp_data = base_name(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
resp_data_li.append(resp_data)
|
||||
|
||||
return mk_resp(data=resp_data_li)
|
||||
else:
|
||||
log.debug(sql_result)
|
||||
return mk_resp(data=False, status_code=404, response=response)
|
||||
|
||||
result = get_obj_li_template(
|
||||
obj_type=obj_type,
|
||||
for_obj_type=for_obj_type,
|
||||
for_obj_id=for_obj_id,
|
||||
by_alias=True,
|
||||
exclude_unset=True,
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### search_event_badge_obj_li() ###
|
||||
# Updated 2021-07-28
|
||||
@router.get('/event/{event_id}/badge/search', response_model=Resp_Body_Base)
|
||||
async def search_event_badge_obj_li(
|
||||
# account_id: str = Query(None, min_length=11, max_length=22),
|
||||
event_id: str = Query(None, min_length=11, max_length=22),
|
||||
external_id: str = Query('%', max_length=50),
|
||||
given_name: str = Query('%', max_length=25),
|
||||
family_name: str = Query('%', max_length=25),
|
||||
email: str = Query('%', max_length=50),
|
||||
limit: int = 50,
|
||||
enabled: str = 'enabled',
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
data = {}
|
||||
data['account_id_random'] = x_account_id
|
||||
data['event_id_random'] = event_id
|
||||
data['external_id'] = '%'+external_id+'%'
|
||||
data['given_name'] = '%'+given_name+'%'
|
||||
data['family_name'] = '%'+family_name+'%'
|
||||
data['email'] = '%'+email+'%' # Adding the % symbol here because it turns certain combinations into special characters
|
||||
# data['from_datetime'] = from_datetime
|
||||
# data['to_datetime'] = to_datetime
|
||||
log.debug(data)
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `event_badge`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `event_badge`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT *
|
||||
FROM `v_event_badge` AS event_badge
|
||||
WHERE event_badge.account_id = :account_id
|
||||
AND (event_badge.external_id LIKE :external_id OR event_badge.external_id IS NULL)
|
||||
AND (event_badge.given_name LIKE :given_name
|
||||
AND event_badge.family_name LIKE :family_name)
|
||||
AND event_badge.email LIKE :email
|
||||
{sql_enabled}
|
||||
ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
sql = f"""
|
||||
SELECT *
|
||||
FROM `v_event_badge` AS event_badge
|
||||
WHERE event_badge.event_id = :event_id
|
||||
AND (event_badge.given_name LIKE :given_name
|
||||
AND event_badge.family_name LIKE :family_name)
|
||||
AND event_badge.email LIKE :email
|
||||
{sql_enabled}
|
||||
ORDER BY event_badge.given_name ASC, event_badge.family_name ASC, event_badge.created_on DESC, event_badge.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
log.debug(sql)
|
||||
if sql_result := sql_select(data=data, sql=sql, as_list=True, rm_id_random=True):
|
||||
resp_data_li = []
|
||||
for record in sql_result:
|
||||
resp_data = Event_Badge_Base(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
resp_data_li.append(resp_data)
|
||||
|
||||
return mk_resp(data=resp_data_li)
|
||||
else:
|
||||
log.debug(sql_result)
|
||||
return mk_resp(data=False, status_code=404, response=response)
|
||||
# ### END ### API Event Badge ### search_event_badge_obj_li() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### get_event_badge_obj() ###
|
||||
# Updated 2021-08-05
|
||||
@router.get('/event/badge/{event_badge_id}', response_model=Resp_Body_Base)
|
||||
async def get_event_badge_obj(
|
||||
event_badge_id: str = Query(..., min_length=11, max_length=22),
|
||||
limit: int = 5, # For now this covers any included objects or object lists
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_badge_id := redis_lookup_id_random(record_id_random=event_badge_id, table_name='event_badge'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
event_badge_obj = load_event_badge_obj(
|
||||
event_badge_id = event_badge_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
)
|
||||
event_badge_dict = event_badge_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
return mk_resp(data=event_badge_dict)
|
||||
# ### END ### API Event Badge ### get_event_badge_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### get_account_obj_event_badge_list() ###
|
||||
# Updated 2021-07-28
|
||||
@router.get('/account/{account_id}/event/badge/list', response_model=Resp_Body_Base)
|
||||
async def get_account_obj_event_badge_list(
|
||||
account_id: str = Query(..., min_length=1, max_length=22),
|
||||
limit: int = 500, # For now this covers any included objects or object lists
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
inc_event_badge: bool = False,
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
response_data = None
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
# Updated 2021-07-28
|
||||
if event_badge_rec_list_result := get_event_badge_rec_list(
|
||||
account_id = account_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
event_badge_result_list = []
|
||||
for event_badge_rec in event_badge_rec_list_result:
|
||||
if load_event_badge_result := load_event_badge_obj(
|
||||
event_badge_id = event_badge_rec.get('event_badge_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_event_badge = inc_event_badge,
|
||||
):
|
||||
event_badge_result_list.append(load_event_badge_result)
|
||||
else:
|
||||
event_badge_result_list.append(None)
|
||||
response_data = event_badge_result_list
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
# ### END ### API Event Badge ### get_account_obj_event_badge_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### get_event_obj_event_badge_list() ###
|
||||
# Updated 2021-07-28
|
||||
@router.get('/event/{event_id}/event/badge/list', response_model=Resp_Body_Base)
|
||||
async def get_event_obj_event_badge_list(
|
||||
event_id: str = Query(..., min_length=11, max_length=22),
|
||||
limit: int = 500, # For now this covers any included objects or object lists
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_badge_id := redis_lookup_id_random(record_id_random=event_badge_id, table_name='event_badge'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
response_data = None
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
# Updated 2021-07-28
|
||||
if event_badge_rec_list_result := get_event_badge_rec_list(
|
||||
event_badge_id = event_badge_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
event_badge_result_list = []
|
||||
for event_badge_rec in event_badge_rec_list_result:
|
||||
if load_event_badge_result := load_event_badge_obj(
|
||||
event_badge_id = event_badge_rec.get('event_badge_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
):
|
||||
event_badge_result_list.append(load_event_badge_result)
|
||||
else:
|
||||
event_badge_result_list.append(None)
|
||||
response_data = event_badge_result_list
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
# ### END ### API Event Badge ### get_event_obj_event_badge_list() ###
|
||||
|
||||
|
||||
@router.delete('/event/badge/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def delete_event_badge_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: str = Header(...),
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'event_badge'
|
||||
result = delete_obj_template(
|
||||
obj_type=obj_type,
|
||||
obj_id=obj_id,
|
||||
)
|
||||
return result
|
||||
112
app/routers/event_badge_template.py
Normal file
112
app/routers/event_badge_template.py
Normal file
@@ -0,0 +1,112 @@
|
||||
import datetime
|
||||
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Response, status
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
from app.lib_general import log, logging
|
||||
from app.config import settings
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
|
||||
|
||||
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
|
||||
|
||||
from app.methods.event_badge_template_methods import load_event_badge_template_obj
|
||||
|
||||
from app.models.event_badge_template_models import Event_Badge_Template_Base
|
||||
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### get_event_event_badge_template_obj() ###
|
||||
# NOTE: This should probably return a list in the future :NOTE
|
||||
# Updated 2021-09-08
|
||||
@router.get('/event/{event_id}/badge/template', response_model=Resp_Body_Base)
|
||||
async def get_event_event_badge_template_obj(
|
||||
event_id: str = Query(None, min_length=11, max_length=22),
|
||||
limit: int = 50,
|
||||
enabled: str = 'enabled',
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
data = {}
|
||||
data['event_id'] = event_id
|
||||
log.debug(data)
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `event_badge`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `event_badge`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT *
|
||||
FROM `event_badge_template` AS event_badge_template
|
||||
WHERE event_badge_template.event_id = :event_id
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
log.debug(sql)
|
||||
if sql_result := sql_select(data=data, sql=sql): # NOTE: This will probably need to be a list in the future. Force return of list.
|
||||
resp_data = Event_Badge_Template_Base(**sql_result).dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
return mk_resp(data=resp_data)
|
||||
|
||||
# resp_data_li = []
|
||||
# for record in sql_result:
|
||||
# resp_data = Event_Badge_Template_Base(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
# resp_data_li.append(resp_data)
|
||||
|
||||
# return mk_resp(data=resp_data_li)
|
||||
else:
|
||||
log.debug(sql_result)
|
||||
return mk_resp(data=False, status_code=404, response=response)
|
||||
# ### END ### API Event Badge ### get_event_event_badge_template_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Badge ### get_event_badge_template_obj() ###
|
||||
# Updated 2021-09-08
|
||||
@router.get('/event/badge/template/{event_badge_template_id}', response_model=Resp_Body_Base)
|
||||
async def get_event_badge_template_obj(
|
||||
event_badge_template_id: str = Query(..., min_length=11, max_length=22),
|
||||
limit: int = 5, # For now this covers any included objects or object lists
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_badge_template_id := redis_lookup_id_random(record_id_random=event_badge_template_id, table_name='event_badge_template'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
event_badge_template_obj = load_event_badge_template_obj(
|
||||
event_badge_template_id = event_badge_template_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
)
|
||||
event_badge_template_dict = event_badge_template_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
return mk_resp(data=event_badge_template_dict)
|
||||
# ### END ### API Event Badge ### get_event_badge_template_obj() ###
|
||||
@@ -11,7 +11,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
|
||||
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
|
||||
|
||||
from app.methods.contact_methods import load_contact_obj, update_contact_obj
|
||||
from app.methods.person_methods import create_update_person_obj, get_person_rec_list, load_person_obj, update_person_obj
|
||||
from app.methods.person_methods import create_update_person_obj_v4b, get_person_rec_list, load_person_obj
|
||||
from app.methods.user_methods import load_user_obj
|
||||
|
||||
from app.models.contact_models import Contact_Base
|
||||
|
||||
@@ -28,7 +28,7 @@ async def get_lookup_li(
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
allowed_lookup_tables = ['country', 'country_subdivision', 'event_session_type', 'file_purpose', 'membership_group_status', 'membership_person_status', 'membership_type_status', 'order_status', 'post_topic', 'product_type', 'time_zone', 'user_status']
|
||||
|
||||
@@ -11,7 +11,7 @@ from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_
|
||||
|
||||
# from app.methods.membership_person_methods import load_membership_person_obj
|
||||
from app.methods.order_methods import get_order_rec_list, load_order_obj
|
||||
from app.methods.person_methods import create_person_obj_v3, create_update_person_obj, get_person_rec_list, get_person_rec_w_external_id, load_person_obj, update_person_obj, update_person_obj_v3
|
||||
from app.methods.person_methods import create_update_person_obj_v4b, get_person_rec_list, get_person_rec_w_external_id, load_person_obj, update_person_obj
|
||||
|
||||
from app.models.person_models import Person_Base
|
||||
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
@@ -73,121 +73,148 @@ async def patch_person_obj(
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### v3_post_person_obj_new() ###
|
||||
# Updated 2021-08-24
|
||||
# Using create_update_person_obj_v4b() now
|
||||
# Updated 2021-09-08
|
||||
@router.post('/v3/person/new', response_model=Resp_Body_Base)
|
||||
async def v3_post_person_obj_new(
|
||||
person_obj: Person_Base,
|
||||
process_contact: bool = False,
|
||||
process_organization: bool = False,
|
||||
process_user: bool = False,
|
||||
create_sub_obj: bool = False,
|
||||
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
|
||||
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
inc_address: bool = False, # Priority l1
|
||||
inc_contact: bool = False, # Priority l1
|
||||
inc_user: bool = False, # Priority l1
|
||||
x_account_id: str = Header(...),
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_user: bool = False,
|
||||
return_obj: bool = True,
|
||||
limit: int = 50,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
# include: Optional[list] = [],
|
||||
# exclude: Optional[list] = [],
|
||||
exclude_unset: Optional[bool] = True,
|
||||
# exclude_none: Optional[bool] = True,
|
||||
|
||||
x_account_id: str = Header(...),
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
log.debug(person_obj.account_id)
|
||||
log.debug(person_obj.account_id_random)
|
||||
|
||||
# if person_obj.account_id: pass
|
||||
# else: return mk_resp(data=False, status_code=500, response=response, status_message='Testing')
|
||||
|
||||
# abort(501)
|
||||
|
||||
# There should probably be a check for the account ID before calling the create function?
|
||||
if create_person_obj_result := create_person_obj_v3(
|
||||
if create_update_person_obj_result := create_update_person_obj_v4b(
|
||||
account_id = x_account_id,
|
||||
person_obj_new = person_obj,
|
||||
create_sub_obj = create_sub_obj,
|
||||
fail_any = fail_any,
|
||||
return_outline = False,
|
||||
person_dict_obj = person_obj,
|
||||
person_id = None,
|
||||
# process_contact = process_contact,
|
||||
# process_organization = process_organization,
|
||||
# process_user = process_user,
|
||||
): pass
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The person was not created. Check the field names and data types.')
|
||||
|
||||
if isinstance(create_person_obj_result, int):
|
||||
person_id = create_person_obj_result
|
||||
if isinstance(create_update_person_obj_result, int):
|
||||
person_id = create_update_person_obj_result
|
||||
if return_obj:
|
||||
if load_person_obj_result := load_person_obj(
|
||||
person_id = person_id,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_organization = inc_organization,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
data = load_person_obj_result
|
||||
else:
|
||||
data = False
|
||||
return mk_resp(data=data, response=response, status_message='The person was probably created, but there was a problem returning the data.')
|
||||
else:
|
||||
person_id = create_person_obj_result
|
||||
person_id = create_update_person_obj_result
|
||||
person_id_random = get_id_random(record_id=person_id, table_name='person')
|
||||
data = {}
|
||||
data['person_id'] = person_id
|
||||
data['person_id_random'] = person_id_random
|
||||
return mk_resp(data=data, response=response, status_message='The person was created.')
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an person was unexpected.')
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create a person was unexpected.')
|
||||
# ### BEGIN ### API Person ### v3_post_person_obj_new() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### v3_patch_person_obj_exist ###
|
||||
# Updated 2021-08-24
|
||||
# Using create_update_person_obj_v4b() now
|
||||
# Updated 2021-09-08
|
||||
@router.patch('/v3/person/{person_id}/exist', response_model=Resp_Body_Base)
|
||||
async def v3_patch_person_obj_exist(
|
||||
person_obj: Person_Base,
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
process_contact: bool = False,
|
||||
process_organization: bool = False,
|
||||
process_user: bool = False,
|
||||
create_sub_obj: bool = False,
|
||||
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_user: bool = False,
|
||||
return_obj: bool = True,
|
||||
limit: int = 50,
|
||||
by_alias: bool = True,
|
||||
# include: Optional[list] = [],
|
||||
# exclude: Optional[list] = [],
|
||||
exclude_unset: Optional[bool] = True,
|
||||
exclude_none: Optional[bool] = True,
|
||||
# exclude_none: Optional[bool] = True,
|
||||
|
||||
x_account_id: str = Header(...),
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
else: return mk_resp(data=None, status_code=404, response=response, status_message='The person was not updated. The person ID was invalid or not found.')
|
||||
|
||||
if update_person_obj_result := update_person_obj_v3(
|
||||
if create_update_person_obj_result := create_update_person_obj_v4b(
|
||||
account_id = x_account_id,
|
||||
person_dict_obj = person_obj,
|
||||
person_id = person_id,
|
||||
person_obj_exist = person_obj,
|
||||
create_sub_obj = create_sub_obj,
|
||||
fail_any = fail_any,
|
||||
return_outline = False,
|
||||
# process_contact = process_contact,
|
||||
# process_organization = process_organization,
|
||||
# process_user = process_user,
|
||||
): pass
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The person was not created. Check the field names and data types.')
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The person was not updated. Check the field names and data types.')
|
||||
|
||||
if update_person_obj_result:
|
||||
if isinstance(create_update_person_obj_result, int):
|
||||
person_id = create_update_person_obj_result
|
||||
if return_obj:
|
||||
if load_person_obj_result := load_person_obj(person_id=person_id):
|
||||
if load_person_obj_result := load_person_obj(
|
||||
person_id = person_id,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_organization = inc_organization,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
data = load_person_obj_result
|
||||
else:
|
||||
data = False
|
||||
return mk_resp(data=data, response=response, status_message='The person was probably updated, but there was a problem returning the data.')
|
||||
else:
|
||||
person_id = create_update_person_obj_result
|
||||
person_id_random = get_id_random(record_id=person_id, table_name='person')
|
||||
data = {}
|
||||
data['person_id'] = person_id
|
||||
data['person_id_random'] = person_id_random
|
||||
return mk_resp(data=data, response=response, status_message='The person was created.')
|
||||
return mk_resp(data=data, response=response, status_message='The person was updated.')
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an person was unexpected.')
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to update the person was unexpected.')
|
||||
# ### END ### API Person ### v3_patch_person_obj_exist ###
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### post_person_json() ###
|
||||
# Updated 2021-06-25
|
||||
# Updated 2021-09-08
|
||||
@router.post('/person/json', response_model=Resp_Body_Base)
|
||||
async def post_person_json(
|
||||
person_obj: Person_Base,
|
||||
@@ -195,26 +222,26 @@ async def post_person_json(
|
||||
# create_sub_obj: bool = False,
|
||||
process_contact: bool = False,
|
||||
process_organization: bool = False,
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
process_user: bool = False,
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
include: Optional[list] = [],
|
||||
exclude: Optional[list] = [],
|
||||
# include: Optional[list] = [],
|
||||
# exclude: Optional[list] = [],
|
||||
exclude_unset: Optional[bool] = True,
|
||||
exclude_none: Optional[bool] = True,
|
||||
# exclude_none: Optional[bool] = True,
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
# if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
# else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
if person_obj_in_result := create_update_person_obj(
|
||||
if person_obj_in_result := create_update_person_obj_v4b(
|
||||
account_id = x_account_id,
|
||||
person_dict_obj = person_obj,
|
||||
person_id = None,
|
||||
person_obj = person_obj,
|
||||
process_contact = process_contact,
|
||||
process_organization = process_organization,
|
||||
process_user = process_user,
|
||||
):
|
||||
log.debug(person_obj_in_result)
|
||||
if return_obj:
|
||||
@@ -233,9 +260,10 @@ async def post_person_json(
|
||||
@router.patch('/person/{person_id}/json', response_model=Resp_Body_Base)
|
||||
async def patch_person_json(
|
||||
person_obj: Person_Base,
|
||||
person_id: str = Query(..., min_length=1, max_length=22),
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
process_contact: bool = False,
|
||||
process_organization: bool = False,
|
||||
process_user: bool = False,
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
@@ -251,11 +279,12 @@ async def patch_person_json(
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=response)
|
||||
|
||||
if person_obj_up_result := create_update_person_obj(
|
||||
person_id = person_id,
|
||||
person_obj = person_obj,
|
||||
if person_obj_up_result := create_update_person_obj_v4b(
|
||||
account_id = x_account_id,
|
||||
person_dict_obj = person_obj,
|
||||
process_contact = process_contact,
|
||||
process_organization = process_organization,
|
||||
process_user = process_user,
|
||||
):
|
||||
log.debug(person_obj_up_result)
|
||||
if return_obj:
|
||||
|
||||
Reference in New Issue
Block a user