diff --git a/app/api/services/office_dashboard.py b/app/api/services/office_dashboard.py index 0a833ab..ab32ad6 100644 --- a/app/api/services/office_dashboard.py +++ b/app/api/services/office_dashboard.py @@ -286,7 +286,7 @@ class OfficeDashboardService(BaseService): product_templates_data = [] templates_data = [] - membersSubResult, total_count = MembersProducts.get_member_product_by_subscription_uid(subscription_uid) + membersSubResult = MembersProducts.get_member_product_by_subscription_uid(subscription_uid) if membersSubResult: member_sub = { 'id': membersSubResult.id, diff --git a/app/models/members_products.py b/app/models/members_products.py index a75d6db..7d8a871 100644 --- a/app/models/members_products.py +++ b/app/models/members_products.py @@ -65,7 +65,7 @@ class MembersProducts(db.Model): @classmethod def get_member_product_by_subscription_uid(cls, subscription_uid): - member_product = cls.query.filter_by(subscription_uid=str(subscription_uid)).all() + member_product = cls.query.filter_by(uid=str(subscription_uid)).first() if not member_product: return None return member_product @@ -145,14 +145,10 @@ class MembersProducts(db.Model): # return 0 def to_dict(self): - """ - Convert the Loan object to a dictionary format for JSON serialization. - """ + return { 'id': self.id, 'uid': self.uid, - # 'name': self.products.name, - # 'description': self.products.description, 'product_id': self.product_id, 'internal_url': self.internal_url, 'external_url': self.external_url,