Work on lots of methods and models.

app/methods/account_methods.py

@@ -10,12 +10,14 @@ from app.lib_general import log, logging
 from app.methods.account_cfg_methods import load_account_cfg_obj
 from app.methods.address_methods import get_address_rec_list, load_address_obj
 from app.methods.archive_methods import get_archive_rec_list, load_archive_obj
-# from app.methods.contact_methods import load_contact_obj_list
-from app.methods.event_methods import load_event_obj_list
+from app.methods.contact_methods import get_contact_rec_list, load_contact_obj
+from app.methods.event_methods import get_event_rec_list, load_event_obj
+from app.methods.order_methods import get_order_rec_list, load_order_obj
+# from app.methods.order_cart_methods import get_order_cart_rec_list, load_order_cart_obj
 from app.methods.organization_methods import get_organization_rec_list, load_organization_obj
 from app.methods.person_methods import get_person_rec_list, load_person_obj
 from app.methods.product_methods import get_product_rec_list, load_product_obj
-from app.methods.post_methods import load_post_obj_list
+from app.methods.post_methods import get_post_rec_list, load_post_obj
 from app.methods.user_methods import get_user_rec_list, load_user_obj
 
 from app.models.account_models import Account_Base
@@ -74,9 +76,14 @@ def load_account_obj(
         # inc_membership: bool = False,
         inc_membership_cfg: bool = False,
         inc_membership_list: bool = False,
+        inc_membership_member: bool = False,
+        inc_membership_member_list: bool = False, # Priority l1
         inc_order: bool = False,
-        inc_order_list: bool = False, # Priority l2
+        inc_order_cfg: bool = False,
+        inc_order_list: bool = False, # Priority l1
+        inc_order_line_list: bool = False, # Priority l2
         inc_order_cart: bool = False,
+        inc_order_cart_line_list: bool = False, # Priority l2
         inc_order_cart_list: bool = False,
         inc_organization: bool = False,
         inc_organization_list: bool = False, # Priority l3
@@ -125,16 +132,6 @@ def load_account_obj(
             account_obj.account_cfg = account_cfg_dict
         else: account_obj.account_cfg = None
 
-    # if inc_address_list:
-    #     if address_dict_list := load_address_obj_list(
-    #         account_id = account_id,
-    #         limit = limit,
-    #         model_as_dict = model_as_dict,
-    #         enabled = enabled,
-    #         ):
-    #         account_obj.address_list = address_dict_list
-    #     else: account_obj.address_list = []
-
     # Updated 2021-06-17
     if inc_address_list:
         if address_rec_list_result := get_address_rec_list(
@@ -151,23 +148,11 @@ def load_account_obj(
                         limit = limit,
                         model_as_dict = model_as_dict,
                         enabled = enabled,
-                        inc_address_content_list = inc_address_content_list,
                         )
                     )
             account_obj.address_list = address_dict_list
         else: account_obj.address_list = []
 
-    # if inc_archive_list:
-    #     if archive_dict_list := load_archive_obj_list(
-    #         account_id = account_id,
-    #         limit = limit,
-    #         model_as_dict = model_as_dict,
-    #         enabled = enabled,
-    #         inc_archive_content_list = inc_archive_content_list,
-    #         ):
-    #         account_obj.archive_list = archive_dict_list
-    #     else: account_obj.archive_list = []
-
     # Updated 2021-06-17
     if inc_archive_list:
         if archive_rec_list_result := get_archive_rec_list(
@@ -190,28 +175,39 @@ def load_account_obj(
             account_obj.archive_list = archive_dict_list
         else: account_obj.archive_list = []
 
+    # if inc_contact_list:
+    #     if contact_dict_list := load_contact_obj_list(
+    #         account_id = account_id,
+    #         limit = limit,
+    #         model_as_dict = model_as_dict,
+    #         enabled = enabled,
+    #         inc_address = inc_address,
+    #         ):
+    #         account_obj.contact_list = contact_dict_list
+    #     else: account_obj.contact_list = []
+
+    # Updated 2021-06-17
     if inc_contact_list:
-        if contact_dict_list := load_contact_obj_list(
-            account_id = account_id,
-            limit = limit,
-            model_as_dict = model_as_dict,
-            enabled = enabled,
-            inc_address = inc_address,
-            ):
+        if contact_rec_list_result := get_contact_rec_list(
+                for_obj_type = 'account',
+                for_obj_id = account_id,
+                limit = limit,
+                enabled = enabled,
+                ):
+            contact_dict_list = []
+            for contact_rec in contact_rec_list_result:
+                contact_dict_list.append(
+                    load_contact_obj(
+                        contact_id = contact_rec.get('contact_id', None),
+                        limit = limit,
+                        model_as_dict = model_as_dict,
+                        enabled = enabled,
+                        inc_address = inc_address,
+                        )
+                    )
             account_obj.contact_list = contact_dict_list
         else: account_obj.contact_list = []
 
-    # if inc_organization:
-    #     organization_id = account_rec.get('organization_id', None)
-    #     if organization_obj_result := load_organization_obj(organization_id=organization_id):
-    #         organization_obj = organization_obj_result
-    #         # account_rec['organization'] = organization_obj
-    #         # log.debug(account_rec)
-    #         #account_obj.organization = organization_obj.dict(by_alias=True, exclude_unset=True)
-    #         account_obj.organization = organization_obj
-    #     else: account_obj.organization = None
-
-
     # Updated 2021-06-17
     if inc_event_list:
         if event_rec_list_result := get_event_rec_list(
@@ -251,33 +247,30 @@ def load_account_obj(
             account_obj.event_list = event_dict_list
         else: account_obj.event_list = []
 
-    # if inc_event_list:
-    #     if event_dict_list := load_event_obj_list(
-    #         account_id = account_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,
-    #         ):
-    #         account_obj.event_list = event_dict_list
-    #     else: account_obj.event_list = []
+    # Updated 2021-06-17
+    if inc_order_list:
+        if order_rec_list_result := get_order_rec_list(
+                for_obj_type = 'account',
+                for_obj_id = account_id,
+                limit = limit,
+                enabled = enabled,
+                ):
+            order_dict_list = []
+            for order_rec in order_rec_list_result:
+                order_dict_list.append(
+                    load_order_obj(
+                        order_id = order_rec.get('order_id', None),
+                        limit = limit,
+                        model_as_dict = model_as_dict,
+                        enabled = enabled,
+                        inc_order_line_list = inc_order_line_list,
+                        inc_order_cfg = inc_order_cfg,
+                        inc_person = inc_person,
+                        inc_user = inc_user,
+                        )
+                    )
+            account_obj.order_list = order_dict_list
+        else: account_obj.order_list = []
 
     # Updated 2021-06-17
     if inc_organization_list:
@@ -304,17 +297,27 @@ def load_account_obj(
             account_obj.organization_list = organization_dict_list
         else: account_obj.organization_list = []
 
-
+    # Updated 2021-06-17
     if inc_post_list:
-        if post_dict_list := load_post_obj_list(
-            account_id = account_id,
-            limit = limit,
-            model_as_dict = model_as_dict,
-            enabled = enabled,
-            inc_post_comment_list = inc_post_comment_list,
-            inc_person = inc_person,
-            inc_user = inc_user,
-            ):
+        if post_rec_list_result := get_post_rec_list(
+                for_obj_type = 'account',
+                for_obj_id = account_id,
+                limit = limit,
+                enabled = enabled,
+                ):
+            post_dict_list = []
+            for post_rec in post_rec_list_result:
+                post_dict_list.append(
+                    load_post_obj(
+                        post_id = post_rec.get('post_id', None),
+                        limit = limit,
+                        model_as_dict = model_as_dict,
+                        enabled = enabled,
+                        inc_post_comment_list = inc_post_comment_list,
+                        inc_person = inc_person,
+                        inc_user = inc_user,
+                        )
+                    )
             account_obj.post_list = post_dict_list
         else: account_obj.post_list = []