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

Working on event_person and session proposals. Also general clean up of models and methods.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 00:14:02 -04:00
parent 486236f0a8
commit 29692ac78e
7 changed files with 121 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/routers/event_person.py
View File

@@ -25,13 +25,13 @@ router = APIRouter()
@router.post('/new', response_model=Resp_Body_Base)
async def post_event_person_new(
event_person_new: Event_Person_New_Base,
event_person_new_init: Event_Person_New_Base,
x_account_id: str = Header(...),
return_obj: bool = True,
inc_event: bool = False,
inc_event_badge: bool = False,
inc_event_person_detail: bool = False,
inc_event_registration: bool = False,
inc_event: bool = False, # Not ready yet. Placeholder.
inc_event_badge: bool = False, # Not ready yet. Placeholder.
inc_event_person_detail: bool = False, # Not ready yet. Placeholder.
inc_event_registration: bool = False, # Not ready yet. Placeholder.
inc_person: bool = False,
inc_user: bool = False,
by_alias: bool = True,
@@ -40,25 +40,25 @@ async def post_event_person_new(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
account_id_random = event_person_new.account_id_random
event_id_random = event_person_new.event_id_random
account_id_random = event_person_new_init.account_id_random
event_id_random = event_person_new_init.event_id_random
given_name = event_person_new.person_given_name
family_name = event_person_new.person_family_name
if full_name := event_person_new.person_full_name:
given_name = event_person_new_init.person_given_name
family_name = event_person_new_init.person_family_name
if full_name := event_person_new_init.person_full_name:
pass
elif given_name and family_name:
full_name = f'{given_name} {family_name}'
elif given_name:
full_name = f'{given_name}'
email = event_person_new.email
email = event_person_new_init.email
if new_password := event_person_new.new_password:
if new_password := event_person_new_init.new_password:
pass
else:
new_password = secrets.token_urlsafe(default_num_bytes)
organization_name = event_person_new.organization_name
organization_name = event_person_new_init.organization_name
# New person
person_new = {}
@@ -67,14 +67,12 @@ async def post_event_person_new(
person_new['family_name'] = family_name
person_new['full_name'] = full_name
person_new['organization_name'] = organization_name
#person_new['contact_id_random'] = ?
# New person contact
person_new['contact'] = {}
person_new['contact']['account_id_random'] = account_id_random
person_new['contact']['email'] = email
person_new['contact']['name'] = full_name
person_new['contact']['address'] = {}
# New person contact address
person_new['contact']['address'] = {}
@@ -140,24 +138,23 @@ async def post_event_person_new(
event_person_id = event_person_obj_result
event_person_obj = load_event_person_obj(
event_person_id=event_person_id,
inc_event=inc_event,
inc_event_badge=inc_event_badge,
inc_event_person_detail=inc_event_person_detail,
inc_event_registration=inc_event_registration,
inc_person=inc_person,
inc_user=inc_user
inc_event=inc_event, # Not ready yet. Placeholder.
inc_event_badge=inc_event_badge, # Not ready yet. Placeholder.
inc_event_person_detail=inc_event_person_detail, # Not ready yet. Placeholder.
inc_event_registration=inc_event_registration, # Not ready yet. Placeholder.
inc_person=False, # Already loaded above
inc_user=False # Already loaded above
)
log.debug(event_person_id)
log.debug(event_person_obj)
event_person_obj.person = person_obj
event_person_obj.user = user_obj
log.debug(event_person_obj)
else:
log.debug('A new event_person was not created')
return mk_resp(data=False)
return_data = {}
return_data['person'] = person_obj
return_data['user'] = user_obj
return_data['event_person'] = event_person_obj
log.debug(return_data)
return mk_resp(data=return_data)
log.debug(event_person_obj)
return mk_resp(data=event_person_obj)