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

Finally returning correct HTTP status codes

Browse Source
This commit is contained in:
Scott Idem
2021-08-10 19:06:40 -04:00
parent a1b9d3c518
commit cfd85435f2
29 changed files with 83 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/routers/account.py
View File

@@ -275,7 +275,7 @@ async def get_account_obj_new(
# log.debug(account_result.dict(by_alias=True, exclude_unset=True)) # pylint: disable=no-member
# print('---------------------------')
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Account ### get_account_obj_new() ###
@@ -381,7 +381,7 @@ async def get_account_obj_event_list(
event_result_list.append(None)
response_data = event_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Account ### get_account_obj_event_list() ###

2
app/routers/address.py
View File

@@ -109,7 +109,7 @@ async def patch_address_json(
else:
return mk_resp(data=address_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Address ### patch_address_json() ###

16
app/routers/api.py
View File

@@ -51,7 +51,7 @@ async def request_jwt(
log.debug(locals())
if x_aether_api_secret_key or x_aether_api_token: pass
else: return mk_resp(data=False, status_code=400) # Bad Request
else: return mk_resp(data=False, status_code=400, response=response) # Bad Request
if not x_aether_api_secret_key: max_ttl = 300 # Override any max_ttl if no API secret
if not x_aether_api_secret_key: max_renew = 5 # Override any max_rewnew if no API secret
@@ -68,7 +68,7 @@ async def request_jwt(
if api_key_rec_select_result := sql_select(table_name=table_name_select, field_name=field_name, field_value=field_value): pass
else:
log.warning('No results when looking up the API secret key')
return mk_resp(data=False, status_code=401) # Unauthorized
return mk_resp(data=False, status_code=401, response=response) # Unauthorized
elif x_aether_api_public_key and x_aether_api_token:
table_name_select = 'api_key'
field_name = 'public_key'
@@ -77,31 +77,31 @@ async def request_jwt(
if api_key_rec_select_result := sql_select(table_name=table_name_select, field_name=field_name, field_value=field_value): pass
else:
log.warning('No results when looking up the API public key')
return mk_resp(data=False, status_code=401) # Unauthorized
return mk_resp(data=False, status_code=401, response=response) # Unauthorized
# Check if the API keys are valid
if api_key_rec_select_result.get('enable', None):
api_key_rec = api_key_rec_select_result
else:
log.warning('API secret key not enabled')
return mk_resp(data=False, status_code=401) # Unauthorized
return mk_resp(data=False, status_code=401, response=response) # Unauthorized
current_datetime = datetime.datetime.utcnow() # datetime.datetime.now() Gets server local datetime
if api_key_rec.get('enable_from', None) <= current_datetime and api_key_rec.get('enable_to', None) >= current_datetime:
pass
else:
log.warning('API secret key expired')
return mk_resp(data=False, status_code=401) # Unauthorized
return mk_resp(data=False, status_code=401, response=response) # Unauthorized
if api_secret_key := api_key_rec.get('secret_key', None): pass
else:
log.warning('Secret key was not found')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
if api_public_key := api_key_rec.get('public_key', None): pass
else:
log.warning('Public key was not found')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# Decode the JWT if an API token was sent and the API secret key was sent/found.
if x_aether_api_token and api_public_key and api_secret_key:
@@ -150,7 +150,7 @@ async def get_api_temp_token(
log.debug(f'Contains a value in x_aether_api_key: {x_aether_api_key}')
sql_result = sql_select(table_name=table_name_select, field_name=field_name, field_value=field_value)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if sql_result:

30
app/routers/api_crud.py
View File

@@ -184,22 +184,22 @@ async def get_obj_li(
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1 and obj_type_l2:
obj_name = f'{obj_type_l1}_{obj_type_l2}'
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1:
obj_name = f'{obj_type_l1}'
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
else:
log.warning('We should not be here')
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
table_name = obj_type_li[obj_name]['table_name']
@@ -280,24 +280,24 @@ async def get_obj(
#table_name = obj_type_li[obj_name]['table_name']
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1 and obj_type_l2:
obj_name = f'{obj_type_l1}_{obj_type_l2}'
if obj_name in obj_type_li:
#table_name = obj_type_li[obj_name]['table_name']
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1:
obj_name = f'{obj_type_l1}'
if obj_name in obj_type_li:
#table_name = obj_type_li[obj_name]['table_name']
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
else:
log.warning('We should not be here')
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
table_name = obj_type_li[obj_name]['table_name']
@@ -355,22 +355,22 @@ async def delete_obj(
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1 and obj_type_l2:
obj_name = f'{obj_type_l1}_{obj_type_l2}'
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
elif obj_type_l1:
obj_name = f'{obj_type_l1}'
if obj_name in obj_type_li:
pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
else:
log.warning('We should not be here')
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
table_name = obj_name # obj_type_li[obj_name]['table_name'] # NOTE: Don't try to use the view!
@@ -410,7 +410,7 @@ def post_obj_template(
else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql_insert_result)
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if sql_select_result := sql_select(table_name=table_name_select, record_id=obj_id):
log.debug(sql_select_result)
@@ -456,7 +456,7 @@ def patch_obj_template(
else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql_update_result)
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if sql_select_result := sql_select(table_name=table_name_select, record_id=obj_id):
log.debug(sql_select_result)
@@ -534,7 +534,7 @@ def get_obj_template(
if obj_id:
sql_result = sql_select(table_name=table_name_select, record_id=obj_id)
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=404, response=response)
if sql_result:
log.debug(sql_result)

4
app/routers/cont_edu_cert.py
View File

@@ -106,7 +106,7 @@ async def patch_cont_edu_cert_json(
else:
return mk_resp(data=cont_edu_cert_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Cont Edu Cert ### patch_cont_edu_cert_json() ###
@@ -238,7 +238,7 @@ async def get_account_obj_cont_edu_cert_list(
cont_edu_cert_result_list.append(None)
response_data = cont_edu_cert_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API ### get_account_obj_cont_edu_cert_list() ###

6
app/routers/cont_edu_cert_person.py
View File

@@ -106,7 +106,7 @@ async def patch_cont_edu_cert_person_json(
else:
return mk_resp(data=cont_edu_cert_person_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Cont Edu Cert Person ### patch_cont_edu_cert_person_json() ###
@@ -355,7 +355,7 @@ async def get_account_obj_cont_edu_cert_person_list(
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) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Cont Edu Cert Person ### get_account_obj_cont_edu_cert_person_list() ###
@@ -405,7 +405,7 @@ async def get_cont_edu_cert_obj_cont_edu_cert_person_list(
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) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Cont Edu Cert Person ### get_cont_edu_cert_obj_cont_edu_cert_person_list() ###

2
app/routers/contact.py
View File

@@ -106,7 +106,7 @@ async def patch_contact_json(
else:
return mk_resp(data=contact_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Contact ### patch_contact_json() ###

10
app/routers/event.py
View File

@@ -106,7 +106,7 @@ async def patch_event_json(
else:
return mk_resp(data=event_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event ### patch_event_json() ###
@@ -175,7 +175,7 @@ async def get_event_obj_li(
# sql_for_obj_type_id = f'`test`.test_id = :test_id'
else:
sql_for_obj_type_id = ''
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
@@ -187,7 +187,7 @@ async def get_event_obj_li(
elif enabled == 'all':
sql_enabled = ''
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if from_datetime and to_datetime:
data['from_datetime'] = from_datetime
@@ -340,7 +340,7 @@ async def get_event_obj(
# event_dict = event_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=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_obj)
# ### END ### API Event ### get_event_obj() ###
@@ -407,7 +407,7 @@ async def get_person_event_obj_li(
event_result_list.append(None)
response_data = event_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Event Methods ### get_person_event_obj_li() ###

6
app/routers/event_person.py
View File

@@ -95,7 +95,7 @@ async def post_event_person_new(
person_obj_new = Person_Base(**person_new)
log.debug(person_obj_new)
return mk_resp(data=False, status_code=401) # TESTING TESTING TESTING
return mk_resp(data=False, status_code=401, response=response) # TESTING TESTING TESTING
create_person_obj_result = create_person_obj(person_obj_new=person_obj_new)
if isinstance(create_person_obj_result, int):
@@ -249,7 +249,7 @@ async def patch_event_person_json(
else:
return mk_resp(data=event_person_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event Person ### patch_event_person_json() ###
@@ -310,7 +310,7 @@ async def get_event_person_obj(
# event_dict = event_person_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=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_person_obj)
# ### END ### API Event ### get_event_person_obj() ###

4
app/routers/event_presentation.py
View File

@@ -106,7 +106,7 @@ async def patch_event_presentation_json(
else:
return mk_resp(data=event_presentation_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event Presentation ### patch_event_presentation_json() ###
@@ -164,7 +164,7 @@ async def get_event_presentation_obj(
event_presentation_dict = event_presentation_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=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_presentation_dict)
#return mk_resp(data=event_presentation_obj)

8
app/routers/event_presenter.py
View File

@@ -106,7 +106,7 @@ async def patch_event_presenter_json(
else:
return mk_resp(data=event_presenter_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event Presenter ### patch_event_presenter_json() ###
@@ -153,7 +153,7 @@ async def get_event_presenter_obj_li(
sql_for_obj_type_id = f'`event_presenter`.event_track_id = :event_track_id'
else:
sql_for_obj_type_id = ''
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
@@ -165,7 +165,7 @@ async def get_event_presenter_obj_li(
elif enabled == 'all':
sql_enabled = ''
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if limit:
data['limit'] = limit
@@ -284,7 +284,7 @@ async def get_event_presenter_obj(
event_presenter_dict = event_presenter_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=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_presenter_dict)
#return mk_resp(data=event_presenter_obj)

8
app/routers/event_session.py
View File

@@ -114,7 +114,7 @@ async def patch_event_session_json(
else:
return mk_resp(data=event_session_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event Session ### patch_event_session_json() ###
@@ -185,7 +185,7 @@ async def get_event_session_obj_li(
sql_for_obj_type_id = f'`event_session`.event_track_id = :event_track_id'
else:
sql_for_obj_type_id = ''
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
@@ -197,7 +197,7 @@ async def get_event_session_obj_li(
elif enabled == 'all':
sql_enabled = ''
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if from_datetime and to_datetime:
data['from_datetime'] = from_datetime
@@ -319,7 +319,7 @@ async def get_event_session_obj(
event_session_dict = event_session_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=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_session_dict)
#return mk_resp(data=event_session_obj)

2
app/routers/hosted_file.py
View File

@@ -303,4 +303,4 @@ async def test_upload_files(
)
log.debug(file_info)
return mk_resp(data=False, status_code=501)
return mk_resp(data=False, status_code=501, response=response)

4
app/routers/importing.py
View File

@@ -44,7 +44,7 @@ async def importing_person_data(
df_dict = df.to_dict(orient='records')
# log.debug(df_dict)
# return mk_resp(data=False, status_code=500)
# return mk_resp(data=False, status_code=500, response=response)
person_data_li = []
# for i in df.index:
@@ -351,7 +351,7 @@ async def importing_cont_edu_cert_person_data(
df_dict = df.to_dict(orient='records')
# log.debug(df_dict)
# return mk_resp(data=False, status_code=500)
# return mk_resp(data=False, status_code=500, response=response)
cont_edu_cert_person_data_li = []
# for i in df.index:

2
app/routers/journal_entry.py
View File

@@ -198,7 +198,7 @@ async def get_journal_obj_journal_entry_list(
journal_entry_result_list.append(None)
response_data = journal_entry_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Post ### get_account_obj_journal_entry_list() ###

2
app/routers/log_client_viewing.py
View File

@@ -112,7 +112,7 @@ async def get_account_log_client_viewing_obj_li(
log_client_viewing_result_list.append(None)
response_data = log_client_viewing_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Log Client Viewing Methods ### get_account_log_client_viewing_obj_li() ###

4
app/routers/lookup.py
View File

@@ -35,7 +35,7 @@ async def get_lookup_li(
if for_lookup_name in allowed_lookup_tables: pass
else:
return mk_resp(data=False, status_code=400)
return mk_resp(data=False, status_code=400, response=response)
if for_lookup_name == 'post_topic':
if lu_post_topic_rec_list_result := get_lu_post_topic_rec_list(
@@ -47,7 +47,7 @@ async def get_lookup_li(
):
response_data = lu_post_topic_rec_list_result
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
elif for_lookup_name == 'time_zone':
table_name = f'v_lu_{for_lookup_name}'
lu_time_zone_result = sql_select(table_name=table_name)

2
app/routers/membership_cfg.py
View File

@@ -40,7 +40,7 @@ async def get_account_obj_membership_cfg(
model_as_dict = True,
):
response_data = membership_cfg_result
else: return mk_resp(data=False, status_code=400) # Bad Request
else: return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Cfg ### get_account_obj_membership_cfg() ###

6
app/routers/membership_group.py
View File

@@ -152,7 +152,7 @@ async def get_account_membership_group_obj_li(
membership_group_result_list.append(None)
response_data = membership_group_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Group Methods ### get_account_membership_group_obj_li() ###
@@ -204,7 +204,7 @@ async def lookup_membership_group_obj(
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
sql = f"""
SELECT id AS 'membership_group_id', id_random AS 'membership_group_id_random'
@@ -298,7 +298,7 @@ async def get_membership_group_obj(
):
pass
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=membership_group_result)
# ### END ### API Membership ### get_membership_group_obj() ###

2
app/routers/membership_group_person.py
View File

@@ -100,7 +100,7 @@ async def get_membership_group_person_obj(
):
response_data = membership_group_person_result
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Type Person ### get_membership_group_person_obj() ###

8
app/routers/membership_person.py
View File

@@ -170,7 +170,7 @@ async def get_account_obj_membership_person_list(
membership_person_result_list.append(None)
response_data = membership_person_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Person ### get_account_obj_membership_person_list() ###
@@ -243,7 +243,7 @@ async def get_person_obj_membership_person(
# inc_user = inc_user,
):
response_data = membership_person_result
else: return mk_resp(data=False, status_code=400) # Bad Request
else: return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Person ### get_person_obj_membership_person() ###
@@ -295,7 +295,7 @@ async def lookup_membership_person_obj(
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
sql = f"""
SELECT id AS 'membership_person_id', id_random AS 'membership_person_id_random'
@@ -396,7 +396,7 @@ async def get_membership_person_obj(
):
response_data = membership_person_result
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Person ### get_membership_person_obj() ###

2
app/routers/membership_person_profile.py
View File

@@ -71,7 +71,7 @@ async def get_membership_person_obj_profile(
model_as_dict = True,
):
response_data = membership_person_profile_result
else: return mk_resp(data=False, status_code=400) # Bad Request
else: return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Profile ### get_membership_person_obj_profile() ###

6
app/routers/membership_type.py
View File

@@ -152,7 +152,7 @@ async def get_account_membership_type_obj_li(
membership_type_result_list.append(None)
response_data = membership_type_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### BEGIN ### API Membership Type Methods ### get_account_membership_type_obj_li() ###
@@ -204,7 +204,7 @@ async def lookup_membership_type_obj(
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
sql = f"""
SELECT id AS 'membership_type_id', id_random AS 'membership_type_id_random'
@@ -298,7 +298,7 @@ async def get_membership_type_obj(
):
pass
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=membership_type_result)
# ### END ### API Membership ### get_membership_type_obj() ###

2
app/routers/membership_type_person.py
View File

@@ -100,7 +100,7 @@ async def get_membership_type_person_obj(
):
response_data = membership_type_person_result
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Type Person ### get_membership_type_person_obj() ###

4
app/routers/order_cart.py
View File

@@ -76,7 +76,7 @@ async def patch_order_cart_obj(
pass
elif isinstance(order_cart_obj_up_result, bool) and not order_cart_obj_up_result:
log.error(f'Order cart update and the result was an bool: {order_cart_obj_up_result}')
return mk_resp(data=False, status_code=500) # Internal Server Error
return mk_resp(data=False, status_code=500, response=response) # Internal Server Error
if return_obj:
if order_cart_obj := load_order_cart_obj(
@@ -158,7 +158,7 @@ async def lookup_order_cart_obj(
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
sql = f"""
SELECT id AS 'order_cart_id', id_random AS 'order_cart_id_random'

4
app/routers/organization.py
View File

@@ -106,7 +106,7 @@ async def post_organization_json(
else:
return mk_resp(data=organization_obj_in_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Organization ### post_organization_json() ###
@@ -145,7 +145,7 @@ async def patch_organization_json(
else:
return mk_resp(data=organization_obj_up_result)
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Organization ### patch_organization_json() ###

2
app/routers/post.py
View File

@@ -150,7 +150,7 @@ async def get_account_obj_post_list(
post_result_list.append(None)
response_data = post_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Post ### get_account_obj_post_list() ###

5
app/routers/product.py
View File

@@ -111,7 +111,7 @@ async def get_product_obj_li(
product_result_list.append(None)
response_data = product_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
@@ -159,7 +159,7 @@ async def get_account_product_obj_li(
product_result_list.append(None)
response_data = product_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
@@ -181,6 +181,7 @@ async def get_product_obj(
obj_id=obj_id,
by_alias=True,
exclude_unset=True,
response=response,
)
return result

8
app/routers/user.py
View File

@@ -311,7 +311,7 @@ async def user_authenticate(
return mk_resp(data=user_obj)
else:
log.error('SQL result was unexpected. A dict result type was expected. This should not happen.')
return mk_resp(data=False, status_code=500)
return mk_resp(data=False, status_code=500, response=response)
# ### END ### API User Routers ### user_authenticate() ###
@@ -375,7 +375,7 @@ async def lookup_user_obj(
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
sql = f"""
SELECT id AS 'user_id', id_random AS 'user_id_random'
@@ -637,7 +637,7 @@ async def get_user_obj(
):
response_data = user_result
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API User ### get_user_obj() ###
@@ -699,7 +699,7 @@ async def get_user_obj_order_list(
order_result_list.append(None)
response_data = order_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
# ### END ### API User ### get_user_obj_order_list() ###