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

Updates for hosted file sections and general code clean up.

Browse Source
This commit is contained in:
Scott Idem
2021-09-07 14:58:04 -04:00
parent a625d33995
commit edd7beb4d7
5 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/routers/event_person.py
View File

@@ -405,24 +405,24 @@ async def get_event_person_obj(
return mk_resp(data=None, status_code=404) return mk_resp(data=None, status_code=404)
if event_person_obj := load_event_person_obj( if event_person_obj := load_event_person_obj(
event_person_id=event_person_id, event_person_id = event_person_id,
enabled=enabled, enabled = enabled,
limit=limit, limit = limit,
inc_address=inc_address, inc_address = inc_address,
inc_contact=inc_contact, inc_contact = inc_contact,
inc_event_abstract_list=inc_event_abstract_list, inc_event_abstract_list = inc_event_abstract_list,
inc_event_badge=inc_event_badge, inc_event_badge = inc_event_badge,
#inc_event_device_list=inc_event_device_list, #inc_event_device_list = inc_event_device_list,
#inc_event_exhibit_list=inc_event_exhibit_list, #inc_event_exhibit_list = inc_event_exhibit_list,
inc_event_file_list=inc_event_file_list, inc_event_file_list = inc_event_file_list,
#inc_event_location=inc_event_location, #inc_event_location = inc_event_location,
#inc_event_person_list=inc_event_person_list, #inc_event_person_list = inc_event_person_list,
inc_event_presentation_list=inc_event_presentation_list, inc_event_presentation_list = inc_event_presentation_list,
#inc_event_presenter_list=inc_event_presenter_list, #inc_event_presenter_list = inc_event_presenter_list,
inc_event_registration=inc_event_registration, inc_event_registration = inc_event_registration,
#inc_event_track=inc_event_track, #inc_event_track = inc_event_track,
inc_person=inc_person, inc_person = inc_person,
inc_user=inc_user, inc_user = inc_user,
): ):
# event_dict = event_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # event_dict = event_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass pass
@@ -430,7 +430,7 @@ async def get_event_person_obj(
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_person_obj) return mk_resp(data=event_person_obj)
# ### END ### API Event ### get_event_person_obj() ### # ### END ### API Event Person ### get_event_person_obj() ###
# ### BEGIN ### API Event Person Methods ### get_event_registration_event_person_obj_li() ### # ### BEGIN ### API Event Person Methods ### get_event_registration_event_person_obj_li() ###

2
app/routers/event_presentation.py
View File

@@ -168,7 +168,7 @@ async def get_event_presentation_obj(
return mk_resp(data=event_presentation_dict) return mk_resp(data=event_presentation_dict)
#return mk_resp(data=event_presentation_obj) #return mk_resp(data=event_presentation_obj)
# ### END ### API Event ### get_event_presentation_obj() ### # ### END ### API Event Presentation ### get_event_presentation_obj() ###
@router.delete('/{obj_id}', response_model=Resp_Body_Base) @router.delete('/{obj_id}', response_model=Resp_Body_Base)

32
app/routers/event_presenter.py
View File

@@ -265,21 +265,21 @@ async def get_event_presenter_obj(
return mk_resp(data=None, status_code=404) return mk_resp(data=None, status_code=404)
if event_presenter_obj := load_event_presenter_obj( if event_presenter_obj := load_event_presenter_obj(
event_presenter_id=event_presenter_id, event_presenter_id = event_presenter_id,
enabled=enabled, enabled = enabled,
limit=limit, limit = limit,
inc_address=inc_address, inc_address = inc_address,
inc_contact=inc_contact, inc_contact = inc_contact,
inc_event_abstract_list=inc_event_abstract_list, inc_event_abstract_list = inc_event_abstract_list,
inc_event_badge=inc_event_badge, inc_event_badge = inc_event_badge,
inc_event_device_list=inc_event_device_list, inc_event_device_list = inc_event_device_list,
inc_event_file_list=inc_event_file_list, inc_event_file_list = inc_event_file_list,
inc_event_person=inc_event_person, inc_event_person = inc_event_person,
# inc_event_presentation=inc_event_presentation, # inc_event_presentation = inc_event_presentation,
inc_event_registration=inc_event_registration, inc_event_registration = inc_event_registration,
# inc_event_session=inc_event_session, # inc_event_session = inc_event_session,
inc_person=inc_person, inc_person = inc_person,
inc_user=inc_user, inc_user = inc_user,
): ):
event_presenter_dict = event_presenter_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) event_presenter_dict = event_presenter_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass pass
@@ -288,7 +288,7 @@ async def get_event_presenter_obj(
return mk_resp(data=event_presenter_dict) return mk_resp(data=event_presenter_dict)
#return mk_resp(data=event_presenter_obj) #return mk_resp(data=event_presenter_obj)
# ### END ### API Event ### get_event_presenter_obj() ### # ### END ### API Event Presenter ### get_event_presenter_obj() ###
@router.delete('/{obj_id}', response_model=Resp_Body_Base) @router.delete('/{obj_id}', response_model=Resp_Body_Base)

44
app/routers/event_session.py
View File

@@ -9,10 +9,10 @@ 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.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.event_session_methods import create_event_session_obj, create_update_event_session_obj_v4, load_event_session_obj, get_event_session_rec_list, update_event_session_obj_v3 from app.methods.event_session_methods import create_event_session_obj, create_update_event_session_obj_v4, load_event_session_obj, get_event_session_rec_list, update_event_session_obj_v3, update_event_session_obj
from app.models.event_session_models import Event_Session_Base from app.models.event_session_models import Event_Session_Base
from app.models.response_models import * from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter() router = APIRouter()
@@ -304,10 +304,10 @@ async def patch_event_session_json(
return mk_resp(data=None, status_code=404) return mk_resp(data=None, status_code=404)
if event_session_obj_up_result := update_event_session_obj( if event_session_obj_up_result := update_event_session_obj(
event_session_id=event_session_id, event_session_id = event_session_id,
event_session_obj_up=event_session_obj, event_session_obj_up = event_session_obj,
create_sub_obj=create_sub_obj, create_sub_obj = create_sub_obj,
): ):
log.debug(event_session_obj_up_result) log.debug(event_session_obj_up_result)
if return_obj: if return_obj:
@@ -437,21 +437,21 @@ async def get_event_session_obj_li(
for event_session in event_session_li_result: for event_session in event_session_li_result:
event_session_id = event_session.get('event_session_id', None) event_session_id = event_session.get('event_session_id', None)
if event_session_obj := load_event_session_obj( if event_session_obj := load_event_session_obj(
event_session_id=event_session_id, event_session_id = event_session_id,
enabled=enabled, enabled = enabled,
inc_event_abstract_list=inc_event_abstract_list, inc_event_abstract_list = inc_event_abstract_list,
inc_event_badge_list=inc_event_badge_list, inc_event_badge_list = inc_event_badge_list,
inc_event_device_list=inc_event_device_list, inc_event_device_list = inc_event_device_list,
inc_event_file_list=inc_event_file_list, inc_event_file_list = inc_event_file_list,
inc_event_location=inc_event_location, inc_event_location = inc_event_location,
inc_event_person_list=inc_event_person_list, inc_event_person_list = inc_event_person_list,
inc_event_presentation_list=inc_event_presentation_list, inc_event_presentation_list = inc_event_presentation_list,
inc_event_presenter_list=inc_event_presenter_list, inc_event_presenter_list = inc_event_presenter_list,
inc_event_registration_list=inc_event_registration_list, inc_event_registration_list = inc_event_registration_list,
inc_event_track=inc_event_track, inc_event_track = inc_event_track,
inc_poc_event_person=inc_poc_event_person, inc_poc_event_person = inc_poc_event_person,
# inc_poc_person=inc_poc_person, # inc_poc_person = inc_poc_person,
# inc_user=inc_user, # inc_user = inc_user,
): ):
data = event_session_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) data = event_session_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
event_session_li.append(data) event_session_li.append(data)
@@ -526,7 +526,7 @@ async def get_event_session_obj(
return mk_resp(data=event_session_dict) return mk_resp(data=event_session_dict)
#return mk_resp(data=event_session_obj) #return mk_resp(data=event_session_obj)
# ### END ### API Event ### get_event_session_obj() ### # ### END ### API Event Session ### get_event_session_obj() ###
# ### BEGIN ### API Event Session Methods ### get_event_event_session_obj_li() ### # ### BEGIN ### API Event Session Methods ### get_event_event_session_obj_li() ###

36
app/routers/hosted_file.py
View File

@@ -14,7 +14,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
from app.methods.hosted_file_methods import create_hosted_file_obj, load_hosted_file_obj, save_file, create_hosted_file_link from app.methods.hosted_file_methods import create_hosted_file_obj, load_hosted_file_obj, save_file, create_hosted_file_link
from app.models.hosted_file_models import Hosted_File_Base from app.models.hosted_file_models import Hosted_File_Base
from app.models.response_models import mk_resp from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter() router = APIRouter()
@@ -388,4 +388,36 @@ async def test_upload_files(
) )
log.debug(file_info) log.debug(file_info)
return mk_resp(data=False, status_code=501, response=response) return mk_resp(data=False, status_code=501, response=response)
# ### BEGIN ### API Hosted File ### get_hosted_file_obj() ###
# Updated 2021-09-07
@router.get('/{hosted_file_id}', response_model=Resp_Body_Base)
async def get_hosted_file_obj(
hosted_file_id: str = Query(..., min_length=11, max_length=22),
enabled: str = 'enabled', # enabled, disabled, all; 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.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if hosted_file_id := redis_lookup_id_random(record_id_random=hosted_file_id, table_name='hosted_file'): pass
else:
return mk_resp(data=None, status_code=404)
if hosted_file_obj := load_hosted_file_obj(
hosted_file_id = hosted_file_id,
enabled = enabled,
):
hosted_file_dict = hosted_file_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass
else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=hosted_file_dict)
#return mk_resp(data=hosted_file_obj)
# ### END ### API Hosted File ### get_hosted_file_obj() ###