Fix model

app/api/services/base_service.py

@@ -32,6 +32,9 @@ class BaseService:
             "last_name": lastname,
             "pending_id": pending_id,
         }
+
+        logger.info(f"Send Email DATA *****  {pending_member}")
+
         jwt_part = jwt.encode(
             {"user": pending_member, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)},
             BaseService.JWT_SECRET_KEY, algorithm='HS256'

app/api/services/login.py

@@ -37,7 +37,7 @@ class LoginService(BaseService):
 
                 reset_data = PasswordReset.create_reset(username=username)
 
-                BaseService.send_resetpass_mail(member.email, member.uid, member.id, "FF","LL") #pending_uid, pending_id, firstname, lastname
+                BaseService.send_resetpass_mail(member.email, str(member.uid), member.id, "FF","LL") #pending_uid, pending_id, firstname, lastname
                 
 
                 response_data = {

app/api/services/office_dashboard.py

@@ -1,12 +1,10 @@
 from flask import jsonify
 from app.utils.logger import logger
 from app.api.services.base_service import BaseService
-from app.models.transaction import Transaction
-from app.models.loan import Loan
 from sqlalchemy import func, desc
 from datetime import datetime, timedelta, timezone
 from app.extensions import db
-from app.api.enums.transaction_type import TransactionType
+from app.models import MembersProducts, Products, Members, ProductsDetails, ProductsDetails, ProvisionActions
 
 
 class OfficeDashboardService(BaseService):
@@ -101,8 +99,9 @@ class OfficeDashboardService(BaseService):
             #     },
             #     "recent_transactions": recent_transactions_data
             # }
-
+            subscription = MembersProducts.get_dash_recent_subscription(15)
             dashboard_data = {
+
                                 "loans": {
                                     "currency": "Naira",
                                     "currency_text": "\u20a6",