fix cnclic

app/api/routes/routes.py

@@ -11,6 +11,7 @@ from app.api.services.auth_service import AuthService
 from app.api.services.dashboard_service import DashboardService
 from app.api.services.offer_service import OfferService
 from app.api.services.charge_service import ChargeService
+from app.api.services.repayment_data_service import RepaymentDataService
 from functools import wraps
 from app.utils.logger import logger
 from app.api.middlewares import enforce_json, require_auth
@@ -22,6 +23,9 @@ from flask_jwt_extended import (
     get_jwt_identity,
     create_refresh_token,
 )
+from sqlalchemy import text
+from app.extensions import db
+from app.config import settings
 
 api = Blueprint('api', __name__)
 
@@ -123,7 +127,8 @@ def get_loans():
         'page': request.args.get('page', 1),
         'limit': request.args.get('limit', 20)
     }
-    # logger.info(f"Get loans request received with filters: {filters}")
+    #logger.info(f"Get loans request received with filters: {filters}")
+    
     response = LoanService.process_request(filters)
     return response
 
@@ -179,6 +184,22 @@ def get_all_repayments():
     # logger.info(f"Get repayments request received with filters: {filters}")
     response = RepaymentService.get_all_repayments(filters)
     return response
+@api.route('/repayment-data', methods=['GET'])
+# @token_required
+def get_all_repayments_data():
+    # Extract query parameters for filtering
+    filters = {
+        'customer_id': request.args.get('customer_id'),
+        'account_id': request.args.get('account_id'),
+        'added_date': request.args.get('added_date'),
+        'transaction_id': request.args.get('transaction_id'),
+        'fbn_transaction_id': request.args.get('fbn_transaction_id'),
+        'page': request.args.get('page', 1),
+        'limit': request.args.get('limit', 20)
+    }
+    # logger.info(f"Get repayments request received with filters: {filters}")
+    response = RepaymentDataService.get_all_repayments_data(filters)
+    return response
 
 @api.route('/loan-charges', methods=['GET'])
 # @token_required
@@ -248,4 +269,45 @@ def get_all_offers():
 #     }
 #     # logger.info(f"Get charges request received with filters: {filters}")
 #     response = ChargeService.get_all_charges(filters)
-#     return jsonify(response)
+#     return jsonify(response)
+
+
+# Health Check Endpoint
+@api.route("/health", methods=["GET"])
+def health_check():
+    SQLALCHEMY_DATABASE_URI = settings.SQLALCHEMY_DATABASE_URI
+    response = {}
+    db_status = "Connection Successful"
+    errors = []
+    status = "ok"
+
+
+    # Extract the database URI
+    try:
+        db_uri = db.engine.url.render_as_string(hide_password=False)
+        db_uri =  db_uri
+    except Exception as e:
+        db_uri = "Unavailable"
+        errors.append(f"Database URI Error: {str(e)}")
+    
+
+
+    # Check database connection
+    try:
+        logger.info(f"Database Health == : {SQLALCHEMY_DATABASE_URI}")
+        db.session.execute(text("SELECT 1"))
+    except Exception as e:
+        db_status = "Connection Failed"
+        errors.append(f"Database Error: {str(e)}")
+        status = "failed"
+
+    response = {
+        "status": status,
+        "db_status": db_status,
+        "db_uri": db_uri,
+        "errors": errors or None
+    }
+
+
+    return jsonify(response), 200 if status == "ok" else 500
+

app/api/services/__init__.py

@@ -9,3 +9,4 @@ from app.api.services.repayment_service import RepaymentService
 from app.api.services.loan_charge_service import LoanChargeService
 from app.api.services.loan_repayment_schedule_service import LoanRepaymentScheduleService
 from app.api.services.transaction_offers_service import TransactionOfferService
+from app.api.services.repayment_data_service import RepaymentDataService

app/api/services/loan_service.py

@@ -81,7 +81,7 @@ class LoanService:
                 limit=limit
             )
 
-            logger.info(f"Result from loans model cme back")
+            logger.info(f"Result from loans model cme back ")
 
             # Convert loans to dictionary format
             loans_data = []
@@ -98,6 +98,8 @@ class LoanService:
                     'current_loan_amount': loan.current_loan_amount,
                     'status': loan.status,
                     'tenor': loan.tenor,
+                    'balance': loan.balance,
+                    'reference': loan.reference,
                     'product_id': loan.product_id,
                     'default_penalty_fee': loan.default_penalty_fee,
                     'continuous_fee': loan.continuous_fee,
