From cd95765898f1cb0224f5d365f66c7311c58313ee Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 23 Sep 2025 11:59:54 -0400
Subject: [PATCH] fix backend

---
 app/api/routes/routes.py             |  6 ++--
 app/api/services/office_dashboard.py | 49 +++++++++++++++++++++-------
 app/models/members.py                |  5 ++-
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/app/api/routes/routes.py b/app/api/routes/routes.py
index 82cd161..af1628f 100644
--- a/app/api/routes/routes.py
+++ b/app/api/routes/routes.py
@@ -479,8 +479,9 @@ def get_office_accoint_view():
     filters = {
         'member_uid': request.args.get('member_uid')
     }
-    result = OfficeDashboardService.get_office_account_view(filters)
-    return jsonify(result)
+    response = OfficeDashboardService.get_office_account_view(filters)
+    # return response
+    return jsonify(response)
 
 @api.route('/office/custom-templates', methods=['GET'])
 def get_custom_templates():
@@ -491,6 +492,7 @@ def get_custom_templates():
         'page': request.args.get('page', 1),
         'limit': request.args.get('limit', 20)
     }
+    logger.info("CALLING :: Getting office custom templates")
     result = OfficeDashboardService.get_office_custom_templates(filters)
     return jsonify(result)
 
diff --git a/app/api/services/office_dashboard.py b/app/api/services/office_dashboard.py
index b2551c8..83d3685 100644
--- a/app/api/services/office_dashboard.py
+++ b/app/api/services/office_dashboard.py
@@ -169,7 +169,8 @@ class OfficeDashboardService(BaseService):
 
     @staticmethod
     def get_office_custom_templates(filters):
-        templates = CustomTemplates.get_template_for_office(filters)
+        logger.info("ENTER :: Getting office custom templates")
+        templates = CustomTemplates.get_custom_template_for_office(filters)
         templates_data = []
         if templates:
             for t in templates:
@@ -189,16 +190,40 @@ class OfficeDashboardService(BaseService):
     @staticmethod
     def get_office_account_view(filters):
         logger.info('ENTER API::get office account view')
-        # member_uid = filters.member_uid
-        member_uid = filters.get('member_uid')
-        account_data = Members.get_member_by_uid(member_uid)
+        try:
+            # member_uid = filters.member_uid
+            member_uid = filters.get('member_uid')
+            account_result = Members.get_member_by_uid(member_uid)
+            account_data = {
+                "id": account_result.id,
+                "uid": str(account_result.uid),
+                "username": account_result.username,
+                "country": account_result.country,
+                "added": account_result.added,
+                "email": account_result.email,
+                "account_name": account_result.account_name,
+                "firstname": account_result.firstname,
+                "lastname": account_result.lastname,
+                "trial_end": account_result.trial_end,
+            }
+
+            #  "profile_completed": account_result.profile_completed,
+            # "next_billing": account_result.next_billing,
+
+            account_result = {
+                "account": account_data,
+                "account_profile": {},
+                "subscriptions": {},
+                "payments": {}
+            }
+            logger.info('RETURN API::get office account view')
+            logger.info(account_result)
+            return account_result
+
+        except Exception as e:
+            logger.error(f"An error occurred while getting cusomer data: {str(e)}", exc_info=True)
+            return jsonify({"message": "Internal Server Error"}), 500
+
+
 
 
-        account_result = {
-            "account": [],
-            "account_profile": [],
-            "subscriptions": [],
-            "payments": []
-        }
-        logger.info('RETURN API::get office account view')
-        return account_result
diff --git a/app/models/members.py b/app/models/members.py
index 925c85e..a5f961d 100644
--- a/app/models/members.py
+++ b/app/models/members.py
@@ -26,14 +26,13 @@ class Members(db.Model):
     option_name = db.Column(db.String(100), nullable=True)
     next_billing= db.Column(db.DateTime(timezone=False))
     trial_end = db.Column(db.DateTime(timezone=False))
-
+    # "account_id": self.account_id,
     def to_dict(self):
         return {
             "id": self.id,
             "uid": str(self.uid),
             "profile_completed": self.profile_completed,
-            "username": self.account_id,
-            "account_id": self.username,
+            "username": self.username,
             "password": self.password,
             "country": self.country,
             "loc": self.loc,