Working on membership module routes, methods, and models

app/methods/account_methods.py

@@ -14,7 +14,9 @@ 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.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
+from app.methods.membership_member_methods import get_membership_member_rec_list, load_membership_member_obj
+from app.methods.membership_type_methods import get_membership_type_rec_list, load_membership_type_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
@@ -81,11 +83,13 @@ def load_account_obj(
         inc_hosted_file_link_list: bool = False,
         inc_journal_list: bool = False, # Priority l3
         inc_journal_entry_list: bool = False, # Priority l3
-        # inc_membership: bool = False,
         inc_membership_cfg: bool = False,
-        inc_membership_list: bool = False,
+        inc_membership_group_list: bool = False,
         inc_membership_member: bool = False,
         inc_membership_member_list: bool = False, # Priority l1
+        inc_membership_member_profile: bool = False,
+        # inc_membership_type: bool = False,
+        inc_membership_type_list: bool = False,
         inc_order: bool = False,
         inc_order_cfg: bool = False,
         inc_order_list: bool = False, # Priority l1
@@ -293,29 +297,84 @@ 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(
+    # Updated 2021-06-21
+    if inc_membership_group_list:
+        if membership_group_rec_list_result := get_membership_group_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),
+            membership_group_result_list = []
+            for membership_group_rec in membership_group_rec_list_result:
+                membership_group_result_list.append(
+                    load_membership_group_obj(
+                        membership_group_id = membership_group_rec.get('membership_group_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_membership_group_member_list = inc_membership_group_member_list,
                         inc_product_list = inc_product_list,
                         )
                     )
-            account_obj.membership_list = membership_result_list
-        else: account_obj.membership_list = []
+            account_obj.membership_group_list = membership_group_result_list
+        else: account_obj.membership_group_list = []
+
+    # Updated 2021-06-21
+    if inc_membership_member_list:
+        if membership_member_rec_list_result := get_membership_member_rec_list(
+                for_obj_type = 'account',
+                for_obj_id = account_id,
+                limit = limit,
+                enabled = enabled,
+                ):
+            membership_member_result_list = []
+            for membership_member_rec in membership_member_rec_list_result:
+                membership_member_result_list.append(
+                    load_membership_member_obj(
+                        membership_member_id = membership_member_rec.get('membership_member_id', None),
+                        limit = limit,
+                        by_alias = by_alias,
+                        exclude_unset = exclude_unset,
+                        model_as_dict = model_as_dict,
+                        inc_membership_group_list = inc_membership_group_list,
+                        inc_membership_member_profile = inc_membership_member_profile,
+                        # inc_membership_member_list = inc_membership_member_list,
+                        # inc_membership_member_list = inc_membership_member_list,
+                        # inc_product_list = inc_product_list,
+                        inc_person = inc_person,
+                        inc_user = inc_user,
+                        )
+                    )
+            account_obj.membership_member_list = membership_member_result_list
+        else: account_obj.membership_member_list = []
+
+    # Updated 2021-06-18
+    if inc_membership_type_list:
+        if membership_type_rec_list_result := get_membership_type_rec_list(
+                for_obj_type = 'account',
+                for_obj_id = account_id,
+                limit = limit,
+                enabled = enabled,
+                ):
+            membership_type_result_list = []
+            for membership_type_rec in membership_type_rec_list_result:
+                membership_type_result_list.append(
+                    load_membership_type_obj(
+                        membership_type_id = membership_type_rec.get('membership_type_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_membership_type_member_list = inc_membership_type_member_list,
+                        inc_product_list = inc_product_list,
+                        )
+                    )
+            account_obj.membership_type_list = membership_type_result_list
+        else: account_obj.membership_type_list = []
 
     # Updated 2021-06-17
     if inc_order_list:

app/methods/membership_group_member_methods.py

@@ -0,0 +1,166 @@
+from __future__ import annotations
+import datetime
+
+from typing import Dict, List, Optional, Set, Union
+from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
+
+from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
+from app.lib_general import log, logging
+
+from app.models.membership_group_member_models import Membership_Group_Member_Base
+
+
+# ### BEGIN ### API Membership Group Member Methods ### create_membership_group_member_obj() ###
+def create_membership_group_member_obj(membership_group_member_obj_new:Membership_Group_Member_Base) -> bool|int:
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    membership_group_member_obj_data = membership_group_member_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
+
+    if membership_group_member_obj_in_result := sql_insert(
+            data=membership_group_member_obj_data,
+            table_name='membership_group_member',
+            rm_id_random=True,
+            id_random_length=8
+            ): pass
+    else: return False
+
+    log.debug(membership_group_member_obj_in_result)
+
+    membership_group_member_id = membership_group_member_obj_in_result
+
+    log.debug(f'New membership_group_member_id: {membership_group_member_id}')
+    return membership_group_member_id
+# ### END ### API Membership Group Member Methods ### create_membership_group_member_obj() ###
+
+
+# ### BEGIN ### API Membership Group Member Methods ### load_membership_group_member_obj() ###
+def load_membership_group_member_obj(
+        membership_group_member_id: int|str,
+        # limit: int = 1000,
+        by_alias: bool = True,
+        exclude_unset: bool = True,
+        model_as_dict: bool = False,
+        inc_membership_member: bool = False,
+        ) -> Membership_Group_Member_Base|bool:
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if membership_group_member_id := redis_lookup_id_random(record_id_random=membership_group_member_id, table_name='membership_group_member'): pass
+    else: return False
+    log.debug(membership_group_member_id)
+
+    if membership_group_member_rec := sql_select(table_name='v_membership_group_member', record_id=membership_group_member_id):
+        log.debug(membership_group_member_rec)
+    else: return False
+    log.debug(membership_group_member_rec)
+
+    try:
+        membership_group_member_obj = Membership_Group_Member_Base(**membership_group_member_rec)
+        log.debug(membership_group_member_obj)
+    except ValidationError as e:
+        log.error(e.json())
+
+    # Updated 2021-06-21
+    if inc_membership_member:
+        membership_member_id = membership_group_member_rec.get('membership_member_id', None)
+        log.debug(membership_member_id)
+        if membership_member_result := load_membership_member_obj(
+                membership_member_id = membership_member_id,
+                by_alias = by_alias,
+                exclude_unset = exclude_unset,
+                model_as_dict = model_as_dict,
+                ):
+            membership_group_member_obj.membership_member = membership_member_result
+        else: membership_group_member_obj.membership_group_member = None
+        log.debug(membership_member_result)
+
+    if model_as_dict:
+        return membership_group_member_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
+    else:
+        return membership_group_member_obj
+# ### END ### API Membership Group Member Methods ### load_membership_group_member_obj() ###
+
+
+# ### BEGIN ### API Membership Group Member Methods ### update_membership_group_member_obj() ###
+def update_membership_group_member_obj(
+        membership_group_member_id: int|str, # This allows for updating of the id_random value.
+        membership_group_member_obj_up: Membership_Group_Member_Base,
+        create_missing_obj: bool = False,
+        ) -> bool:
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if membership_group_member_id := redis_lookup_id_random(record_id_random=membership_group_member_id, table_name='membership_group_member'): pass
+    else: return False
+
+    membership_group_member_obj_up.id = membership_group_member_id
+
+    log.debug(membership_group_member_obj_up)
+    log.debug(membership_group_member_obj_up.dict(by_alias=False, exclude_unset=True))
+    # log.debug(membership_group_member_obj_up.dict(by_alias=False, exclude_unset=False))
+
+    membership_group_member_dict_up = membership_group_member_obj_up.dict(by_alias=False, exclude_unset=True)
+    log.debug(membership_group_member_dict_up)
+
+    if membership_group_member_obj_up_result := sql_update(data=membership_group_member_dict_up, table_name='membership_group_member', rm_id_random=True):
+        log.debug(membership_group_member_obj_up_result)
+        return True
+    else:
+        log.debug(membership_group_member_obj_up_result)
+        return False
+# ### END ### API Membership Group Member Methods ### update_membership_group_member_obj() ###
+
+
+# ### BEGIN ### API Membership Group Member Methods ### get_membership_group_member_rec_list() ###
+def get_membership_group_member_rec_list(
+        for_obj_type: str,
+        for_obj_id: str,
+        limit: int = 1000,
+        enabled: str = 'enabled', # enabled, disabled, all
+        ) -> list|bool:
+    log.setLevel(logging.WARNING) # 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
+    data = {}
+    data[f'{for_obj_type}_id'] = for_obj_id
+    # data['for_obj_type'] = for_obj_type
+    sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
+
+    if enabled in ['enabled', 'disabled', 'all']:
+        if enabled == 'enabled':
+            data['enable'] = True
+            sql_enabled = f'AND `tbl`.enable = :enable'
+        elif enabled == 'disabled':
+            data['enable'] = False
+            sql_enabled = f'AND `tbl`.enable = :enable'
+        elif enabled == 'all':
+            sql_enabled = ''
+
+    if limit:
+        data['limit'] = limit
+        sql_limit = f'LIMIT :limit'
+    else:
+        sql_limit = ''
+
+    sql = f"""
+        SELECT `tbl`.id AS 'membership_group_member_id', `tbl`.id_random AS 'membership_group_member_id_random'
+        FROM `membership_group_member` AS `tbl`
+        WHERE
+            {sql_obj_type_id}
+            {sql_enabled}
+        ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
+        {sql_limit};
+        """
+
+    if membership_group_member_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
+        membership_group_member_rec_li = membership_group_member_rec_li_result
+    else:
+        membership_group_member_rec_li = []
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(membership_group_member_rec_li_result)
+
+    return membership_group_member_rec_li
+# ### END ### API Membership Group Member Methods ### get_membership_group_member_rec_list() ###

app/methods/membership_group_methods.py

@@ -37,14 +37,23 @@ def create_membership_group_obj(membership_group_obj_new:Membership_Group_Base)
 # ### BEGIN ### API Membership Group Methods ### load_membership_group_obj() ###
 def load_membership_group_obj(
         membership_group_id: int|str,
-        # limit: int = 1000,
+        limit: int = 1000,
         by_alias: bool = True,
         exclude_unset: bool = True,
         model_as_dict: bool = False,
-        inc_membership: bool = False,
-        inc_parent_membership_group: bool = False,
+        enabled: str = 'enabled', # enabled, disabled, all
+        inc_address: bool = False,
+        inc_contact: bool = False,
+        inc_membership_cfg: bool = False,
+        inc_membership_member_list: bool = False,
+        inc_membership_member_profile: bool = False, # under membership_member
+        inc_membership_type_list: bool = False, # ???
+        # inc_parent_membership_group: bool = False,
+        inc_person: bool = False,
+        inc_product_list: bool = False,
+        inc_user: bool = False,
         ) -> Membership_Group_Base|bool:
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
@@ -63,18 +72,49 @@ def load_membership_group_obj(
         log.error(e.json())
 
     # Updated 2021-06-18
-    if inc_parent_membership_group:
-        membership_group_id = membership_group_rec.get('membership_group_id', None)
-        log.debug(membership_group_id)
-        if membership_group_result := load_membership_group_obj(
-                membership_group_id = membership_group_id,
-                by_alias = by_alias,
-                exclude_unset = exclude_unset,
-                model_as_dict = model_as_dict,
+    if inc_membership_cfg:
+        membership_cfg_result = load_membership_cfg_obj(
+            account_id = membership_group_rec.get('account_id', None),
+            by_alias = by_alias,
+            exclude_unset = exclude_unset,
+            model_as_dict = model_as_dict,
+            )
+        membership_group_rec['cfg'] = membership_cfg_result
+
+    # Updated 2021-06-18
+    # if inc_parent_membership_group:
+    #     parent_membership_group_id = membership_group_rec.get('parent_membership_group_id', None)
+    #     log.debug(parent_membership_group_id)
+    #     if parent_membership_group_result := load_membership_group_obj(
+    #             membership_group_id = parent_membership_group_id,
+    #             by_alias = by_alias,
+    #             exclude_unset = exclude_unset,
+    #             model_as_dict = model_as_dict,
+    #             ):
+    #         membership_group_obj.parent_membership_group = parent_membership_group_result
+    #     else: membership_group_obj.parent_membership_group = None
+    #     log.debug(parent_membership_group_result)
+
+    # Updated 2021-06-18
+    if inc_product_list:
+        if product_rec_list_result := get_product_rec_list(
+                for_obj_type = 'membership_group',
+                for_obj_id = membership_group_id,
+                limit = limit,
+                enabled = enabled,
                 ):
-            membership_group_obj.membership_group = membership_group_result
-        else: membership_group_obj.membership_group = None
-        log.debug(membership_group_result)
+            product_result_list = []
+            for product_rec in product_rec_list_result:
+                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,
+                        )
+                    )
+            membership_group_obj.product_list = product_result_list
+        else: membership_group_obj.product_list = []
 
     if model_as_dict:
         return membership_group_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
@@ -101,10 +141,10 @@ def update_membership_group_obj(
     log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=True))
     # log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=False))
 
-    journal_dict_up = membership_group_obj_up.dict(by_alias=False, exclude_unset=True)
-    log.debug(journal_dict_up)
+    membership_group_dict_up = membership_group_obj_up.dict(by_alias=False, exclude_unset=True)
+    log.debug(membership_group_dict_up)
 
-    if membership_group_obj_up_result := sql_update(data=journal_dict_up, table_name='membership_group', rm_id_random=True):
+    if membership_group_obj_up_result := sql_update(data=membership_group_dict_up, table_name='membership_group', rm_id_random=True):
         log.debug(membership_group_obj_up_result)
         return True
     else:

app/methods/membership_member_methods.py

@@ -8,7 +8,7 @@ from app.lib_general import log, logging
 from app.db_sql import redis_lookup_id_random, sql_insert_or_update, sql_select
 
 from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
-from app.methods.membership_profile_methods import get_membership_profile_rec_list, load_membership_profile_obj
+from app.methods.membership_member_profile_methods import get_membership_member_profile_rec_list, load_membership_member_profile_obj
 from app.methods.person_methods import load_person_obj
 from app.methods.user_methods import load_user_obj
 
@@ -174,8 +174,9 @@ def load_membership_member_obj(
         inc_contact: bool = False,
         inc_membership_cfg: bool = False,
         inc_membership_group_list: bool = False,
-        inc_membership_profile: bool = False,
-        # inc_membership_profile_cust: bool = False,
+        inc_membership_member_profile: bool = False,
+        inc_membership_type: bool = False,
+        # inc_membership_member_profile_cust: bool = False,
         inc_organization: bool = False,
         inc_person: bool = False,
         inc_user: bool = False,
@@ -218,12 +219,12 @@ def load_membership_member_obj(
             membership_member_obj.membership_group_list = membership_group_result_list
         else: membership_member_obj.membership_group_list = []
 
-    # Updated 2021-06-18
-    if inc_membership_profile:
-        membership_profile_id = membership_member_rec.get('membership_profile_id', None)
-        log.debug(membership_profile_id)
-        if membership_profile_result := load_membership_profile_obj(
-                membership_profile_id = membership_profile_id,
+    # Updated 2021-06-21
+    if inc_membership_member_profile:
+        membership_member_profile_id = membership_member_rec.get('membership_member_profile_id', None)
+        log.debug(membership_member_profile_id)
+        if membership_member_profile_result := load_membership_member_profile_obj(
+                membership_member_profile_id = membership_member_profile_id,
                 by_alias = by_alias,
                 exclude_unset = exclude_unset,
                 model_as_dict = model_as_dict,
@@ -232,9 +233,27 @@ def load_membership_member_obj(
                 # inc_membership = inc_membership,
                 # inc_organization = inc_organization,
                 ):
-            membership_member_obj.membership_profile = membership_profile_result
-        else: membership_member_obj.membership_profile = None
-        log.debug(membership_profile_result)
+            membership_member_obj.membership_member_profile = membership_member_profile_result
+        else: membership_member_obj.membership_member_profile = None
+        log.debug(membership_member_profile_result)
+
+    # Updated 2021-06-18
+    if inc_membership_type:
+        membership_type_id = membership_member_rec.get('membership_type_id', None)
+        log.debug(membership_type_id)
+        if membership_type_result := load_membership_type_obj(
+                membership_type_id = membership_type_id,
+                by_alias = by_alias,
+                exclude_unset = exclude_unset,
+                model_as_dict = model_as_dict,
+                inc_address = inc_address,
+                inc_contact = inc_contact,
+                # inc_membership = inc_membership,
+                # inc_organization = inc_organization,
+                ):
+            membership_member_obj.membership_type = membership_type_result
+        else: membership_member_obj.membership_type = None
+        log.debug(membership_type_result)
 
     # Updated 2021-06-18
     if inc_person:

app/methods/membership_member_profile_methods.py

@@ -7,45 +7,45 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from app.db_sql import redis_lookup_id_random, sql_select
 from app.lib_general import log, logging
 
-from app.models.membership_profile_models import Membership_Profile_Base
+from app.models.membership_member_profile_models import Membership_Member_Profile_Base
 
 
-# ### BEGIN ### API Membership Profile Methods ### load_membership_profile_obj() ###
-def load_membership_profile_obj(
-        membership_profile_id: int|str,
+# ### BEGIN ### API Membership Member Profile Methods ### load_membership_member_profile_obj() ###
+def load_membership_member_profile_obj(
+        membership_member_profile_id: int|str,
         by_alias: bool = True,
         exclude_unset: bool = True,
         model_as_dict: bool = False,
         inc_contact: bool = False,
         inc_organization: bool = False,
-        ) -> Membership_Profile_Base|dict|bool:
+        ) -> Membership_Member_Profile_Base|dict|bool:
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    if membership_profile_id := redis_lookup_id_random(record_id_random=membership_profile_id, table_name='membership_profile'): pass
+    if membership_member_profile_id := redis_lookup_id_random(record_id_random=membership_member_profile_id, table_name='membership_member_profile'): pass
     else: return False
 
-    if membership_profile_rec := sql_select(
-        table_name='v_membership_profile',
-        record_id=membership_profile_id,
+    if membership_member_profile_rec := sql_select(
+        table_name='v_membership_member_profile',
+        record_id=membership_member_profile_id,
         ): pass
     else: return False
-    log.debug(membership_profile_rec)
+    log.debug(membership_member_profile_rec)
     try:
-        membership_profile_obj = Membership_Profile_Base(**membership_profile_rec)
-        log.debug(membership_profile_obj)
+        membership_member_profile_obj = Membership_Member_Profile_Base(**membership_member_profile_rec)
+        log.debug(membership_member_profile_obj)
     except ValidationError as e:
         log.error(e.json())
 
     if model_as_dict:
-        return membership_profile_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
+        return membership_member_profile_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
     else:
-        return membership_profile_obj
-# ### END ### API Membership Profile Methods ### load_membership_profile_obj() ###
+        return membership_member_profile_obj
+# ### END ### API Membership Member Profile Methods ### load_membership_member_profile_obj() ###
 
 
-# ### BEGIN ### API Membership Profile Methods ### get_membership_profile_rec_list() ###
-def get_membership_profile_rec_list(
+# ### BEGIN ### API Membership Member Profile Methods ### get_membership_member_profile_rec_list() ###
+def get_membership_member_profile_rec_list(
         for_obj_type: str,
         for_obj_id: str,
         limit: int = 1000,
@@ -78,8 +78,8 @@ def get_membership_profile_rec_list(
         sql_limit = ''
 
     sql = f"""
-        SELECT `tbl`.id AS 'membership_profile_id', `tbl`.id_random AS 'membership_profile_id_random'
-        FROM `membership_profile` AS `tbl`
+        SELECT `tbl`.id AS 'membership_member_profile_id', `tbl`.id_random AS 'membership_member_profile_id_random'
+        FROM `membership_member_profile` AS `tbl`
         WHERE
             {sql_obj_type_id}
             {sql_enabled}
@@ -87,12 +87,12 @@ def get_membership_profile_rec_list(
         {sql_limit};
         """
 
-    if membership_profile_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-        membership_profile_rec_li = membership_profile_rec_li_result
+    if membership_member_profile_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
+        membership_member_profile_rec_li = membership_member_profile_rec_li_result
     else:
-        membership_profile_rec_li = []
+        membership_member_profile_rec_li = []
     log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-    log.debug(membership_profile_rec_li_result)
+    log.debug(membership_member_profile_rec_li_result)
 
-    return membership_profile_rec_li
-# ### END ### API Membership Profile Methods ### get_membership_profile_rec_list() ###
+    return membership_member_profile_rec_li
+# ### END ### API Membership Member Profile Methods ### get_membership_member_profile_rec_list() ###

app/methods/membership_type_methods.py

@@ -11,21 +11,21 @@ from app.methods.membership_cfg_methods import load_membership_cfg_obj
 from app.methods.membership_member_methods import get_membership_member_rec_list, load_membership_member_obj
 from app.methods.product_methods import get_product_rec_list, load_product_obj
 
-from app.models.membership_models import Membership_Base
+from app.models.membership_type_models import Membership_Type_Base
 
 
-# ### BEGIN ### API Membership Methods ### save_membership_obj() ###
-def save_membership_obj(membership_obj_new:Membership_Base):
+# ### BEGIN ### API Membership Type Methods ### save_membership_type_obj() ###
+def save_membership_type_obj(membership_type_obj_new:Membership_Type_Base):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    return membership_id
-# ### END ### API Membership Methods ### save_membership_obj() ###
+    return membership_type_id
+# ### END ### API Membership Type Methods ### save_membership_type_obj() ###
 
 
-# ### BEGIN ### API Membership Methods ### load_membership_obj() ###
-def load_membership_obj(
-        membership_id:int|str,
+# ### BEGIN ### API Membership Type Methods ### load_membership_type_obj() ###
+def load_membership_type_obj(
+        membership_type_id:int|str,
         limit: int = 1000,
         by_alias: bool = True,
         exclude_unset: bool = True,
@@ -34,48 +34,47 @@ def load_membership_obj(
         inc_address: bool = False,
         inc_contact: bool = False,
         inc_membership_cfg: bool = False,
-        inc_membership_group_list: bool = False,
+        inc_membership_group_list: bool = False, # under membership_member
         inc_membership_member_list: bool = False,
-        inc_membership_profile: bool = False,
+        inc_membership_member_profile: bool = False, # under membership_member
         inc_organization: bool = False,
         inc_person: bool = False,
-        inc_product: bool = False,
+        inc_product: bool = False, # is this needed?
         inc_product_list: bool = False,
         inc_user: bool = False,
-        ) -> Membership_Base:
+        ) -> Membership_Type_Base:
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    if membership_id := redis_lookup_id_random(record_id_random=membership_id, table_name='membership'): pass
+    if membership_type_id := redis_lookup_id_random(record_id_random=membership_type_id, table_name='membership_type'): pass
     else: return False
 
-    if membership_rec := sql_select(table_name='v_membership', record_id=membership_id): pass
+    if membership_type_rec := sql_select(table_name='v_membership_type', record_id=membership_type_id): pass
     else: return False
 
-    log.debug(membership_rec)
+    log.debug(membership_type_rec)
 
     try:
-        membership_obj = Membership_Base(**membership_rec)
-        log.debug(membership_obj)
+        membership_type_obj = Membership_Type_Base(**membership_type_rec)
+        log.debug(membership_type_obj)
     except ValidationError as e:
         log.error(e.json())
 
     # Updated 2021-06-18
     if inc_membership_cfg:
         membership_cfg_result = load_membership_cfg_obj(
-            account_id = membership_rec.get('account_id', None),
+            account_id = membership_type_rec.get('account_id', None),
             by_alias = by_alias,
             exclude_unset = exclude_unset,
             model_as_dict = model_as_dict,
-            enabled = enabled,
             )
-        membership_rec['cfg'] = membership_cfg_result
+        membership_type_rec['cfg'] = membership_cfg_result
 
     # Updated 2021-06-18
     if inc_membership_member_list:
         if membership_member_rec_list_result := get_membership_member_rec_list(
-                for_obj_type = 'membership',
-                for_obj_id = membership_id,
+                for_obj_type = 'membership_type',
+                for_obj_id = membership_type_id,
                 limit = limit,
                 enabled = enabled,
                 ):
@@ -90,21 +89,21 @@ def load_membership_obj(
                         model_as_dict = model_as_dict,
                         enabled = enabled,
                         inc_membership_group_list = inc_membership_group_list,
-                        inc_membership_profile = inc_membership_profile,
+                        inc_membership_member_profile = inc_membership_member_profile,
                         inc_organization = inc_organization,
                         inc_person = inc_person,
-                        inc_product = inc_product,
+                        # inc_product = inc_product,
                         inc_user = inc_user,
                         )
                     )
-            membership_obj.membership_member_list = membership_member_result_list
-        else: membership_obj.membership_member_list = []
+            membership_type_obj.membership_member_list = membership_member_result_list
+        else: membership_type_obj.membership_member_list = []
 
     # Updated 2021-06-18
     if inc_product_list:
         if product_rec_list_result := get_product_rec_list(
-                for_obj_type = 'membership',
-                for_obj_id = membership_id,
+                for_obj_type = 'membership_type',
+                for_obj_id = membership_type_id,
                 limit = limit,
                 enabled = enabled,
                 ):
@@ -118,17 +117,17 @@ def load_membership_obj(
                         model_as_dict = model_as_dict,
                         )
                     )
-            membership_obj.product_list = product_result_list
-        else: membership_obj.product_list = []
+            membership_type_obj.product_list = product_result_list
+        else: membership_type_obj.product_list = []
 
     if model_as_dict:
-        return membership_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
+        return membership_type_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
     else:
-        return membership_obj
-# ### END ### API Membership Methods ### load_membership_obj() ###
+        return membership_type_obj
+# ### END ### API Membership Type Methods ### load_membership_type_obj() ###
 
-# ### BEGIN ### API Membership Methods ### get_membership_rec_list() ###
-def get_membership_rec_list(
+# ### BEGIN ### API Membership Type Methods ### get_membership_type_rec_list() ###
+def get_membership_type_rec_list(
         for_obj_type: str,
         for_obj_id: str,
         limit: int = 1000,
@@ -161,8 +160,8 @@ def get_membership_rec_list(
         sql_limit = ''
 
     sql = f"""
-        SELECT `tbl`.id AS 'membership_id', `tbl`.id_random AS 'membership_id_random'
-        FROM `membership` AS `tbl`
+        SELECT `tbl`.id AS 'membership_type_id', `tbl`.id_random AS 'membership_type_id_random'
+        FROM `membership_type` AS `tbl`
         WHERE
             {sql_obj_type_id}
             {sql_enabled}
@@ -170,12 +169,12 @@ def get_membership_rec_list(
         {sql_limit};
         """
 
-    if membership_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-        membership_rec_li = membership_rec_li_result
+    if membership_type_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
+        membership_type_rec_li = membership_type_rec_li_result
     else:
-        membership_rec_li = []
+        membership_type_rec_li = []
     log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-    log.debug(membership_rec_li_result)
+    log.debug(membership_type_rec_li_result)
 
-    return membership_rec_li
-# ### END ### API Membership Methods ### get_membership_rec_list() ###
+    return membership_type_rec_li
+# ### END ### API Membership Type Methods ### get_membership_type_rec_list() ###