Code clean up. Working on returning proper 404 vs 400 responses if the results are empty and nothing went wrong.

2021-12-13 17:02:21 -05:00
parent 2ef53d7a51
commit 133cfab42f
10 changed files with 131 additions and 100 deletions
--- a/app/routers/user.py
+++ b/app/routers/user.py
@@ -911,67 +911,71 @@ async def get_user_obj(
 # ### END ### API User ### get_user_obj() ###


-# ### BEGIN ### API User ### get_user_obj_order_list() ###
-# Deprecated 2021-11-19
-@router.get('/user/{user_id}/order_list', response_model=Resp_Body_Base)
-async def get_user_obj_order_list(
-        user_id: str = Query(..., min_length=1, 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
-        from_datetime: datetime.datetime = None,
-        to_datetime: datetime.datetime = None,
-        # inc_address: bool = False,
-        # inc_contact: bool = False,
-        inc_order_cfg: bool = False,
-        inc_order_line_list: bool = False,
-        status: str = 'complete',
-        # inc_person: bool = False,
-        # inc_order_list: bool = False,
-        # inc_order_cart_list: bool = False,
-        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())
-    log.warning('Deprecated 2021-11-19')
+# # ### BEGIN ### API User ### get_user_obj_order_list() ###
+# # Deprecated 2021-11-19
+# @router.get('/user/{user_id}/order_list', response_model=Resp_Body_Base)
+# async def get_user_obj_order_list(
+#         user_id: str = Query(..., min_length=1, 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
+#         from_datetime: datetime.datetime = None,
+#         to_datetime: datetime.datetime = None,
+#         # inc_address: bool = False,
+#         # inc_contact: bool = False,
+#         inc_order_cfg: bool = False,
+#         inc_order_line_list: bool = False,
+#         status: str = 'complete',
+#         # inc_person: bool = False,
+#         # inc_order_list: bool = False,
+#         # inc_order_cart_list: bool = False,
+#         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())
+#     log.warning('Deprecated 2021-11-19')

-    if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
-    else:
-        return mk_resp(data=None, status_code=404, response=response)
+#     if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
+#     else:
+#         return mk_resp(data=None, status_code=404, response=response)

-    # Updated 2021-06-28
-    if order_rec_list_result := get_order_rec_list(
-            for_obj_type = 'user',
-            for_obj_id = user_id,
-            limit = limit,
-            enabled = enabled,
-            from_datetime = from_datetime,
-            to_datetime = to_datetime,
-            status = status,
-            ):
-        order_result_list = []
-        for order_rec in order_rec_list_result:
-            if load_order_result := load_order_obj(
-                    order_id = order_rec.get('order_id', None),
-                    limit = limit,
-                    enabled = enabled,
-                    by_alias = by_alias,
-                    exclude_unset = exclude_unset,
-                    # model_as_dict = model_as_dict,
-                    inc_order_cfg = inc_order_cfg,
-                    inc_order_line_list = inc_order_line_list,
-                    ):
-                order_result_list.append(load_order_result)
-            else:
-                order_result_list.append(None)
-        response_data = order_result_list
-    else:
-        return mk_resp(data=False, status_code=400, response=response) # Bad Request
+#     # Updated 2021-12-13
+#     if order_rec_list_result := get_order_rec_list(
+#             for_obj_type = 'user',
+#             for_obj_id = user_id,
+#             limit = limit,
+#             enabled = enabled,
+#             from_datetime = from_datetime,
+#             to_datetime = to_datetime,
+#             status = status,
+#             ):
+#         order_result_list = []
+#         for order_rec in order_rec_list_result:
+#             if load_order_result := load_order_obj(
+#                     order_id = order_rec.get('order_id', None),
+#                     limit = limit,
+#                     enabled = enabled,
+#                     by_alias = by_alias,
+#                     exclude_unset = exclude_unset,
+#                     # model_as_dict = model_as_dict,
+#                     inc_order_cfg = inc_order_cfg,
+#                     inc_order_line_list = inc_order_line_list,
+#                     ):
+#                 order_result_list.append(load_order_result)
+#             else:
+#                 order_result_list.append(None)
+#         response_data = order_result_list
+#     elif event_location_rec_list_result is None:
+#         log.info('No results')
+#         return mk_resp(data=None, status_code=404, response=response) # Not Found
+#     else:
+#         log.warning('Likely bad request')
+#         return mk_resp(data=False, status_code=400, response=response) # Bad Request

-    return mk_resp(data=response_data, response=response)
-# ### END ### API User ### get_user_obj_order_list() ###
+#     return mk_resp(data=response_data, response=response)
+# # ### END ### API User ### get_user_obj_order_list() ###


@router.delete('/user/{obj_id}', response_model=Resp_Body_Base)