@@ -106,7 +108,13 @@ class LoanService:
                     'installment_amount': loan.installment_amount,
                     'due_date': loan.due_date.isoformat() if loan.due_date else None,
                     'created_at': loan.created_at.isoformat() if loan.created_at else None,
-                    'updated_at': loan.updated_at.isoformat() if loan.updated_at else None
+                    'updated_at': loan.updated_at.isoformat() if loan.updated_at else None,
+                    'disburseResult': loan.disburse_result,
+                    'disburseDescription': loan.disburse_description,
+                    'verifyResult': loan.verify_result,
+                    'verifyDescription': loan.verify_description,
+                    'disburseDate': loan.disburse_date.isoformat() if loan.disburse_date else None,
+                    'disburseVerify': loan.disburse_verify.isoformat() if loan.disburse_verify else None,
                 })
 
             # Calculate total pages

app/api/services/repayment_data_service.py

@@ -0,0 +1,82 @@
+import logging
+from datetime import datetime
+from app.models.repayment_data import RepaymentsData
+from dateutil.parser import parse as parse_date 
+
+logger = logging.getLogger(__name__)
+
+class RepaymentDataService:
+    """
+    Service class for handling repayment-data operations.
+    """
+
+    @staticmethod
+    def get_all_repayments_data(filters=None):
+        try:
+            if filters is None:
+                filters = {}
+
+            customer_id = filters.get('customer_id')
+            account_id = filters.get('account_id')
+            added_date = filters.get('added_date')
+            transaction_id = filters.get('transaction_id')
+            fbn_transaction_id = filters.get('fbn_transaction_id')
+
+            page = int(filters.get('page', 1))
+            limit = int(filters.get('limit', 20))
+
+            if page < 1:
+                page = 1
+            if limit < 1 or limit > 100:
+                limit = 20
+
+            if added_date and isinstance(added_date, str):
+                try:
+                    added_date = parse_date(added_date)
+                except Exception as parse_err:
+                    logger.error(f"Invalid date format for 'added_date': {added_date}")
+                    return {"message": "Invalid date format for 'added_date'"}, 400
+
+            repayments_data, total_count = RepaymentsData.get_all_repayment_data(
+                customer_id=customer_id,
+                account_id=account_id,
+                added_date=added_date,
+                transaction_id=transaction_id,
+                fbn_transaction_id=fbn_transaction_id,
+                page=page,
+                limit=limit
+            )
+
+            repayments_list = []
+            for repayment in repayments_data:
+                repayments_list.append({
+                    'customer_id': repayment.customer_id,
+                    'account_id': repayment.account_id,
+                    'transaction_id': repayment.transaction_id,
+                    'fbn_transaction_id': repayment.fbn_transaction_id,
+                    'added_date': repayment.added_date.isoformat() if repayment.added_date else None,
+                    'response_code': repayment.response_code,
+                    'response_descr': repayment.response_descr,
+                    'repayment_amount': repayment.repayment_amount,
+                    'amount_collected': repayment.amount_collected,
+                    'balance': repayment.balance
+                })
+
+            total_pages = (total_count + limit - 1) // limit
+
+            return {
+                'repayment_data': repayments_list,
+                'count': len(repayments_list),
+                'pagination': {
+                    'total_count': total_count,
+                    'total_pages': total_pages,
+                    'current_page': page,
+                    'limit': limit,
+                    'has_next': page < total_pages,
+                    'has_prev': page > 1
+                }
+            }
+
+        except Exception as e:
+            logger.error(f"An error occurred: {str(e)}", exc_info=True)
+            return {"message": "Internal Server Error"}, 500

app/api/services/repayment_service.py

@@ -69,7 +69,15 @@ class RepaymentService:
                     'product_id': repayment.product_id,
                     'transaction_id': repayment.transaction_id,
                     'created_at': repayment.created_at.isoformat() if repayment.created_at else None,
-                    'updated_at': repayment.updated_at.isoformat() if repayment.updated_at else None
+                    'updated_at': repayment.updated_at.isoformat() if repayment.updated_at else None,
+                    'repay_date': repayment.repay_date.isoformat() if repayment.repay_date else None,
+                    'initiated_by': repayment.initiated_by,
+                    'salary_amount': repayment.salary_amount,
+                    'verify_date': repayment.verify_date.isoformat() if repayment.verify_date else None,
+                    'repay_result': repayment.repay_result,
+                    'repay_description': repayment.repay_description,
+                    'verify_result': repayment.verify_result,
+                    'verify_description': repayment.verify_description
                 })
 
             # Calculate total pages