Work on lots of methods and models.
This commit is contained in:
@@ -290,31 +290,31 @@ async def get_event_obj(
|
||||
return mk_resp(data=None, status_code=404)
|
||||
|
||||
if event_obj := load_event_obj(
|
||||
event_id=event_id,
|
||||
enabled=enabled,
|
||||
limit=limit,
|
||||
inc_contact_1=inc_contact_1,
|
||||
inc_contact_2=inc_contact_2,
|
||||
inc_contact_3=inc_contact_3,
|
||||
inc_event_abstract_list=inc_event_abstract_list,
|
||||
inc_event_badge_list=inc_event_badge_list,
|
||||
inc_event_device_list=inc_event_device_list,
|
||||
inc_event_exhibit_list=inc_event_exhibit_list,
|
||||
inc_event_file_list=inc_event_file_list,
|
||||
inc_event_location=inc_event_location,
|
||||
inc_event_location_list=inc_event_location_list,
|
||||
inc_event_person_list=inc_event_person_list,
|
||||
inc_event_presentation_list=inc_event_presentation_list,
|
||||
inc_event_presenter_cat=inc_event_presenter_cat,
|
||||
inc_event_presenter_list=inc_event_presenter_list,
|
||||
inc_event_registration_list=inc_event_registration_list,
|
||||
inc_event_session_list=inc_event_session_list,
|
||||
inc_event_track=inc_event_track,
|
||||
inc_event_track_list=inc_event_track_list,
|
||||
inc_event_cfg=inc_event_cfg,
|
||||
inc_event_registration_cfg=inc_event_registration_cfg,
|
||||
inc_location_address=inc_location_address,
|
||||
inc_poc_event_person=inc_poc_event_person,
|
||||
event_id = event_id,
|
||||
enabled = enabled,
|
||||
limit = limit,
|
||||
inc_contact_1 = inc_contact_1,
|
||||
inc_contact_2 = inc_contact_2,
|
||||
inc_contact_3 = inc_contact_3,
|
||||
inc_event_abstract_list = inc_event_abstract_list,
|
||||
inc_event_badge_list = inc_event_badge_list,
|
||||
inc_event_device_list = inc_event_device_list,
|
||||
inc_event_exhibit_list = inc_event_exhibit_list,
|
||||
inc_event_file_list = inc_event_file_list,
|
||||
inc_event_location = inc_event_location,
|
||||
inc_event_location_list = inc_event_location_list,
|
||||
inc_event_person_list = inc_event_person_list,
|
||||
inc_event_presentation_list = inc_event_presentation_list,
|
||||
inc_event_presenter_cat = inc_event_presenter_cat,
|
||||
inc_event_presenter_list = inc_event_presenter_list,
|
||||
inc_event_registration_list = inc_event_registration_list,
|
||||
inc_event_session_list = inc_event_session_list,
|
||||
inc_event_track = inc_event_track,
|
||||
inc_event_track_list = inc_event_track_list,
|
||||
inc_event_cfg = inc_event_cfg,
|
||||
inc_event_registration_cfg = inc_event_registration_cfg,
|
||||
inc_location_address = inc_location_address,
|
||||
inc_poc_event_person = inc_poc_event_person,
|
||||
):
|
||||
# event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
pass
|
||||
|
||||
@@ -289,26 +289,26 @@ async def get_event_session_obj(
|
||||
return mk_resp(data=None, status_code=404)
|
||||
|
||||
if event_session_obj := load_event_session_obj(
|
||||
event_session_id=event_session_id,
|
||||
enabled=enabled,
|
||||
limit=limit,
|
||||
inc_address=inc_address,
|
||||
inc_contact=inc_contact,
|
||||
inc_event_abstract_list=inc_event_abstract_list,
|
||||
inc_event_badge_list=inc_event_badge_list,
|
||||
inc_event_device_list=inc_event_device_list,
|
||||
inc_event_file_list=inc_event_file_list,
|
||||
inc_event_location=inc_event_location,
|
||||
inc_event_person=inc_event_person,
|
||||
inc_event_person_list=inc_event_person_list,
|
||||
inc_event_presentation_list=inc_event_presentation_list,
|
||||
inc_event_presenter_cat=inc_event_presenter_cat,
|
||||
inc_event_presenter_list=inc_event_presenter_list,
|
||||
inc_event_registration_list=inc_event_registration_list,
|
||||
inc_event_track=inc_event_track,
|
||||
inc_poc_event_person=inc_poc_event_person,
|
||||
inc_person=inc_person,
|
||||
inc_user=inc_user,
|
||||
event_session_id = event_session_id,
|
||||
enabled = enabled,
|
||||
limit = limit,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_event_abstract_list = inc_event_abstract_list,
|
||||
inc_event_badge_list = inc_event_badge_list,
|
||||
inc_event_device_list = inc_event_device_list,
|
||||
inc_event_file_list = inc_event_file_list,
|
||||
inc_event_location = inc_event_location,
|
||||
inc_event_person = inc_event_person,
|
||||
inc_event_person_list = inc_event_person_list,
|
||||
inc_event_presentation_list = inc_event_presentation_list,
|
||||
inc_event_presenter_cat = inc_event_presenter_cat,
|
||||
inc_event_presenter_list = inc_event_presenter_list,
|
||||
inc_event_registration_list = inc_event_registration_list,
|
||||
inc_event_track = inc_event_track,
|
||||
inc_poc_event_person = inc_poc_event_person,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
event_session_dict = event_session_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
pass
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
import datetime
|
||||
#from datetime import datetime, time, timedelta
|
||||
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, status
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
from app.lib_general import *
|
||||
from ..log import *
|
||||
from app.lib_general import log, logging
|
||||
from app.config import settings
|
||||
from app.db_sql import *
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
|
||||
|
||||
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.membership_methods import load_membership_obj
|
||||
|
||||
from app.models.membership_models import Membership_Base
|
||||
from app.methods.membership_methods import load_membership_obj
|
||||
from app.models.response_models import *
|
||||
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
@@ -179,8 +178,64 @@ async def lookup_membership_obj(
|
||||
return mk_resp(data=data)
|
||||
|
||||
|
||||
@router.get('/{obj_id}', response_model=Resp_Body_Base)
|
||||
|
||||
# ### BEGIN ### API Membership ### get_membership_obj() ###
|
||||
# Working well as of 2021-06-04. Using as a template for other routes.
|
||||
@router.get('/{membership_id}', response_model=Resp_Body_Base)
|
||||
async def get_membership_obj(
|
||||
membership_id: str = Query(..., min_length=1, max_length=22),
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
limit: int = 500, # For now this covers any included objects or object lists
|
||||
inc_address: bool = False, # Per member
|
||||
inc_contact: bool = False, # Per member
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_list: bool = False, # Per member
|
||||
inc_membership_member_list: bool = False,
|
||||
inc_membership_profile: bool = False, # Per member
|
||||
inc_organization: bool = False, # Per member
|
||||
inc_person: bool = False, # Per member
|
||||
inc_product: bool = False, # Per member
|
||||
inc_product_list: bool = False,
|
||||
inc_user: bool = False, # Per member
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_id := redis_lookup_id_random(record_id_random=membership_id, table_name='membership'): pass
|
||||
else:
|
||||
return mk_resp(data=None, status_code=404)
|
||||
|
||||
if membership_obj := load_membership_obj(
|
||||
membership_id = membership_id,
|
||||
enabled = enabled,
|
||||
# model_as_dict = model_as_dict,
|
||||
limit = limit,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_cfg = inc_membership_cfg,
|
||||
inc_membership_group_list = inc_membership_group_list,
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_profile = inc_membership_profile,
|
||||
inc_organization = inc_organization,
|
||||
inc_person = inc_person,
|
||||
inc_product = inc_product,
|
||||
inc_product_list = inc_product_list,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
# membership_dict = membership_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
pass
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
|
||||
return mk_resp(data=membership_obj)
|
||||
# ### END ### API Membership ### get_membership_obj() ###
|
||||
|
||||
|
||||
@router.get('/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def get_membership_obj_old(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
|
||||
Reference in New Issue
Block a user