Update main.py

main.py

@@ -749,8 +749,8 @@ def admin_remove_member_from_org(org_id, member_uid):
 @app.route('/api/admin/dashboard/stats', methods=['GET'])
 def get_admin_dashboard_stats():
     """
-    Retrieves global statistics for the admin dashboard, including leaderboards
-    for top users, items, and expenses.
+    Retrieves global statistics for the admin dashboard, including leaderboards.
+    **FIXED**: Correctly groups expenses by the 'description' field for the leaderboard.
     """
     try:
         verify_admin_and_get_uid(request.headers.get('Authorization'))
@@ -759,11 +759,10 @@ def get_admin_dashboard_stats():
         all_users_docs = list(db.collection('users').stream())
         all_orgs_docs = list(db.collection('organizations').stream())
         
-        # Data structures for leaderboards
-        user_sales_data = {} # {phone: {'total_revenue': X, 'item_sales': {item: revenue}}}
-        global_item_revenue = {} # {item_name: total_revenue}
-        global_expense_totals = {} # {category: total_amount}
-        phone_to_user_map = {} # Helper to get user info from phone
+        user_sales_data = {}
+        global_item_revenue = {}
+        global_expense_totals = {} # This will be populated correctly now
+        phone_to_user_map = {}
 
         # --- First Pass: Get user info and list of approved phones ---
         pending_approvals, approved_users, admin_count = 0, 0, 0
@@ -787,7 +786,7 @@ def get_admin_dashboard_stats():
         user_stats = {'total': len(all_users_docs), 'admins': admin_count, 'approvedForBot': approved_users, 'pendingApproval': pending_approvals}
         org_stats = {'total': len(all_orgs_docs)}
 
-        # --- Second Pass: Aggregate financial data for all approved users ---
+        # --- Second Pass: Aggregate financial data ---
         total_sales_revenue, total_cogs, total_expenses, sales_count = 0, 0, 0, 0
         
         for phone in approved_phone_numbers:
@@ -795,7 +794,6 @@ def get_admin_dashboard_stats():
                 bot_data_id = phone.lstrip('+')
                 bot_user_ref = db.collection('users').document(bot_data_id)
                 
-                # Initialize user's entry for leaderboard tracking
                 user_sales_data[phone] = {'total_revenue': 0, 'item_sales': {}}
 
                 # Process Sales
@@ -808,12 +806,10 @@ def get_admin_dashboard_stats():
                     item_name = details.get('item', 'Unknown Item')
                     sale_revenue = price * quantity
 
-                    # Aggregate for global system stats
                     total_sales_revenue += sale_revenue
                     total_cogs += cost * quantity
                     sales_count += 1
                     
-                    # Aggregate for leaderboards
                     user_sales_data[phone]['total_revenue'] += sale_revenue
                     user_sales_data[phone]['item_sales'][item_name] = user_sales_data[phone]['item_sales'].get(item_name, 0) + sale_revenue
                     global_item_revenue[item_name] = global_item_revenue.get(item_name, 0) + sale_revenue
@@ -823,7 +819,11 @@ def get_admin_dashboard_stats():
                 for expense_doc in expenses_docs:
                     details = expense_doc.to_dict().get('details', {})
                     amount = float(details.get('amount', 0))
-                    category = details.get('category', 'Uncategorized')
+                    
+                    # --- THE FIX IS HERE ---
+                    # Use the 'description' field for grouping, as seen in Firestore.
+                    category = details.get('description', 'Uncategorized')
+                    # --- END OF FIX ---
                     
                     total_expenses += amount
                     global_expense_totals[category] = global_expense_totals.get(category, 0) + amount
@@ -839,7 +839,6 @@ def get_admin_dashboard_stats():
         top_users_by_revenue = []
         for phone, data in sorted_users[:5]:
             user_info = phone_to_user_map.get(phone, {})
-            # Find this user's top selling item
             top_item = max(data['item_sales'], key=data['item_sales'].get) if data['item_sales'] else 'N/A'
             top_users_by_revenue.append({
                 'displayName': user_info.get('displayName'),
@@ -852,7 +851,7 @@ def get_admin_dashboard_stats():
         sorted_items = sorted(global_item_revenue.items(), key=lambda item: item[1], reverse=True)
         top_selling_items = [{'item': name, 'totalRevenue': round(revenue, 2)} for name, revenue in sorted_items[:5]]
 
-        # Rank Top Expenses Globally
+        # Rank Top Expenses Globally (This will now be correct)
         sorted_expenses = sorted(global_expense_totals.items(), key=lambda item: item[1], reverse=True)
         top_expenses = [{'category': name, 'totalAmount': round(amount, 2)} for name, amount in sorted_expenses[:5]]
 
@@ -872,7 +871,7 @@ def get_admin_dashboard_stats():
             'userStats': user_stats, 
             'organizationStats': org_stats,
             'systemStats': system_stats,
-            'leaderboards': {  # Add the new leaderboards to the response
+            'leaderboards': {
                 'topUsersByRevenue': top_users_by_revenue,
                 'topSellingItems': top_selling_items,
                 'topExpenses': top_expenses