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

Not much work done. Holly and Michael :-(

Browse Source
This commit is contained in:
Scott Idem
2021-06-01 21:45:19 -04:00
parent 499e08919d
commit 1f525f4c80
6 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main.py
View File

@@ -152,7 +152,7 @@ app.include_router(
) )
app.include_router( app.include_router(
event_session.router, event_session.router,
prefix='/event_session', prefix='/event/session',
tags=['Event Session'], tags=['Event Session'],
#dependencies=[Depends(get_token_header)], #dependencies=[Depends(get_token_header)],
#dependencies=[Depends(get_account_header)], #dependencies=[Depends(get_account_header)],

2
app/methods/event_methods.py
View File

@@ -117,7 +117,7 @@ def load_event_obj(
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_track_list=inc_event_track_list, #inc_event_track=inc_event_track,
): ):
data = event_session_obj.dict(by_alias=True, exclude_unset=True) data = event_session_obj.dict(by_alias=True, exclude_unset=True)
event_session_obj_li.append(data) event_session_obj_li.append(data)

13
app/methods/event_session_methods.py
View File

@@ -25,7 +25,6 @@ def load_event_session_obj(
inc_event_abstract_list: bool = False, inc_event_abstract_list: bool = False,
inc_event_badge_list: bool = False, inc_event_badge_list: bool = False,
inc_event_device_list: bool = False, inc_event_device_list: bool = False,
inc_event_exhibit_list: bool = False,
inc_event_file_list: bool = False, inc_event_file_list: bool = False,
inc_event_location: bool = False, inc_event_location: bool = False,
inc_event_person_list: bool = False, inc_event_person_list: bool = False,
@@ -35,7 +34,7 @@ def load_event_session_obj(
inc_event_track: bool = False, inc_event_track: bool = False,
inc_poc_event_person: bool = False, inc_poc_event_person: bool = False,
inc_poc_person: bool = False, inc_poc_person: bool = False,
#inc_user: bool = False, inc_user: bool = False,
) -> Event_Session_Base|bool: ) -> Event_Session_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -102,12 +101,12 @@ def load_event_session_obj(
""" """
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_presentation_obj_li_result := sql_select(data=data, sql=sql, as_list=True): if event_presentation_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_li_result) log.debug(event_presentation_rec_li_result)
event_presentation_obj_li = [] event_presentation_obj_li = []
for event_presentation_obj in event_presentation_obj_li_result: for event_presentation_rec in event_presentation_rec_li_result:
event_presentation_id = event_presentation_obj.get('event_presentation_id', None) event_presentation_id = event_presentation_rec.get('event_presentation_id', None)
if event_presentation_obj := load_event_presentation_obj( if event_presentation_obj := load_event_presentation_obj(
event_presentation_id=event_presentation_id, event_presentation_id=event_presentation_id,
enabled=enabled, enabled=enabled,
@@ -123,7 +122,7 @@ def load_event_session_obj(
event_session_obj.event_presentation_list = event_presentation_obj_li event_session_obj.event_presentation_list = event_presentation_obj_li
else: else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_li_result) log.debug(event_presentation_rec_li_result)
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL

4
app/models/event_presentation_models.py
View File

@@ -10,7 +10,7 @@ from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base #from .event_models import Event_Base
#from .event_abstract_models import Event_Abstract_Base #from .event_abstract_models import Event_Abstract_Base # This creates an import loop
from .event_person_models import Event_Person_Base from .event_person_models import Event_Person_Base
from .event_session_models import Event_Session_Base from .event_session_models import Event_Session_Base
from .person_models import Person_Base from .person_models import Person_Base
@@ -71,7 +71,7 @@ class Event_Presentation_Base(BaseModel):
# Including other related objects # Including other related objects
#event: Optional[Event_Base] #event: Optional[Event_Base]
event_abstract: Optional[Event_Abstract_Base] #event_abstract: Optional[Event_Abstract_Base] # This creates an import loop
event_abstract_list: Optional[list] # Optional[Event_Abstract_Base] Is more than one abstract allowed per presenter? event_abstract_list: Optional[list] # Optional[Event_Abstract_Base] Is more than one abstract allowed per presenter?
#event_device_list: Optional[list] # Optional[Event_Device_Base] #event_device_list: Optional[list] # Optional[Event_Device_Base]
event_file_list: Optional[list] # Optional[Event_File_Base] event_file_list: Optional[list] # Optional[Event_File_Base]

12
app/models/event_session_models.py
View File

@@ -11,6 +11,7 @@ from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base #from .event_models import Event_Base
from .event_location_models import Event_Location_Base from .event_location_models import Event_Location_Base
#from .event_person_models import Event_Person_Base
from .event_track_models import Event_Track_Base from .event_track_models import Event_Track_Base
from .person_models import Person_Base from .person_models import Person_Base
@@ -34,13 +35,15 @@ class Event_Session_Base(BaseModel):
event_track_id_random: Optional[str] event_track_id_random: Optional[str]
event_track_id: Optional[int] event_track_id: Optional[int]
poc_event_person_id_random: Optional[str]
poc_event_person_id: Optional[int]
poc_person_id_random: Optional[str]
poc_person_id: Optional[int]
session_type_id_random: Optional[str] session_type_id_random: Optional[str]
session_type_id: Optional[int] session_type_id: Optional[int]
session_type_code: Optional[str] session_type_code: Optional[str]
poc_event_person: Optional[Event_Person_Base]
poc_person: Optional[Person_Base]
name: Optional[str] name: Optional[str]
description: Optional[str] description: Optional[str]
@@ -93,6 +96,9 @@ class Event_Session_Base(BaseModel):
event_presenter_list: Optional[list] # Optional[Event_Presenter_Base] event_presenter_list: Optional[list] # Optional[Event_Presenter_Base]
event_track: Optional[Event_Track_Base] event_track: Optional[Event_Track_Base]
#poc_event_person: Optional[Event_Person_Base]
poc_person: Optional[Person_Base]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('event_session_id_random', always=True) #@validator('event_session_id_random', always=True)

18
app/routers/event_session.py
View File

@@ -11,6 +11,8 @@ from app.db_sql import *
from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from .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 load_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 *
@@ -176,29 +178,29 @@ async def get_event_session_obj_li(
{sql_limit}; {sql_limit};
""" """
if event_session_obj_li_result := sql_select(data=data, sql=sql, as_list=True): if event_session_li_result := sql_select(data=data, sql=sql, as_list=True):
log.debug(event_obj_li_result) log.debug(event_session_li_result)
event_session_li = [] event_session_li = []
for event_session in event_session_li_result: for event_session in event_session_li_result:
event_id = event_session.get('event_id', None) event_session_id = event_session.get('event_session_id', None)
if event_session := load_event_session( if event_session_obj := load_event_session_obj(
event_id=event_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_list, 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_list, 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.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)
return mk_resp(data=event_session_li) return mk_resp(data=event_session_li)
else: else: