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

Just lots of work and tweeks

Browse Source
This commit is contained in:
Scott Idem
2021-12-15 21:51:58 -05:00
parent 7066715495
commit 398897efe1
4 changed files with 167 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/methods/person_methods.py
View File

@@ -1,5 +1,5 @@
from __future__ import annotations from __future__ import annotations
import datetime import datetime, pytz
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
@@ -20,8 +20,10 @@ from app.models.person_models import Person_Base
# ### BEGIN ### API Person Methods ### load_person_obj() ### # ### BEGIN ### API Person Methods ### load_person_obj() ###
# Updated 2021-12-15
def load_person_obj( def load_person_obj(
person_id: int|str, person_id: int|str,
auth_key: str = None,
limit: int = 1000, limit: int = 1000,
by_alias: bool = True, by_alias: bool = True,
exclude_unset: bool = True, exclude_unset: bool = True,
@@ -57,16 +59,78 @@ def load_person_obj(
inc_user: bool = False, inc_user: bool = False,
inc_user_role_list: bool = False, inc_user_role_list: bool = False,
) -> Person_Base|dict|bool: ) -> Person_Base|dict|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
else: return False else: return None
if person_rec := sql_select(table_name='v_person', record_id=person_id): pass if auth_key:
else: return False sql = f"""
SELECT *
FROM `v_person` AS person
WHERE person.id = :person_id
AND person.allow_auth_key = 1
AND person.auth_key = :auth_key
LIMIT 1
;
"""
log.debug(sql)
data = {}
data['person_id'] = person_id
data['auth_key'] = auth_key
log.debug(data)
if person_rec := sql_select(sql=sql, data=data):
# Only wipe the key if the last update to person record was more than X minutes
updated_on = person_rec.get('updated_on')
updated_on_string = updated_on.isoformat()
log.debug(updated_on_string)
eastern = pytz.timezone('US/Eastern')
updated_on_localized = eastern.localize(updated_on)
log.debug(updated_on_localized.isoformat())
# updated_on_utc = person_rec.get('updated_on').replace(tzinfo=datetime.timezone.utc)
# updated_on_tz = person_rec.get('updated_on').replace(tzinfo=eastern)
# updated_on_tz_string = updated_on_tz.isoformat()
# log.debug(updated_on_tz_string)
current_datetime_utc = datetime.datetime.utcnow()
current_datetime_utc_string = current_datetime_utc.isoformat()
log.debug(current_datetime_utc_string)
# datetime_difference = current_datetime_utc - updated_on_localized
# total_seconds = datetime_difference.total_seconds()
# log.debug(total_seconds)
current_datetime_utc_localize = pytz.utc.localize(current_datetime_utc)
current_datetime_utc_localize_string = current_datetime_utc_localize.isoformat()
# test_datetime_utc = datetime.datetime.utcnow()- datetime.timedelta(seconds=120)
datetime_difference = current_datetime_utc_localize - updated_on_localized
total_seconds = datetime_difference.total_seconds()
log.debug(total_seconds)
if total_seconds > 7200: # 7200 seconds = 2 hours
log.warning('The authorization key has expired')
update_person_data = {}
update_person_data['id'] = person_id
update_person_data['auth_key'] = None # secrets.token_urlsafe(default_num_bytes)
if person_rec_update_result := sql_update(table_name='person', data=update_person_data):
log.info('The person record was updated with a new auth_key')
else:
log.warning('The authorization key is still valid')
else: return person_rec # None or False
else:
if person_rec := sql_select(table_name='v_person', record_id=person_id): pass
else: return person_rec # None or False
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(person_rec) log.debug(person_rec)
try: try:

11
app/models/person_models.py
View File

@@ -56,7 +56,7 @@ class Person_Base(BaseModel):
suffix: Optional[str] # NOTE: Phasing out! Use *designations* instead. suffix: Optional[str] # NOTE: Phasing out! Use *designations* instead.
professional_title: Optional[str] # Professional title professional_title: Optional[str] # Professional title
title: Optional[str] # NOTE: Phasing out! Use *professional_title* instead. # title: Optional[str] # NOTE: Phasing out! Use *professional_title* instead.
display_name: Optional[str] # Custom what they want for public display display_name: Optional[str] # Custom what they want for public display
informal_display_name: Optional[str] # Custom what they want for informal public display informal_display_name: Optional[str] # Custom what they want for informal public display
@@ -75,10 +75,10 @@ class Person_Base(BaseModel):
# END # Auto created name variations # END # Auto created name variations
affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups
affiliation: Optional[str] # NOTE: Phasing out! Use *affiliations* instead. # affiliation: Optional[str] # NOTE: Phasing out! Use *affiliations* instead.
organization_name: Optional[str] # NOTE: Phasing out! Use *affiliations* instead. # organization_name: Optional[str] # NOTE: Phasing out! Use *affiliations* instead.
tagline: Optional[str] tagline: Optional[Union[None, str]]
birth_date: Optional[datetime.date] birth_date: Optional[datetime.date]
lu_gender_id: Optional[int] lu_gender_id: Optional[int]
@@ -90,6 +90,9 @@ class Person_Base(BaseModel):
external_id: Optional[str] external_id: Optional[str]
external_import_id: Optional[str] external_import_id: Optional[str]
allow_auth_key: Optional[bool]
auth_key: Optional[str]
enable: Optional[bool] enable: Optional[bool]
group: Optional[str] group: Optional[str]

78
app/routers/event.py
View File

@@ -256,45 +256,45 @@ async def get_event_obj(
else: return mk_resp(data=None, status_code=404, response=response) else: return mk_resp(data=None, status_code=404, response=response)
if event_obj := load_event_obj( if event_obj := load_event_obj(
event_id = event_id, event_id = event_id,
enabled = enabled, enabled = enabled,
approved = approved, approved = approved,
hidden = hidden, hidden = hidden,
review = review, review = review,
inc_file_count = inc_file_count, inc_file_count = inc_file_count,
inc_address = inc_address, inc_address = inc_address,
# inc_address_location = inc_address_location, # inc_address_location = inc_address_location,
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_list = inc_event_badge_list, # inc_event_badge_list = inc_event_badge_list,
inc_event_cfg = inc_event_cfg, inc_event_cfg = inc_event_cfg,
# 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_location_list = inc_event_location_list, inc_event_location_list = inc_event_location_list,
# inc_event_person = inc_event_person, # inc_event_person = inc_event_person,
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_cat = inc_event_presenter_cat, inc_event_presenter_cat = inc_event_presenter_cat,
inc_event_presenter_list = inc_event_presenter_list, inc_event_presenter_list = inc_event_presenter_list,
inc_event_registration_cfg = inc_event_registration_cfg, inc_event_registration_cfg = inc_event_registration_cfg,
# inc_event_registration_list = inc_event_registration_list, # inc_event_registration_list = inc_event_registration_list,
inc_event_session_list = inc_event_session_list, inc_event_session_list = inc_event_session_list,
# inc_event_track = inc_event_track, # inc_event_track = inc_event_track,
# inc_event_track_list = inc_event_track_list, # inc_event_track_list = inc_event_track_list,
# inc_order_list = inc_order_list, # inc_order_list = inc_order_list,
inc_organization = inc_organization, inc_organization = inc_organization,
inc_person = inc_person, inc_person = inc_person,
inc_poc_event_person = inc_poc_event_person, inc_poc_event_person = inc_poc_event_person,
# inc_product = inc_product, # inc_product = inc_product,
# inc_product_list = inc_product_list, # inc_product_list = inc_product_list,
inc_user = inc_user, inc_user = inc_user,
limit = limit, limit = limit,
by_alias = by_alias, by_alias = by_alias,
exclude_unset = exclude_unset, exclude_unset = exclude_unset,
# model_as_dict = model_as_dict, # model_as_dict = model_as_dict,
): ):
# event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass pass
else: else:

90
app/routers/person.py
View File

@@ -185,6 +185,7 @@ async def v3_patch_person_obj_exist(
else: return mk_resp(data=False, status_code=400, response=response, status_message='The person was not updated. Check the field names and data types.') else: return mk_resp(data=False, status_code=400, response=response, status_message='The person was not updated. Check the field names and data types.')
if isinstance(create_update_person_obj_result, int): if isinstance(create_update_person_obj_result, int):
log.info('Create/Update successful')
person_id = create_update_person_obj_result person_id = create_update_person_obj_result
if return_obj: if return_obj:
if load_person_obj_result := load_person_obj( if load_person_obj_result := load_person_obj(
@@ -474,10 +475,11 @@ async def email_create_url(
# ### BEGIN ### API Person ### get_person_obj() ### # ### BEGIN ### API Person ### get_person_obj() ###
# Working well as of 2021-06-25. Using as a template for other routes. # Updated 2021-12-15
@router.get('/person/{person_id}', response_model=Resp_Body_Base) @router.get('/person/{person_id}', response_model=Resp_Body_Base)
async def get_person_obj( async def get_person_obj(
person_id: str = Query(..., min_length=1, max_length=22), person_id: str = Query(..., min_length=11, max_length=22),
auth_key: str = Query(None, min_length=11, max_length=22), # If passed, it must match in the person record. New 2021-12-15
limit: int = 500, # For now this covers any included objects or object lists limit: int = 500, # For now this covers any included objects or object lists
enabled: str = 'enabled', # For now this covers any included objects or object lists enabled: str = 'enabled', # For now this covers any included objects or object lists
inc_address: bool = False, # Priority l1 inc_address: bool = False, # Priority l1
@@ -512,50 +514,60 @@ async def get_person_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
else: return mk_resp(data=None, status_code=404, response=response) else: return mk_resp(data=None, status_code=404, response=response)
if person_dict := load_person_obj( if person_rec_result := load_person_obj(
person_id = person_id, person_id = person_id,
limit = limit, auth_key = auth_key,
exclude_unset = False, limit = limit,
model_as_dict = False, # NOTE: returning model as a dict exclude_unset = False,
enabled = enabled, model_as_dict = False, # NOTE: returning model as a dict
inc_address = inc_address, enabled = enabled,
# inc_archive_list = inc_archive_list, inc_address = inc_address,
inc_contact = inc_contact, # inc_archive_list = inc_archive_list,
inc_event_list = inc_event_list, inc_contact = inc_contact,
# inc_hosted_file_list = inc_hosted_file_list, inc_event_list = inc_event_list,
inc_journal_list = inc_journal_list, # inc_hosted_file_list = inc_hosted_file_list,
# inc_journal_entry_list = inc_journal_entry_list, inc_journal_list = inc_journal_list,
inc_membership_group_list = inc_membership_group_list, # inc_journal_entry_list = inc_journal_entry_list,
inc_membership_group_person_list = inc_membership_group_person_list, inc_membership_group_list = inc_membership_group_list,
inc_membership_person = inc_membership_person, inc_membership_group_person_list = inc_membership_group_person_list,
inc_membership_person_profile = inc_membership_person_profile, inc_membership_person = inc_membership_person,
inc_membership_type = inc_membership_type, inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type_person = inc_membership_type_person, inc_membership_type = inc_membership_type,
inc_order_closed_count = inc_order_closed_count, inc_membership_type_person = inc_membership_type_person,
inc_order_line_list = inc_order_line_list, inc_order_closed_count = inc_order_closed_count,
inc_order_list = inc_order_list, inc_order_line_list = inc_order_line_list,
inc_order_cart = inc_order_cart, inc_order_list = inc_order_list,
# inc_order_cart_list = inc_order_cart_list, inc_order_cart = inc_order_cart,
inc_organization = inc_organization, # inc_order_cart_list = inc_order_cart_list,
# inc_organization_list = inc_organization_list, inc_organization = inc_organization,
inc_post_list = inc_post_list, # inc_organization_list = inc_organization_list,
inc_post_comment_list = inc_post_comment_list, inc_post_list = inc_post_list,
inc_user = inc_user, inc_post_comment_list = inc_post_comment_list,
): inc_user = inc_user,
if isinstance(person_dict, dict): ):
response_data = person_dict response_data = person_rec_result
else: # if isinstance(person_rec_result, dict):
response_data = person_dict # response_data = person_rec_result
# else:
# response_data = person_rec_result
# else:
# return mk_resp(data=False, status_code=400, response=response) # Bad Request
elif isinstance(person_rec_result, list) or person_rec_result is None: # Empty list or None
log.info('No results')
if auth_key: log.info('It is likely the auth_key did not match.')
return mk_resp(data=False, status_code=404, response=response) # Not Found
else: else:
log.warning('Likely bad request')
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=response_data) return mk_resp(data=response_data, response=response)
# ### END ### API Person ### get_person_obj() ### # ### END ### API Person ### get_person_obj() ###
@@ -620,7 +632,7 @@ async def get_account_obj_person_list(
else: else:
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=response_data) return mk_resp(data=response_data, response=response)
# ### END ### API Person ### get_account_obj_person_list() ### # ### END ### API Person ### get_account_obj_person_list() ###