Update main.py

main.py

@@ -762,8 +762,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 complete global statistics, including separate Top 5 leaderboards
-    for each currency found in the system.
+    Retrieves complete global statistics, including an accurate total user count
+    and separate Top 5 leaderboards for each currency.
     """
     try:
         verify_admin_and_get_uid(request.headers.get('Authorization'))
@@ -772,52 +772,54 @@ def get_admin_dashboard_stats():
         all_users_docs = list(db.collection('users').stream())
         all_orgs_docs = list(db.collection('organizations').stream())
         
-        # Log initial data collection
-        logging.info(f"Admin Dashboard: Retrieved {len(all_users_docs)} users and {len(all_orgs_docs)} organizations")
-        
-        # Data structures for aggregation
-        user_sales_data = {}
-        global_item_revenue = {}    # Will now be nested: {item: {currency: total}}
-        global_expense_totals = {}  # Will now be nested: {category: {currency: total}}
-        phone_to_user_map = {}
+        user_sales_data, global_item_revenue, global_expense_totals, phone_to_user_map = {}, {}, {}, {}
         global_sales_rev_by_curr, global_cogs_by_curr, global_expenses_by_curr = {}, {}, {}
 
-        # --- First Pass: Get user info ---
+        # --- First Pass: Process all documents to gather stats and approved phones ---
         pending_approvals, approved_users, admin_count = 0, 0, 0
         approved_phone_numbers = []
+
         for doc in all_users_docs:
             user_data = doc.to_dict()
-            phone = user_data.get('phone')
-            if user_data.get('phoneStatus') == 'pending':
-                pending_approvals += 1
-            elif user_data.get('phoneStatus') == 'approved' and phone:
-                approved_users += 1
-                approved_phone_numbers.append(phone)
-                phone_to_user_map[phone] = {
-                    'displayName': user_data.get('displayName', 'N/A'), 'uid': user_data.get('uid'),
-                    'defaultCurrency': user_data.get('defaultCurrency', 'USD')
-                }
-            if user_data.get('isAdmin', False):
-                admin_count += 1
-        
-        user_stats = {'total': len(all_users_docs), 'admins': admin_count, 'approvedForBot': approved_users, 'pendingApproval': pending_approvals}
+            # This check ensures we only process documents that are actual user profiles
+            if user_data.get('email'):
+                phone = user_data.get('phone')
+                if user_data.get('phoneStatus') == 'pending':
+                    pending_approvals += 1
+                elif user_data.get('phoneStatus') == 'approved' and phone:
+                    approved_users += 1
+                    approved_phone_numbers.append(phone)
+                    phone_to_user_map[phone] = {
+                        'displayName': user_data.get('displayName', 'N/A'), 'uid': user_data.get('uid'),
+                        'defaultCurrency': user_data.get('defaultCurrency', 'USD')
+                    }
+                if user_data.get('isAdmin', False):
+                    admin_count += 1
+        
+        # --- THE FIX IS HERE: Create a filtered list of only user profiles for an accurate count ---
+        user_profile_docs = [doc for doc in all_users_docs if doc.to_dict().get('email')]
+        
+        # Assemble the accurate user stats
+        user_stats = {
+            'total': len(user_profile_docs), # Use the length of the filtered list
+            'admins': admin_count,
+            'approvedForBot': approved_users,
+            'pendingApproval': pending_approvals
+        }
+        # --- END OF FIX ---
+        
         org_stats = {'total': len(all_orgs_docs)}
 
-        # Log user processing results
-        logging.info(f"Admin Dashboard: User stats - Total: {user_stats['total']}, Admins: {user_stats['admins']}, Approved: {user_stats['approvedForBot']}, Pending: {user_stats['pendingApproval']}")
-
-        # --- Second Pass: Aggregate all financial data ---
+        # --- Second Pass: Aggregate financial data from bot documents ---
         sales_count = 0
         for phone in approved_phone_numbers:
             try:
                 bot_data_id = phone.lstrip('+')
                 bot_user_ref = db.collection('users').document(bot_data_id)
+                
                 user_sales_data[phone] = {'total_revenue_by_currency': {}, 'item_sales': {}}
                 last_seen_currency_code = normalize_currency_code(phone_to_user_map.get(phone, {}).get('defaultCurrency'), 'USD')
 
-                user_sales_count = 0
-                user_expenses_count = 0
-                
                 for sale_doc in bot_user_ref.collection('sales').stream():
                     details = sale_doc.to_dict().get('details', {})
                     currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
@@ -829,7 +831,6 @@ def get_admin_dashboard_stats():
                     global_sales_rev_by_curr[currency_code] = global_sales_rev_by_curr.get(currency_code, 0) + sale_revenue
                     global_cogs_by_curr[currency_code] = global_cogs_by_curr.get(currency_code, 0) + (cost * quantity)
                     sales_count += 1
-                    user_sales_count += 1
                     
                     user_sales_data[phone]['total_revenue_by_currency'][currency_code] = user_sales_data[phone]['total_revenue_by_currency'].get(currency_code, 0) + sale_revenue
                     
@@ -846,54 +847,28 @@ def get_admin_dashboard_stats():
                     global_expenses_by_curr[currency_code] = global_expenses_by_curr.get(currency_code, 0) + amount
                     if category not in global_expense_totals: global_expense_totals[category] = {}
                     global_expense_totals[category][currency_code] = global_expense_totals[category].get(currency_code, 0) + amount
-                    user_expenses_count += 1
-                
-                # Log per-user processing results
-                if user_sales_count > 0 or user_expenses_count > 0:
-                    logging.info(f"Admin Dashboard: User {phone} - Sales: {user_sales_count}, Expenses: {user_expenses_count}")
-                    
             except Exception as e:
                 logging.error(f"Admin stats: Could not process data for phone {phone}. Error: {e}")
                 continue
         
-        # Log financial aggregation results
-        logging.info(f"Admin Dashboard: Financial aggregation - Total sales: {sales_count}, Currencies found: {list(set(global_sales_rev_by_curr.keys()) | set(global_expenses_by_curr.keys()))}")
-        logging.info(f"Admin Dashboard: Revenue by currency: {global_sales_rev_by_curr}")
-        logging.info(f"Admin Dashboard: Expenses by currency: {global_expenses_by_curr}")
-        
         # --- Post-Processing: Generate Leaderboards For Each Currency ---
         all_currencies = set(global_sales_rev_by_curr.keys()) | set(global_expenses_by_curr.keys())
         
-        leaderboards = {
-            'topUsersByRevenue': {},
-            'topSellingItems': {},
-            'topExpenses': {}
-        }
+        leaderboards = {'topUsersByRevenue': {}, 'topSellingItems': {}, 'topExpenses': {}}
 
         for currency in all_currencies:
-            # Rank Users for this currency
             users_in_curr = [(phone, data['total_revenue_by_currency'].get(currency, 0)) for phone, data in user_sales_data.items() if data['total_revenue_by_currency'].get(currency, 0) > 0]
             sorted_users = sorted(users_in_curr, key=lambda item: item[1], reverse=True)
-            leaderboards['topUsersByRevenue'][currency] = [{
-                'displayName': phone_to_user_map.get(phone, {}).get('displayName'),
-                'uid': phone_to_user_map.get(phone, {}).get('uid'),
-                'totalRevenue': round(revenue, 2)
-            } for phone, revenue in sorted_users[:5]]
+            leaderboards['topUsersByRevenue'][currency] = [{'displayName': phone_to_user_map.get(phone, {}).get('displayName'), 'uid': phone_to_user_map.get(phone, {}).get('uid'), 'totalRevenue': round(revenue, 2)} for phone, revenue in sorted_users[:5]]
 
-            # Rank Items for this currency
             items_in_curr = [(name, totals.get(currency, 0)) for name, totals in global_item_revenue.items() if totals.get(currency, 0) > 0]
             sorted_items = sorted(items_in_curr, key=lambda item: item[1], reverse=True)
             leaderboards['topSellingItems'][currency] = [{'item': name, 'totalRevenue': round(revenue, 2)} for name, revenue in sorted_items[:5]]
             
-            # Rank Expenses for this currency
             expenses_in_curr = [(name, totals.get(currency, 0)) for name, totals in global_expense_totals.items() if totals.get(currency, 0) > 0]
             sorted_expenses = sorted(expenses_in_curr, key=lambda item: item[1], reverse=True)
             leaderboards['topExpenses'][currency] = [{'category': name, 'totalAmount': round(amount, 2)} for name, amount in sorted_expenses[:5]]
 
-        # Log leaderboard generation results
-        for currency in all_currencies:
-            logging.info(f"Admin Dashboard: Leaderboard for {currency} - Top users: {len(leaderboards['topUsersByRevenue'][currency])}, Top items: {len(leaderboards['topSellingItems'][currency])}, Top expenses: {len(leaderboards['topExpenses'][currency])}")
-
         # --- Final Assembly ---
         global_net_profit_by_curr = {}
         for curr in all_currencies:
@@ -910,29 +885,12 @@ def get_admin_dashboard_stats():
             'totalSalesCount': sales_count,
         }
 
-        # Log final response data structure
-        response_data = {
-            'userStats': user_stats, 
-            'organizationStats': org_stats, 
-            'systemStats': system_stats, 
-            'leaderboards': leaderboards
-        }
-        
-        logging.info(f"Admin Dashboard: Final response structure - userStats keys: {list(user_stats.keys())}, systemStats keys: {list(system_stats.keys())}, leaderboards keys: {list(leaderboards.keys())}")
-        logging.info(f"Admin Dashboard: System stats summary - Total currencies: {len(all_currencies)}, Net profit by currency: {global_net_profit_by_curr}")
-        
-        # Log the complete response data
-        logging.info(f"Admin Dashboard: Complete response data: {response_data}")
-        
-        # Log response data size for debugging
-        import json
-        response_size = len(json.dumps(response_data))
-        logging.info(f"Admin Dashboard: Response data size: {response_size} bytes")
-
-        return jsonify(response_data), 200
+        return jsonify({
+            'userStats': user_stats, 'organizationStats': org_stats, 
+            'systemStats': system_stats, 'leaderboards': leaderboards
+        }), 200
 
     except PermissionError as e:
-        logging.error(f"Admin Dashboard: Permission denied - {e}")
         return jsonify({'error': str(e)}), 403
     except Exception as e:
         logging.error(f"Admin failed to fetch dashboard stats: {e}", exc_info=True)