diff --git a/app/methods/cont_edu_cert_person_methods.py b/app/methods/cont_edu_cert_person_methods.py index c2b724e..6f5420b 100644 --- a/app/methods/cont_edu_cert_person_methods.py +++ b/app/methods/cont_edu_cert_person_methods.py @@ -61,8 +61,10 @@ def load_cont_edu_cert_person_obj( # ### BEGIN ### API Cont Edu Cert Person Methods ### get_cont_edu_cert_person_rec_list() ### +# Updated 2021-10-01 def get_cont_edu_cert_person_rec_list( account_id: str = None, + person_id: str = None, cont_edu_cert_id: str = None, given_name: str = None, family_name: str = None, @@ -74,12 +76,17 @@ def get_cont_edu_cert_person_rec_list( # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if cont_edu_cert_id := redis_lookup_id_random(record_id_random=cont_edu_cert_id, table_name='cont_edu_cert'): pass - else: return False + if cont_edu_cert_id: + if cont_edu_cert_id := redis_lookup_id_random(record_id_random=cont_edu_cert_id, table_name='cont_edu_cert'): pass + else: return False + data = {} if account_id: data['account_id'] = account_id sql_where_id = f'`tbl`.account_id = :account_id' + elif person_id: + data['person_id'] = person_id + sql_where_id = f'`tbl`.person_id = :person_id' elif cont_edu_cert_id: data['cont_edu_cert_id'] = cont_edu_cert_id sql_where_id = f'`tbl`.cont_edu_cert_id = :cont_edu_cert_id' diff --git a/app/routers/cont_edu_cert_person.py b/app/routers/cont_edu_cert_person.py index 5ff05a8..81a29a2 100644 --- a/app/routers/cont_edu_cert_person.py +++ b/app/routers/cont_edu_cert_person.py @@ -90,7 +90,7 @@ async def patch_cont_edu_cert_person_json( if cont_edu_cert_person_id := redis_lookup_id_random(record_id_random=cont_edu_cert_person_id, table_name='cont_edu_cert_person'): pass else: - return mk_resp(data=None, status_code=404) + return mk_resp(data=None, status_code=404, response=response) if cont_edu_cert_person_obj_up_result := update_cont_edu_cert_person_obj( cont_edu_cert_person_id=cont_edu_cert_person_id, @@ -102,9 +102,9 @@ async def patch_cont_edu_cert_person_json( if return_obj: cont_edu_cert_person_obj = load_cont_edu_cert_person_obj(cont_edu_cert_person_id=cont_edu_cert_person_id) cont_edu_cert_person_dict = cont_edu_cert_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) - return mk_resp(data=cont_edu_cert_person_dict) + return mk_resp(data=cont_edu_cert_person_dict, response=response) else: - return mk_resp(data=cont_edu_cert_person_obj_up_result) + return mk_resp(data=cont_edu_cert_person_obj_up_result, response=response) else: return mk_resp(data=False, status_code=400, response=response) # Bad Request # ### END ### API Cont Edu Cert Person ### patch_cont_edu_cert_person_json() ### @@ -158,7 +158,7 @@ async def get_cont_edu_cert_person_obj_li( resp_data = base_name(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset) resp_data_li.append(resp_data) - return mk_resp(data=resp_data_li) + return mk_resp(data=resp_data_li, response=response) else: log.debug(sql_result) return mk_resp(data=False, status_code=404, response=response) @@ -271,7 +271,7 @@ async def search_cont_edu_cert_person_obj_li( resp_data = Cont_Edu_Cert_Person_Base(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset) resp_data_li.append(resp_data) - return mk_resp(data=resp_data_li) + return mk_resp(data=resp_data_li, response=response) else: log.debug(sql_result) return mk_resp(data=False, status_code=404, response=response) @@ -295,7 +295,7 @@ async def get_cont_edu_cert_person_obj( log.debug(locals()) if cont_edu_cert_person_id := redis_lookup_id_random(record_id_random=cont_edu_cert_person_id, table_name='cont_edu_cert_person'): pass - else: return mk_resp(data=None, status_code=404) + else: return mk_resp(data=None, status_code=404, response=response) cont_edu_cert_person_obj = load_cont_edu_cert_person_obj( cont_edu_cert_person_id = cont_edu_cert_person_id, @@ -307,7 +307,7 @@ async def get_cont_edu_cert_person_obj( inc_cont_edu_cert = inc_cont_edu_cert, ) cont_edu_cert_person_dict = cont_edu_cert_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) - return mk_resp(data=cont_edu_cert_person_dict) + return mk_resp(data=cont_edu_cert_person_dict, response=response) # ### END ### API Cont Edu Cert Person ### get_cont_edu_cert_person_obj() ### @@ -328,7 +328,7 @@ async def get_account_obj_cont_edu_cert_person_list( log.debug(locals()) if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass - else: return mk_resp(data=None, status_code=404) + else: return mk_resp(data=None, status_code=404, response=response) response_data = None # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -357,7 +357,52 @@ async def get_account_obj_cont_edu_cert_person_list( else: 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 Cont Edu Cert Person ### get_account_obj_cont_edu_cert_person_list() ### + + +# ### BEGIN ### API Cont Edu Cert Person ### get_person_obj_cont_edu_cert_person_list() ### +# Updated 2021-07-28 +@router.get('/person/{person_id}/cont_edu/cert/person/list', response_model=Resp_Body_Base) +async def get_person_obj_cont_edu_cert_person_list( + person_id: str = Query(..., min_length=11, max_length=22), + 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 + x_account_id: str = Header(...), + by_alias: Optional[bool] = True, + exclude_unset: Optional[bool] = True, + response: Response = Response, + ): + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + 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) + + # Updated 2021-10-01 + if cont_edu_cert_person_rec_list_result := get_cont_edu_cert_person_rec_list( + person_id = person_id, + enabled = enabled, + limit = limit, + ): + cont_edu_cert_person_result_list = [] + for cont_edu_cert_person_rec in cont_edu_cert_person_rec_list_result: + if load_cont_edu_cert_person_result := load_cont_edu_cert_person_obj( + cont_edu_cert_person_id = cont_edu_cert_person_rec.get('cont_edu_cert_person_id', None), + limit = limit, + by_alias = by_alias, + exclude_unset = exclude_unset, + # model_as_dict = model_as_dict, + enabled = enabled, + ): + cont_edu_cert_person_result_list.append(load_cont_edu_cert_person_result) + else: + cont_edu_cert_person_result_list.append(None) + response_data = cont_edu_cert_person_result_list + else: + return mk_resp(data=False, status_code=400, response=response) # Bad Request + + return mk_resp(data=response_data, response=response) # ### END ### API Cont Edu Cert Person ### get_account_obj_cont_edu_cert_person_list() ### @@ -378,7 +423,7 @@ async def get_cont_edu_cert_obj_cont_edu_cert_person_list( log.debug(locals()) if cont_edu_cert_id := redis_lookup_id_random(record_id_random=cont_edu_cert_id, table_name='cont_edu_cert'): pass - else: return mk_resp(data=None, status_code=404) + else: return mk_resp(data=None, status_code=404, response=response) response_data = None # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -407,7 +452,7 @@ async def get_cont_edu_cert_obj_cont_edu_cert_person_list( else: 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 Cont Edu Cert Person ### get_cont_edu_cert_obj_cont_edu_cert_person_list() ###