Working on all the routes, methods, and models.
This commit is contained in:
@@ -14,6 +14,7 @@ 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.hosted_file_methods import get_hosted_file_rec_list, load_hosted_file_obj
|
||||
from app.methods.journal_methods import get_journal_rec_list, load_journal_obj
|
||||
from app.methods.membership_methods import get_membership_rec_list, load_membership_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
|
||||
@@ -292,6 +293,30 @@ def load_account_obj(
|
||||
account_obj.journal_list = journal_dict_list
|
||||
else: account_obj.journal_list = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_membership_list:
|
||||
if membership_rec_list_result := get_membership_rec_list(
|
||||
for_obj_type = 'account',
|
||||
for_obj_id = account_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
membership_result_list = []
|
||||
for membership_rec in membership_rec_list_result:
|
||||
membership_result_list.append(
|
||||
load_membership_obj(
|
||||
membership_id = membership_rec.get('membership_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
inc_product_list = inc_product_list,
|
||||
)
|
||||
)
|
||||
account_obj.membership_list = membership_result_list
|
||||
else: account_obj.membership_list = []
|
||||
|
||||
# Updated 2021-06-17
|
||||
if inc_order_list:
|
||||
if order_rec_list_result := get_order_rec_list(
|
||||
@@ -306,6 +331,8 @@ def load_account_obj(
|
||||
load_order_obj(
|
||||
order_id = order_rec.get('order_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_order_line_list = inc_order_line_list,
|
||||
@@ -331,6 +358,8 @@ def load_account_obj(
|
||||
load_organization_obj(
|
||||
organization_id = organization_rec.get('organization_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
@@ -342,30 +371,6 @@ 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_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 = []
|
||||
|
||||
# Updated 2021-06-17
|
||||
if inc_person_list:
|
||||
if person_rec_list_result := get_person_rec_list(
|
||||
@@ -374,12 +379,14 @@ def load_account_obj(
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
person_dict_list = []
|
||||
person_result_list = []
|
||||
for person_rec in person_rec_list_result:
|
||||
person_dict_list.append(
|
||||
person_result_list.append(
|
||||
load_person_obj(
|
||||
person_id = person_rec.get('person_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
@@ -388,9 +395,35 @@ def load_account_obj(
|
||||
inc_user = inc_user,
|
||||
)
|
||||
)
|
||||
account_obj.person_list = person_dict_list
|
||||
account_obj.person_list = person_result_list
|
||||
else: account_obj.person_list = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_post_list:
|
||||
if post_rec_list_result := get_post_rec_list(
|
||||
for_obj_type = 'account',
|
||||
for_obj_id = account_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
post_result_list = []
|
||||
for post_rec in post_rec_list_result:
|
||||
post_result_list.append(
|
||||
load_post_obj(
|
||||
post_id = post_rec.get('post_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
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_result_list
|
||||
else: account_obj.post_list = []
|
||||
|
||||
# Updated 2021-06-17
|
||||
if inc_product_list:
|
||||
if product_rec_list_result := get_product_rec_list(
|
||||
@@ -399,15 +432,17 @@ def load_account_obj(
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
product_dict_list = []
|
||||
product_result_list = []
|
||||
for product_rec in product_rec_list_result:
|
||||
product_dict_list.append(
|
||||
product_result_list.append(
|
||||
load_product_obj(
|
||||
product_id = product_rec.get('product_id', None),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
)
|
||||
)
|
||||
account_obj.product_list = product_dict_list
|
||||
account_obj.product_list = product_result_list
|
||||
else: account_obj.product_list = []
|
||||
|
||||
# Updated 2021-06-17
|
||||
@@ -440,12 +475,14 @@ def load_account_obj(
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
user_dict_list = []
|
||||
user_result_list = []
|
||||
for user_rec in user_rec_list_result:
|
||||
user_dict_list.append(
|
||||
user_result_list.append(
|
||||
load_user_obj(
|
||||
user_id = user_rec.get('user_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
@@ -462,7 +499,7 @@ def load_account_obj(
|
||||
inc_user_role_list = inc_user_role_list,
|
||||
)
|
||||
)
|
||||
account_obj.user_list = user_dict_list
|
||||
account_obj.user_list = user_result_list
|
||||
else: account_obj.user_list = []
|
||||
|
||||
if model_as_dict:
|
||||
|
||||
Reference in New Issue
Block a user