Work on event person tracking and related

This commit is contained in:
Scott Idem
2021-09-27 19:14:41 -04:00
parent 7ceb125026
commit 831ff8d4a0
7 changed files with 43 additions and 21 deletions

View File

@@ -25,6 +25,7 @@ from app.models.event_exhibit_models import *
from app.models.event_file_models import *
from app.models.event_location_models import *
from app.models.event_person_models import *
from app.models.event_person_tracking_models import *
from app.models.event_presentation_models import *
from app.models.event_presenter_models import *
from app.models.event_registration_models import *
@@ -81,6 +82,7 @@ obj_type_li['event_exhibit'] = {'table_name': 'v_event_exhibit', 'base_name': Ev
obj_type_li['event_file'] = {'table_name': 'v_event_file', 'base_name': Event_File_Base} # Should this eventually be changed to event_hosted_file
obj_type_li['event_location'] = {'table_name': 'v_event_location', 'base_name': Event_Location_Base}
obj_type_li['event_person'] = {'table_name': 'v_event_person', 'base_name': Event_Person_Base}
obj_type_li['event_person_tracking'] = {'table_name': 'v_event_person_tracking', 'base_name': Event_Person_Tracking_Base}
obj_type_li['event_presentation'] = {'table_name': 'v_event_presentation', 'base_name': Event_Presentation_Base}
obj_type_li['event_presenter'] = {'table_name': 'v_event_presenter', 'base_name': Event_Presenter_Base}
obj_type_li['event_registration'] = {'table_name': 'v_event_registration', 'base_name': Event_Registration_Base}

View File

@@ -22,7 +22,7 @@ router = APIRouter()
@router.post('/event/person/tracking', response_model=Resp_Body_Base)
async def post_event_person_tracking_obj(
obj: Event_Person_Tracking_Base,
event_person_tracking_obj: Event_Person_Tracking_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
@@ -33,21 +33,21 @@ async def post_event_person_tracking_obj(
log.debug(locals())
obj_type = 'event_person_tracking'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
event_person_tracking_obj_data_dict = event_person_tracking_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,
obj_type = obj_type,
data = event_person_tracking_obj_data_dict,
return_obj = True,
by_alias = True,
exclude_unset = True,
)
return result
@router.patch('/event/person/tracking/{obj_id}', response_model=Resp_Body_Base)
@router.patch('/event/person/tracking/{event_person_tracking_id}', response_model=Resp_Body_Base)
async def patch_event_person_tracking_obj(
obj: Event_Person_Tracking_Base,
obj_id: str = Query(..., min_length=1, max_length=22),
event_person_tracking_obj: Event_Person_Tracking_Base,
event_person_tracking_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,
@@ -58,16 +58,16 @@ async def patch_event_person_tracking_obj(
log.debug(locals())
obj_type = 'event_person_tracking'
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
event_person_tracking_obj_data_dict = event_person_tracking_obj.dict(by_alias=False, exclude_unset=True)
event_person_tracking_obj_data_dict['id'] = redis_lookup_id_random(record_id_random=event_person_tracking_id, table_name=obj_type)
event_person_tracking_obj_data_dict['id_random'] = event_person_tracking_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,
obj_type = obj_type,
data = event_person_tracking_obj_data_dict,
obj_id = event_person_tracking_id,
return_obj = True,
by_alias = True,
exclude_unset = True,
)
return result
@@ -122,6 +122,7 @@ async def get_event_person_tracking_obj(
async def get_event_person_obj_tracking_list(
event_person_id: str = Query(..., min_length=11, max_length=22),
event_session_id: str = Query(None, min_length=11, max_length=22),
in_out_type: str = Query(None, min_length=1, max_length=15),
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_person: bool = False,
@@ -146,6 +147,7 @@ async def get_event_person_obj_tracking_list(
account_id = x_account_id,
event_person_id = event_person_id,
event_session_id = event_session_id,
in_out_type = in_out_type,
enabled = enabled,
limit = limit,
):