diff --git a/app/methods/archive_content_methods.py b/app/methods/archive_content_methods.py index 5d02d7f..b8964d4 100644 --- a/app/methods/archive_content_methods.py +++ b/app/methods/archive_content_methods.py @@ -93,8 +93,8 @@ def load_archive_content_obj_list( for archive_content_rec in archive_content_rec_li_result: archive_content_id = archive_content_rec.get('archive_content_id', None) if archive_content_result := load_archive_content_obj( - archive_content_id=archive_content_id, - model_as_dict=model_as_dict, + archive_content_id = archive_content_id, + model_as_dict = model_as_dict, # enabled=enabled, # inc_archive_content_content_list=inc_archive_content_content_list, ): diff --git a/app/methods/archive_methods.py b/app/methods/archive_methods.py index c903fe3..255e3c0 100644 --- a/app/methods/archive_methods.py +++ b/app/methods/archive_methods.py @@ -42,7 +42,7 @@ def load_archive_obj( if archive_content_dict_list := load_archive_content_obj_list( archive_id = archive_id, limit = limit, - model_as_dict = True, + model_as_dict = model_as_dict, enabled = enabled, # inc_archive_content_content_list=inc_archive_content_content_list ): diff --git a/app/methods/event_list_methods.py b/app/methods/event_list_methods.py new file mode 100644 index 0000000..384f62c --- /dev/null +++ b/app/methods/event_list_methods.py @@ -0,0 +1,122 @@ +from __future__ import annotations +import datetime + +from typing import Dict, List, Optional, Set, Union +from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator + +from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update +from app.lib_general import log, logging + +from app.methods.event_methods import load_event_obj + + +# ### BEGIN ### API Event Methods ### load_event_obj_list() ### +def load_event_obj_list( + account_id: int|str, + limit: int = 1000, + model_as_dict: bool = False, + enabled: str = 'enabled', # enabled, disabled, all + inc_contact_1: bool = False, + inc_contact_2: bool = False, + inc_contact_3: bool = False, + inc_event_abstract_list: bool = False, + inc_event_badge_list: bool = False, + inc_event_cfg: bool = False, + inc_event_device_list: bool = False, + inc_event_exhibit_list: bool = False, + inc_event_file_list: bool = False, + inc_event_location: bool = False, # For event_session child object + inc_event_location_list: bool = False, + inc_event_person_list: bool = False, + inc_event_presentation_list: bool = False, + inc_event_presenter_cat: bool = False, # For event_session child object + inc_event_presenter_list: bool = False, + inc_event_registration_cfg: bool = False, + inc_event_registration_list: bool = False, + inc_event_session_list: bool = False, + inc_event_track: bool = False, # For event_session child object + inc_event_track_list: bool = False, + inc_location_address: bool = False, + inc_poc_event_person: bool = False, + inc_person: bool = False, + inc_user: bool = False, + ) -> list|bool: + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass + else: return False + + data = {} + data['account_id'] = account_id + + if enabled in ['enabled', 'disabled', 'all']: + if enabled == 'enabled': + data['enable'] = True + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'disabled': + data['enable'] = False + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'all': + sql_enabled = '' + # else: tbl_obj['account'] = None + + if limit: + data['limit'] = limit + sql_limit = f'LIMIT :limit' + else: + sql_limit = '' + + sql = f""" + SELECT `tbl`.id AS 'event_id', `tbl`.id_random AS 'event_id_random' + FROM `event` AS `tbl` + WHERE `tbl`.account_id = :account_id + {sql_enabled} + ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC + {sql_limit}; + """ + + if event_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_rec_li_result) + event_result_li = [] + for event_rec in event_rec_li_result: + event_id = event_rec.get('event_id', None) + if event_result := load_event_obj( + event_id = event_id, + limit = limit, + model_as_dict = model_as_dict, + enabled = enabled, + # inc_location_address = inc_address, + # inc_contact_1 = inc_contact, + # inc_contact_2 = inc_contact, + # inc_contact_3 = 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_exhibit_list = inc_event_exhibit_list, + inc_event_file_list = inc_event_file_list, + 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_list = inc_event_presenter_list, + inc_event_registration_list = inc_event_registration_list, + inc_event_session_list = inc_event_session_list, + inc_event_track_list = inc_event_track_list, + # inc_person = inc_person, + # inc_user = inc_user, + ): + log.debug(event_result) + event_result_li.append(event_result) + else: + log.debug(event_result) + event_result_li.append(None) + log.debug(event_result_li) + else: + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_rec_li_result) + event_result_li = [] + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + + return event_result_li +# ### END ### API Event Methods ### load_event_obj_list() ### diff --git a/app/methods/person_methods.py b/app/methods/person_methods.py index c927f6a..fbbab82 100644 --- a/app/methods/person_methods.py +++ b/app/methods/person_methods.py @@ -10,7 +10,7 @@ from app.lib_general import log, logging from app.methods.address_methods import load_address_obj from app.methods.contact_methods import create_contact_obj, load_contact_obj, update_contact_obj from app.methods.organization_methods import load_organization_obj, update_organization_obj -from app.methods.user_methods import load_user_obj, update_user_obj +from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj from app.models.person_models import Person_Base diff --git a/app/methods/post_comment_list_methods.py b/app/methods/post_comment_list_methods.py new file mode 100644 index 0000000..cb063cb --- /dev/null +++ b/app/methods/post_comment_list_methods.py @@ -0,0 +1,83 @@ +from __future__ import annotations +import datetime + +from typing import Dict, List, Optional, Set, Union +from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator + +from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update +from app.lib_general import log, logging + +from app.methods.post_comment_methods import load_post_comment_obj + + +# ### BEGIN ### API Post Comment Methods ### load_post_comment_obj_list() ### +def load_post_comment_obj_list( + post_id: int|str, + limit: int = 1000, + model_as_dict: bool = False, + enabled: str = 'enabled', # enabled, disabled, all + inc_person: bool = False, + inc_user: bool = False, + ) -> list|bool: + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + if post_id := redis_lookup_id_random(record_id_random=post_id, table_name='post'): pass + else: return False + + data = {} + data['post_id'] = post_id + + if enabled in ['enabled', 'disabled', 'all']: + if enabled == 'enabled': + data['enable'] = True + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'disabled': + data['enable'] = False + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'all': + sql_enabled = '' + # else: tbl_obj['post'] = None + + if limit: + data['limit'] = limit + sql_limit = f'LIMIT :limit' + else: + sql_limit = '' + + sql = f""" + SELECT `tbl`.id AS 'post_comment_id', `tbl`.id_random AS 'post_comment_id_random' + FROM `post_comment` AS `tbl` + WHERE `tbl`.post_id = :post_id + {sql_enabled} + ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC + {sql_limit}; + """ + + if post_comment_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(post_comment_rec_li_result) + post_comment_result_li = [] + for post_comment_rec in post_comment_rec_li_result: + post_comment_id = post_comment_rec.get('post_comment_id', None) + if post_comment_result := load_post_comment_obj( + post_comment_id = post_comment_id, + model_as_dict = model_as_dict, + # enabled = enabled, + inc_person = inc_person, + inc_user = inc_user, + ): + log.debug(post_comment_result) + post_comment_result_li.append(post_comment_result) + else: + log.debug(post_comment_result) + post_comment_result_li.append(None) + log.debug(post_comment_result_li) + else: + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(post_comment_rec_li_result) + post_comment_result_li = [] + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + + return post_comment_result_li +# ### END ### API Post Comment Methods ### load_post_comment_obj_list() ### diff --git a/app/methods/post_comment_methods.py b/app/methods/post_comment_methods.py index 19a985c..6c410b4 100644 --- a/app/methods/post_comment_methods.py +++ b/app/methods/post_comment_methods.py @@ -7,8 +7,10 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update from app.lib_general import log, logging -from app.methods.person_methods import create_person_obj, load_person_obj, update_person_obj -from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj +# from app.methods.person_methods import load_person_obj +# from app.methods.post_comment_list_methods import load_post_comment_obj_list +# from app.methods.user_methods import load_user_obj +# from app.methods.user_methods import load_user_obj from app.models.post_comment_models import Post_Comment_Base diff --git a/app/methods/post_list_methods.py b/app/methods/post_list_methods.py new file mode 100644 index 0000000..791f2dd --- /dev/null +++ b/app/methods/post_list_methods.py @@ -0,0 +1,85 @@ +from __future__ import annotations +import datetime + +from typing import Dict, List, Optional, Set, Union +from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator + +from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update +from app.lib_general import log, logging + +from app.methods.post_methods import load_post_obj + + +# ### BEGIN ### API Post Methods ### load_post_obj_list() ### +def load_post_obj_list( + account_id: int|str, + limit: int = 1000, + model_as_dict: bool = False, + enabled: str = 'enabled', # enabled, disabled, all + inc_post_comment_list: bool = False, + inc_person: bool = False, + inc_user: bool = False, + ) -> list|bool: + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass + else: return False + + data = {} + data['account_id'] = account_id + + if enabled in ['enabled', 'disabled', 'all']: + if enabled == 'enabled': + data['enable'] = True + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'disabled': + data['enable'] = False + sql_enabled = f'AND `tbl`.enable = :enable' + elif enabled == 'all': + sql_enabled = '' + # else: tbl_obj['account'] = None + + if limit: + data['limit'] = limit + sql_limit = f'LIMIT :limit' + else: + sql_limit = '' + + sql = f""" + SELECT `tbl`.id AS 'post_id', `tbl`.id_random AS 'post_id_random' + FROM `post` AS `tbl` + WHERE `tbl`.account_id = :account_id + {sql_enabled} + ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC + {sql_limit}; + """ + + if post_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(post_rec_li_result) + post_result_li = [] + for post_rec in post_rec_li_result: + post_id = post_rec.get('post_id', None) + if post_result := load_post_obj( + post_id = post_id, + model_as_dict = model_as_dict, + enabled = enabled, + inc_post_comment_list = inc_post_comment_list, + inc_person = inc_person, + inc_user = inc_user, + ): + log.debug(post_result) + post_result_li.append(post_result) + else: + log.debug(post_result) + post_result_li.append(None) + log.debug(post_result_li) + else: + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(post_rec_li_result) + post_result_li = [] + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + + return post_result_li +# ### END ### API Post Methods ### load_post_obj_list() ### diff --git a/app/methods/post_methods.py b/app/methods/post_methods.py index 40b06c3..4257734 100644 --- a/app/methods/post_methods.py +++ b/app/methods/post_methods.py @@ -7,9 +7,10 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update from app.lib_general import log, logging -from app.methods.person_methods import create_person_obj, load_person_obj, update_person_obj -from app.methods.post_comment_methods import create_post_comment_obj, load_post_comment_obj, update_post_comment_obj -from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj +# from app.methods.person_methods import load_person_obj +# from app.methods.post_comment_methods import create_post_comment_obj, update_post_comment_obj +from app.methods.post_comment_methods import load_post_comment_obj_list +# from app.methods.user_methods import load_user_obj from app.models.post_models import Post_Base @@ -81,7 +82,7 @@ def load_post_obj( if post_comment_dict_list := load_post_comment_obj_list( post_id = post_id, limit = limit, - model_as_dict = True, + model_as_dict = model_as_dict, enabled = enabled, inc_person = inc_person, inc_user = inc_user, diff --git a/app/methods/test user_load_methods.py b/app/methods/test user_load_methods.py new file mode 100644 index 0000000..075ee55 --- /dev/null +++ b/app/methods/test user_load_methods.py @@ -0,0 +1,128 @@ +from __future__ import annotations +import datetime + +from typing import Dict, List, Optional, Set, Union +from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator + +from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update +from app.lib_general import log, logging + +from app.methods.contact_methods import load_contact_obj +# from app.methods.event_methods import load_event_obj_list +from app.methods.organization_methods import load_organization_obj +# from app.methods.person_methods import load_person_obj +# from app.methods.post_methods import load_post_obj_list + +from app.models.user_models import User_Base, User_New_Base, User_Out_Base +from app.models.user_role_models import User_Role_Base + + +# ### BEGIN ### API User Methods ### load_user_obj() ### +def load_user_obj( + user_id: int|str, + limit: int = 1000, + model_as_dict: bool = False, + enabled: str = 'enabled', # enabled, disabled, all + inc_address: bool = False, + inc_contact: bool = False, + inc_event_list: bool = False, + inc_journal_list: bool = False, + inc_membership: bool = False, + inc_order_list: bool = False, + inc_order_cart_list: bool = False, + inc_organization: bool = False, + inc_person: bool = False, + inc_post_list: bool = False, + inc_post_comment_list: bool = False, + inc_user_role_list: bool = False, + ) -> User_Out_Base|bool: + #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass + else: return False + + if user_rec := sql_select(table_name='v_user', record_id=user_id): pass + else: return False + + #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(user_rec) + + try: + user_obj = User_Out_Base(**user_rec) + log.debug(user_obj) + except ValidationError as e: + log.error(e.json()) + return False + + if inc_contact: + contact_id = user_rec.get('contact_id', None) + if contact_obj_result := load_contact_obj(contact_id=contact_id): + contact_obj = contact_obj_result + user_rec['contact'] = contact_obj + log.debug(user_rec) + user_obj.contact = contact_obj + else: + user_rec['contact'] = None + user_obj.contact = None + + if inc_event_list: + if event_dict_list := load_event_obj_list( + user_id = user_id, + limit = limit, + model_as_dict = model_as_dict, + enabled = enabled, + ): + user_obj.event_list = event_dict_list + else: user_obj.event_list = None + + + if inc_organization: + organization_id = user_rec.get('organization_id', None) + if organization_obj_result := load_organization_obj(organization_id=organization_id): + organization_obj = organization_obj_result + user_rec['organization'] = organization_obj + log.debug(user_rec) + user_obj.organization = organization_obj + else: + user_rec['organization'] = None + user_obj.organization = None + + # if inc_person: + # person_id = user_rec.get('person_id', None) + # if person_obj_result := load_person_obj(person_id=person_id): + # person_obj = person_obj_result + # user_rec['person'] = person_obj + # log.debug(user_rec) + # user_obj.person = person_obj + # else: + # user_rec['person'] = None + # user_obj.person = None + + if inc_post_list: + if post_dict_list := load_post_obj_list( + user_id = user_id, + limit = limit, + model_as_dict = model_as_dict, + enabled = enabled, + ): + user_obj.post_list = post_dict_list + else: user_obj.post_list = None + + + # NOTE: Including user roles should probably be reviewed + if inc_user_role_list: + if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True): + user_rec['role_list'] = role_rec_li + #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(role_rec_li) + user_obj.role_list = role_rec_li + else: + user_rec['role_list'] = None + user_obj.role_list = None + + #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(user_rec) + + return user_obj +# ### END ### API User Methods ### load_user_obj() ### diff --git a/app/methods/user_methods.py b/app/methods/user_methods.py index dd9c714..b95bbfe 100644 --- a/app/methods/user_methods.py +++ b/app/methods/user_methods.py @@ -8,8 +8,10 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat from app.lib_general import log, logging from app.methods.contact_methods import load_contact_obj, update_contact_obj +# from app.methods.event_methods import load_event_obj_list from app.methods.organization_methods import load_organization_obj, update_organization_obj # from app.methods.person_methods import load_person_obj, update_person_obj +# from app.methods.post_list_methods import load_post_obj_list from app.models.user_models import User_Base, User_New_Base, User_Out_Base from app.models.user_role_models import User_Role_Base @@ -72,9 +74,20 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool: # ### BEGIN ### API User Methods ### load_user_obj() ### def load_user_obj( user_id: int|str, + limit: int = 1000, + model_as_dict: bool = False, + enabled: str = 'enabled', # enabled, disabled, all + inc_address: bool = False, inc_contact: bool = False, + inc_event_list: bool = False, + inc_journal_list: bool = False, + inc_membership: bool = False, + inc_order_list: bool = False, + inc_order_cart_list: bool = False, inc_organization: bool = False, inc_person: bool = False, + inc_post_list: bool = False, + inc_post_comment_list: bool = False, inc_user_role_list: bool = False, ) -> User_Out_Base|bool: #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -107,6 +120,17 @@ def load_user_obj( user_rec['contact'] = None user_obj.contact = None + if inc_event_list: + if event_dict_list := load_event_obj_list( + user_id = user_id, + limit = limit, + model_as_dict = model_as_dict, + enabled = enabled, + ): + user_obj.event_list = event_dict_list + else: user_obj.event_list = None + + if inc_organization: organization_id = user_rec.get('organization_id', None) if organization_obj_result := load_organization_obj(organization_id=organization_id): @@ -129,6 +153,17 @@ def load_user_obj( # user_rec['person'] = None # user_obj.person = None + if inc_post_list: + if post_dict_list := load_post_obj_list( + user_id = user_id, + limit = limit, + model_as_dict = model_as_dict, + enabled = enabled, + ): + user_obj.post_list = post_dict_list + else: user_obj.post_list = None + + # NOTE: Including user roles should probably be reviewed if inc_user_role_list: if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True): diff --git a/app/routers/event_person.py b/app/routers/event_person.py index cc972dd..69ff77b 100644 --- a/app/routers/event_person.py +++ b/app/routers/event_person.py @@ -11,7 +11,8 @@ from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_ from app.methods.event_person_methods import create_event_person_obj, load_event_person_obj, update_event_person_obj from app.methods.person_methods import create_person_obj, load_person_obj -from app.methods.user_methods import create_user_obj, load_user_obj +from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj +# from app.methods.user_load_methods import load_user_obj from app.models.event_person_models import Event_Person_New_Base, Event_Person_Base from app.models.person_models import Person_Base diff --git a/app/routers/user.py b/app/routers/user.py index f435f5c..a30fc80 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -567,10 +567,10 @@ async def get_user_obj_new( 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 inc_address: bool = False, # Priority l1 - inc_archive_list: bool = False, # Priority l3 + # inc_archive_list: bool = False, # Priority l3 inc_contact: bool = False, # Priority l1 inc_event_list: bool = False, # Priority l1 - inc_hosted_file_list: bool = False, # Priority l3 + # inc_hosted_file_list: bool = False, # Priority l3 inc_journal_list: bool = False, # Priority l2 # inc_journal_entry_list: bool = False, # Priority l3 inc_membership: bool = False, # Priority l2 @@ -582,7 +582,7 @@ async def get_user_obj_new( inc_person: bool = False, # Priority l1 # inc_person_list: bool = False, inc_post_list: bool = False, # Priority l2 - inc_post_comment_list: bool = False, # Priority l3 + # inc_post_comment_list: bool = False, # Priority l3 inc_user_role_list: bool = False, # Priority l1 x_account_id: str = Header(...), by_alias: Optional[bool] = True, @@ -616,7 +616,7 @@ async def get_user_obj_new( inc_person = inc_person, # inc_person_list = inc_person_list, inc_post_list = inc_post_list, - inc_post_comment_list = inc_post_comment_list, + # inc_post_comment_list = inc_post_comment_list, inc_user_role_list = inc_user_role_list, ): if isinstance(user_dict, dict):