From 2088eb0227fb6124c3c864b3f8c32b34c5a15801 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Fri, 12 Sep 2025 20:17:21 -0400 Subject: [PATCH] fix data --- app/api/services/office_dashboard.py | 149 ++++++--------------------- 1 file changed, 31 insertions(+), 118 deletions(-) diff --git a/app/api/services/office_dashboard.py b/app/api/services/office_dashboard.py index e4b33ed..70c7f4a 100644 --- a/app/api/services/office_dashboard.py +++ b/app/api/services/office_dashboard.py @@ -38,7 +38,7 @@ class OfficeDashboardService(BaseService): 'option_name': subs.option_name, 'option_type': subs.option_type, 'payment_uid': subs.payment_uid, - 'amount': subs.amount*0.01, + 'amount': subs.amount * 0.01, 'status': subs.status, 'sub_start': subs.sub_start, 'sub_stop': subs.sub_stop, @@ -67,98 +67,11 @@ class OfficeDashboardService(BaseService): logger.error(f"An error occurred while getting dashboard data: {str(e)}", exc_info=True) return jsonify({"message": "Internal Server Error"}), 500 - @staticmethod def get_dashboard_data(): try: - # now = datetime.now() - # start_of_week = now - timedelta(days=now.weekday()) - # start_of_week = start_of_week.replace(hour=0, minute=0, second=0, microsecond=0) - # - # # Calculate 24 hours ago - # last_24_hours = datetime.now(timezone.utc) - timedelta(hours=24) - # - # # Loans this week - # loans_this_week = db.session.query( - # func.sum(Loan.initial_loan_amount) - # ).filter( - # Loan.created_at >= start_of_week - # ).scalar() or 0 - # - # # Payments this week - # payments_this_week = db.session.query( - # func.count(Transaction.id) - # ).filter( - # Transaction.created_at >= start_of_week, - # Transaction.type == 'PAYMENT' - # ).scalar() or 0 - # - # # Request summary for the last 24 hours - # eligibility_check_count = db.session.query( - # func.count(Transaction.id) - # ).filter( - # Transaction.type == TransactionType.ELIGIBILITY_CHECK.value, - # Transaction.created_at >= last_24_hours - # ).scalar() or 0 - # - # select_offer_count = db.session.query( - # func.count(Transaction.id) - # ).filter( - # Transaction.type == TransactionType.SELECT_OFFER.value, - # Transaction.created_at >= last_24_hours - # ).scalar() or 0 - # - # provide_loan_count = db.session.query( - # func.count(Transaction.id) - # ).filter( - # Transaction.type == TransactionType.PROVIDE_LOAN.value, - # Transaction.created_at >= last_24_hours - # ).scalar() or 0 - # - # repayment_count = db.session.query( - # func.count(Transaction.id) - # ).filter( - # Transaction.type == TransactionType.REPAYMENT.value, - # Transaction.created_at >= last_24_hours - # ).scalar() or 0 - # - # # Recent transactions (not limited to 24 hrs, just latest 15) - # recent_transactions = Transaction.query.order_by( - # Transaction.id.desc() - # ).limit(15).all() - # - # recent_transactions_data = [{ - # 'id': t.id, - # 'transaction_id': t.transaction_id, - # 'account_id': t.account_id, - # 'type': t.type, - # 'channel': t.channel, - # 'created_at': t.created_at.isoformat() if t.created_at else None, - # 'updated_at': t.updated_at.isoformat() if t.updated_at else None - # } for t in recent_transactions] - # - # # Final response - # dashboard_data = { - # "loans": { - # "value": float(loans_this_week), - # "currency": "Naira", - # "currency_text": "₦", - # "text": "this week" - # }, - # "payments": { - # "value": payments_this_week, - # "currency": "Naira", - # "currency_text": "₦", - # "text": "this week" - # }, - # "request_summary": { - # "eligibility_check": {"Eligibility": eligibility_check_count}, - # "select_offer": {"Offers": select_offer_count}, - # "provide_loan": {"Loans": provide_loan_count}, - # "repayment": {"Repayments": repayment_count} - # }, - # "recent_transactions": recent_transactions_data - # } + + subscription_data = [] subscription = MembersProducts.get_dash_recent_subscription(15) if subscription: subscription_data = [{ @@ -174,35 +87,35 @@ class OfficeDashboardService(BaseService): } for t in subscription] dashboard_data = { - "subscription":subscription_data, - "loans": { - "currency": "Naira", - "currency_text": "\u20a6", - "text": "this week", - "value": 159999.0 - }, - "payments": { - "currency": "Naira", - "currency_text": "\u0024", - "text": "this week", - "value": 0 - }, + "subscription": subscription_data, + "loans": { + "currency": "Naira", + "currency_text": "\u20a6", + "text": "this week", + "value": 159999.0 + }, + "payments": { + "currency": "Naira", + "currency_text": "\u0024", + "text": "this week", + "value": 0 + }, - "request_summary": { - "eligibility_check": { - "Started": 6 - }, - "provide_loan": { - "Scheduled": 2 - }, - "repayment": { - "Processing": 0 - }, - "select_offer": { - "Completed": 3 - } - } - } + "request_summary": { + "eligibility_check": { + "Started": 6 + }, + "provide_loan": { + "Scheduled": 2 + }, + "repayment": { + "Processing": 0 + }, + "select_offer": { + "Completed": 3 + } + } + } return dashboard_data