Moving things to use the common_route_params. Rewriting most of things order and order_cart related!

app/methods/order_methods.py

@@ -176,12 +176,15 @@ def save_order_obj(order_obj_new:Order_Base, repl_order_line_li:bool=False):
 # Updated 2021-11-19
 def load_order_obj(
         order_id: int|str,
+        inc_address: bool = False,
+        inc_contact: bool = False,
         inc_order_cfg: bool = False,
         inc_order_line_list: bool = False,
         inc_person: bool = False,
         inc_user: bool = False,
         enabled: str = 'enabled', # enabled, disabled, all
-        limit: int = 1000,
+        limit: int = 500,
+        offset: int = 0,
         by_alias: bool = True,
         exclude_unset: bool = True,
         model_as_dict: bool = False,
@@ -204,6 +207,20 @@ def load_order_obj(
     except ValidationError as e:
         log.error(e.json())
 
+    # Updated 2022-01-18
+    if inc_order_cfg:
+        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        if order_cfg_result := load_order_cfg_obj(
+                account_id = order_rec.get('account_id'),
+                by_alias = by_alias,
+                exclude_unset = exclude_unset,
+                model_as_dict = True,
+                ):
+            order_obj.cfg = order_cfg_result
+        else: order_obj.cfg = {} # None
+        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.debug(order_cfg_result)
+
     # Updated 2021-06-18
     if inc_order_line_list:
         if order_line_rec_list_result := get_order_line_rec_list(
@@ -215,7 +232,7 @@ def load_order_obj(
             for order_line_rec in order_line_rec_list_result:
                 order_line_result_list.append(
                     load_order_line_obj(
-                        order_line_id = order_line_rec.get('order_line_id', None),
+                        order_line_id = order_line_rec.get('order_line_id'),
                         limit = limit,
                         by_alias = by_alias,
                         exclude_unset = exclude_unset,
@@ -223,52 +240,43 @@ def load_order_obj(
                         )
                     )
             order_obj.order_line_list = order_line_result_list
-        else: order_obj.order_line_list = []
+        else: order_obj.order_line_list = [] # None
 
-    # Updated 2021-08-07
-    if inc_order_cfg:
-        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-        if order_cfg_result := load_order_cfg_obj(
-                account_id = order_rec.get('account_id', None),
-                by_alias = by_alias,
-                exclude_unset = exclude_unset,
-                model_as_dict = True,
-                ):
-            order_obj.cfg = order_cfg_result
-        else: order_obj.cfg = None
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-        log.debug(order_cfg_result)
-
-    # Updated 2021-06-22
+    # Updated 2022-01-18
     if inc_person:
         from app.methods.person_methods import load_person_obj
         if person_result := load_person_obj(
-                person_id = order_rec.get('person_id', None),
+                person_id = order_rec.get('person_id'),
+                inc_address = inc_address,
+                inc_contact = inc_contact,
+                inc_user = inc_user, # NOTE:
+                enabled = enabled,
                 limit = limit,
+                offset = offset,
                 by_alias = by_alias,
                 exclude_unset = exclude_unset,
                 model_as_dict = model_as_dict,
-                enabled = enabled,
                 ):
             order_obj.person = person_result
-        else: order_obj.person = None
+        else: order_obj.person = {} # None
         pass
 
     # Updated 2021-06-22
-    if inc_user:
-        log.warning(f'This is being deprecated? load_order_obj() inc_user')
-        from app.methods.user_methods import load_user_obj
-        if user_result := load_user_obj(
-                user_id = order_rec.get('user_id', None),
-                limit = limit,
-                by_alias = by_alias,
-                exclude_unset = exclude_unset,
-                model_as_dict = model_as_dict,
-                enabled = enabled,
-                ):
-            order_obj.user = user_result
-        else: order_obj.user = None
-        pass
+    # NOTE: Phasing out! Use *inc_user* under load_person_obj() instead.
+    # if inc_user:
+    #     log.warning(f'This is being deprecated? load_order_obj() inc_user')
+    #     from app.methods.user_methods import load_user_obj
+    #     if user_result := load_user_obj(
+    #             user_id = order_rec.get('user_id', None),
+    #             limit = limit,
+    #             by_alias = by_alias,
+    #             exclude_unset = exclude_unset,
+    #             model_as_dict = model_as_dict,
+    #             enabled = enabled,
+    #             ):
+    #         order_obj.user = user_result
+    #     else: order_obj.user = None
+    #     pass
 
     if model_as_dict:
         return order_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
@@ -287,18 +295,24 @@ def get_order_rec_list(
         # balance_gt: int = 0, # $0 to $99999
         status: str = 'closed', # started, in progress, complete, all
         enabled: str = 'enabled', # enabled, disabled, all
-        limit: int = 1000,
+        limit: int = 500,
+        offset: int = 0,
         ) -> list|bool:
     log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
-    else: return False
+    # if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
+    # else: return False
 
     data = {}
-    data[f'{for_obj_type}_id'] = for_obj_id
-    # data['for_obj_type'] = for_obj_type
-    sql_obj_type_id = f'`order`.{for_obj_type}_id = :{for_obj_type}_id'
+    if for_obj_type == 'account' and for_obj_id:
+        data['account_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='account')
+        sql_account_person_user = f"""`order`.account_id = :account_id"""
+    elif for_obj_type == 'person' and for_obj_id:
+        data['person_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='person')
+        sql_account_person_user = f"""`order`.person_id = :person_id"""
+    else:
+        return False
 
     # allowed_status_li = ['started', 'in progress', 'complete', 'all'] # OLD list
     # allowed_status_li = ['open', 'locked', 'reopened', 'closed', 'canceled', 'other'] # NEW list
@@ -333,22 +347,8 @@ def get_order_rec_list(
     else:
         sql_from_to_datetime = ''
 
-    # if enabled in ['enabled', 'disabled', 'all']:
-    #     if enabled == 'enabled':
-    #         data['enable'] = True
-    #         sql_enabled = f'AND `order`.enable = :enable'
-    #     elif enabled == 'disabled':
-    #         data['enable'] = False
-    #         sql_enabled = f'AND `order`.enable = :enable'
-    #     elif enabled == 'all':
-    #         sql_enabled = ''
-    sql_enabled = ''
-
-    if limit:
-        data['limit'] = limit
-        sql_limit = f'LIMIT :limit'
-    else:
-        sql_limit = ''
+    sql_enabled, data['enable'] = sql_enable_part(table_name='contact', enabled=enabled) # Reasonably safe return str and bool
+    sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str
 
     log.debug(data)