From 48837ffa6f3422a46758f6777cc8aa988d2f79b8 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Thu, 24 Jun 2021 14:22:47 -0400
Subject: [PATCH] Working on membership still...

---
 app/methods/membership_member_methods.py | 16 +++++++++++++
 app/routers/membership_member.py         | 30 ++----------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/app/methods/membership_member_methods.py b/app/methods/membership_member_methods.py
index 5018189..e212f1b 100644
--- a/app/methods/membership_member_methods.py
+++ b/app/methods/membership_member_methods.py
@@ -13,6 +13,7 @@ from app.methods.membership_group_methods import get_membership_group_rec_list,
 from app.methods.membership_member_profile_methods import get_membership_member_profile_rec_list, load_membership_member_profile_obj
 # from app.methods.membership_type_methods import load_membership_type_obj
 from app.methods.person_methods import load_person_obj
+from app.methods.product_methods import load_product_obj
 from app.methods.user_methods import load_user_obj
 
 from app.models.membership_member_models import Membership_Member_Base
@@ -33,6 +34,7 @@ def load_membership_member_obj(
         inc_membership_member_profile: bool = False,
         inc_membership_member_profile_cust: bool = False, # Extended profile?
         inc_membership_type: bool = False, # The member_type the member is
+        # inc_order: bool = False,
         inc_organization: bool = False,
         inc_person: bool = False,
         inc_product: bool = False, # The product the person actually purchased for a member_type or member_group
@@ -155,6 +157,20 @@ def load_membership_member_obj(
         else: membership_member_obj.person = None
         log.debug(person_result)
 
+    # Updated 2021-06-24
+    if inc_product:
+        product_id = membership_member_rec.get('product_id', None)
+        log.debug(product_id)
+        if product_result := load_product_obj(
+                product_id = product_id,
+                by_alias = by_alias,
+                exclude_unset = exclude_unset,
+                model_as_dict = model_as_dict,
+                ):
+            membership_member_obj.product = product_result
+        else: membership_member_obj.product = None
+        log.debug(product_result)
+
     # Updated 2021-06-18
     if inc_user:
         user_id = membership_member_rec.get('user_id', None)
diff --git a/app/routers/membership_member.py b/app/routers/membership_member.py
index 116c223..8d5e149 100644
--- a/app/routers/membership_member.py
+++ b/app/routers/membership_member.py
@@ -180,7 +180,7 @@ async def lookup_membership_member_obj(
 
 
 # ### BEGIN ### API Membership Group ### get_membership_member_obj() ###
-# Working well as of 2021-06-21. Using as a template for other routes.
+# Working well as of 2021-06-24. Using as a template for other routes.
 @router.get('/{membership_member_id}', response_model=Resp_Body_Base)
 async def get_membership_member_obj(
         membership_member_id: str = Query(..., min_length=1, max_length=22),
@@ -190,9 +190,9 @@ async def get_membership_member_obj(
         inc_contact: bool = False, # Per member
         inc_membership_cfg: bool = False,
         inc_membership_group_list: bool = False, # List of groups per member
-        # inc_membership_type_list: bool = False, # List of membership types belonging to this member
         inc_membership_member_profile: bool = False,
         inc_membership_type: bool = False,
+        # inc_order: bool = False,
         inc_organization: bool = False,
         inc_person: bool = False,
         inc_product: bool = False, # Per member or group member belongs to
@@ -219,9 +219,6 @@ async def get_membership_member_obj(
             inc_contact = inc_contact,
             inc_membership_cfg = inc_membership_cfg,
             inc_membership_group_list = inc_membership_group_list,
-            # inc_membership_group_member_list = inc_membership_group_member_list,
-            # inc_membership_member = inc_membership_member,
-            # inc_membership_member_list = inc_membership_member_list,
             inc_membership_member_profile = inc_membership_member_profile,
             inc_membership_type = inc_membership_type,
             # inc_order = inc_order,
@@ -235,29 +232,6 @@ async def get_membership_member_obj(
     else:
         return mk_resp(data=False, status_code=400) # Bad Request
 
-    # if membership_member_result := load_membership_member_result(
-    #         membership_member_id = membership_member_id,
-    #         limit = limit,
-    #         by_alias = by_alias,
-    #         exclude_unset = exclude_unset,
-    #         model_as_dict = model_as_dict, # NOTE: returning model as a dict
-    #         enabled = enabled,
-    #         inc_address = inc_address,
-    #         inc_contact = inc_contact,
-    #         inc_membership_cfg = inc_membership_cfg,
-    #         inc_membership_member_list = inc_membership_member_list,
-    #         inc_membership_member_member_list = inc_membership_member_member_list,
-    #         inc_membership_member_profile = inc_membership_member_profile,
-    #         inc_organization = inc_organization,
-    #         inc_person = inc_person,
-    #         inc_product = inc_product,
-    #         inc_product_list = inc_product_list,
-    #         inc_user = inc_user,
-    #         ):
-    #     pass
-    # else:
-    #     return mk_resp(data=False, status_code=400) # Bad Request
-
     return mk_resp(data=membership_member_result)
 # ### END ### API Membership ### get_membership_member_obj() ###