Working on event_person and session proposals. Also general clean up of models and methods.
This commit is contained in:
@@ -11,8 +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 ..models.account_model import Account_Base
|
||||
from ..models.account_methods import load_account_cfg_obj
|
||||
from ..models.account_models import Account_Base
|
||||
from ..methods.account_methods import load_account_cfg_obj
|
||||
from ..models.response_model import *
|
||||
|
||||
|
||||
|
||||
@@ -10,16 +10,17 @@ from app.db_sql import *
|
||||
|
||||
from ..models.response_model import *
|
||||
|
||||
from ..models.account_model import *
|
||||
from ..models.account_models import *
|
||||
from ..models.account_cfg_model import *
|
||||
from ..models.address_model import *
|
||||
from ..models.archive_model import *
|
||||
from ..models.archive_content_model import *
|
||||
from ..models.contact_model import *
|
||||
from ..models.event_model import *
|
||||
from ..models.event_exhibit_model import *
|
||||
from ..models.event_registration_model import *
|
||||
from ..models.membership_model import *
|
||||
from ..models.event_models import *
|
||||
from ..models.event_exhibit_models import *
|
||||
from ..models.event_person_models import *
|
||||
from ..models.event_registration_models import *
|
||||
from ..models.membership_models import *
|
||||
from ..models.order_model import *
|
||||
from ..models.order_cart_model import *
|
||||
from ..models.organization_model import *
|
||||
|
||||
@@ -11,7 +11,7 @@ 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 ..models.event_model import Event_Base
|
||||
from ..models.event_models import Event_Base
|
||||
from ..models.response_model import *
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ 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 ..models.event_exhibit_model import Event_Exhibit_Base
|
||||
from ..models.event_exhibit_models import Event_Exhibit_Base
|
||||
from ..models.response_model import *
|
||||
|
||||
|
||||
|
||||
@@ -11,8 +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 ..models.event_person_model import Event_Person_New_Base, Event_Person_Base
|
||||
from ..models.event_person_methods import create_event_person_obj
|
||||
from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
|
||||
from ..methods.event_person_methods import create_event_person_obj, load_event_person_obj
|
||||
from ..models.person_model import Person_Base
|
||||
from ..models.person_methods import create_person_obj, load_person_obj
|
||||
from ..models.user_model import User_New_Base, User_Base
|
||||
@@ -126,11 +126,24 @@ async def post_event_person_new(
|
||||
event_person_obj_new = Event_Person_Base(**event_person_new)
|
||||
log.debug(event_person_obj_new)
|
||||
|
||||
event_person_obj = create_event_person_obj(event_person_obj_new=event_person_obj_new)
|
||||
event_person_obj_result = create_event_person_obj(event_person_obj_new=event_person_obj_new)
|
||||
if isinstance(event_person_obj_result, bool):
|
||||
log.debug('Returning False something is not right.')
|
||||
return mk_resp(data=False)
|
||||
elif isinstance(event_person_obj_result, int):
|
||||
event_person_id = event_person_obj_result
|
||||
event_person_obj = load_event_person_obj(event_person_id=event_person_id)
|
||||
log.debug(event_person_id)
|
||||
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)
|
||||
@@ -11,7 +11,7 @@ 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 ..models.event_registration_model import Event_Registration_Base
|
||||
from ..models.event_registration_models import Event_Registration_Base
|
||||
from ..models.response_model import *
|
||||
|
||||
|
||||
|
||||
@@ -11,8 +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 ..models.membership_model import Membership_Base
|
||||
from ..models.membership_methods import load_membership_obj
|
||||
from ..models.membership_models import Membership_Base
|
||||
from ..methods.membership_methods import load_membership_obj
|
||||
from ..models.response_model import *
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user