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

A lot of work on event related modules. Also a lot of clean up.

Browse Source
This commit is contained in:
Scott Idem
2021-06-07 17:32:42 -04:00
parent 33ec6a4acb
commit 63baf4b2e9
9 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main.py
View File

@@ -18,7 +18,7 @@ from app.lib_general import *
from app.log import log
# Import the routers here first:
from app.routers import api_crud, api, account, address, archive, archive_content, contact, event, event_exhibit, event_person, event_person_detail, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, lookup, membership, order, order_cart, organization, page, person, post, post_comment, product, site, site_domain, user, user_person, websockets # , items, journals
from app.routers import api_crud, api, account, address, archive, archive_content, contact, event, event_exhibit, event_person, event_person_detail, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, lookup, membership, order, order_cart, organization, page, person, post, post_comment, product, site, site_domain, user, user_person, websockets # , items, journals
from app.db_sql import db
@@ -142,6 +142,14 @@ app.include_router(
#dependencies=[Depends(get_account_header)],
#responses={404: {'description': 'Not found'}},
)
app.include_router(
event_presentation.router,
prefix='/event/presentation',
tags=['Event Presenter'],
#dependencies=[DependPresenter(get_token_header)],
#dependencies=[Depends(get_account_header)],
#responses={404: {'description': 'Not found'}},
)
app.include_router(
event_presenter.router,
prefix='/event/presenter',

17
app/methods/event_presentation_methods.py
View File

@@ -24,15 +24,17 @@ def load_event_presentation_obj(
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
inc_event_abstract_list: bool = False,
inc_event_badge: bool = False,
#inc_event_badge_list: bool = False,
inc_event_device_list: bool = False,
inc_event_file_list: bool = False,
inc_event_person: bool = False,
inc_event_person_list: bool = False,
inc_event_presenter_list: bool = False,
#inc_event_cfg: bool = False,
#inc_poc_event_person: bool = False,
#inc_poc_person: bool = False,
#inc_user: bool = False,
inc_event_registration: bool = False,
#inc_event_registration_list: bool = False,
inc_person: bool = False,
inc_user: bool = False,
) -> Event_Presentation_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -110,10 +112,13 @@ def load_event_presentation_obj(
event_presenter_id=event_presenter_id,
enabled=enabled,
inc_event_abstract_list=inc_event_abstract_list,
inc_event_badge=inc_event_badge,
inc_event_device_list=inc_event_device_list,
inc_event_file_list=inc_event_file_list,
inc_event_person_list=inc_event_person_list,
inc_event_presenter_list=inc_event_presenter_list,
inc_event_person=inc_event_person,
inc_event_registration=inc_event_registration,
inc_person=inc_person,
inc_user=inc_user,
):
data = event_presenter_obj.dict(by_alias=True, exclude_unset=True)
event_presenter_obj_li.append(data)

2
app/routers/account.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging
from app.config import settings
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 app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.account_methods import load_account_cfg_obj

2
app/routers/event_person.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging
from app.config import settings
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 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_person_methods import create_event_person_obj, load_event_person_obj
from app.methods.person_methods import create_person_obj, load_person_obj

2
app/routers/event_presenter.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging
from app.config import settings
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 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_presenter_methods import load_event_presenter_obj

2
app/routers/event_session.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging
from app.config import settings
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 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 load_event_session_obj

2
app/routers/order.py
View File

@@ -9,7 +9,7 @@ from ..log import *
from app.config import settings
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 app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.order_methods import load_order_obj, save_order_obj

2
app/routers/person.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging
from app.config import settings
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 app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.person_methods import load_person_obj

2
app/routers/user.py
View File

@@ -9,7 +9,7 @@ from app.lib_general import log, logging, secure_hash_string, verify_secure_hash
from app.config import settings
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 app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.user_methods import load_user_obj