Update main.py

main.py

@@ -228,8 +228,7 @@ def get_user_profile():
 def get_user_dashboard():
     """
     Retrieves and aggregates data for the user's dashboard.
-    **FIXED**: Now normalizes currency codes to prevent fragmentation (e.g., '$' and 'USD'
-    are treated as the same currency).
+    **MODIFIED**: Now filters by a date range if provided.
     """
     uid = verify_token(request.headers.get('Authorization'))
     if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
@@ -245,36 +244,51 @@ def get_user_dashboard():
     if not phone_number: return jsonify({'error': 'No phone number is associated with your account.'}), 404
     
     try:
+        start_date_str = request.args.get('start_date')
+        end_date_str = request.args.get('end_date')
+
+        start_date, end_date = None, None
+        if start_date_str:
+            start_date = datetime.fromisoformat(start_date_str.replace('Z', '+00:00'))
+        if end_date_str:
+            end_date = datetime.fromisoformat(end_date_str.replace('Z', '+00:00'))
+
         bot_data_id = phone_number.lstrip('+')
         bot_user_ref = db.collection('users').document(bot_data_id)
         
         sales_revenue_by_currency, cogs_by_currency, expenses_by_currency = {}, {}, {}
         sales_count = 0
 
-        # --- THE FIX IS HERE ---
-        # Establish the user's default currency as the initial fallback
         default_currency_code = normalize_currency_code(user_data.get('defaultCurrency'), 'USD')
         last_seen_currency_code = default_currency_code
 
         # Process Sales
-        for doc in bot_user_ref.collection('sales').stream():
+        sales_query = bot_user_ref.collection('sales')
+        if start_date:
+            sales_query = sales_query.where('createdAt', '>=', start_date)
+        if end_date:
+            sales_query = sales_query.where('createdAt', '<=', end_date)
+
+        for doc in sales_query.stream():
             details = doc.to_dict().get('details', {})
-            
-            # Normalize the currency code using the helper function
             currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
-            last_seen_currency_code = currency_code # Update for the next transaction
-
+            last_seen_currency_code = currency_code
             quantity, price, cost = int(details.get('quantity', 1)), float(details.get('price', 0)), float(details.get('cost', 0))
             sales_revenue_by_currency[currency_code] = sales_revenue_by_currency.get(currency_code, 0) + (price * quantity)
             cogs_by_currency[currency_code] = cogs_by_currency.get(currency_code, 0) + (cost * quantity)
             sales_count += 1
         
         # Process Expenses
-        for doc in bot_user_ref.collection('expenses').stream():
+        expenses_query = bot_user_ref.collection('expenses')
+        if start_date:
+            expenses_query = expenses_query.where('createdAt', '>=', start_date)
+        if end_date:
+            expenses_query = expenses_query.where('createdAt', '<=', end_date)
+
+        for doc in expenses_query.stream():
             details = doc.to_dict().get('details', {})
             currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
             last_seen_currency_code = currency_code
-            
             amount = float(details.get('amount', 0))
             expenses_by_currency[currency_code] = expenses_by_currency.get(currency_code, 0) + amount
 
@@ -788,10 +802,20 @@ def get_admin_dashboard_stats():
     """
     Retrieves complete global statistics, including an accurate total user count
     and separate Top 5 leaderboards for each currency.
+    **MODIFIED**: Now filters by a date range if provided.
     """
     try:
         verify_admin_and_get_uid(request.headers.get('Authorization'))
 
+        start_date_str = request.args.get('start_date')
+        end_date_str = request.args.get('end_date')
+
+        start_date, end_date = None, None
+        if start_date_str:
+            start_date = datetime.fromisoformat(start_date_str.replace('Z', '+00:00'))
+        if end_date_str:
+            end_date = datetime.fromisoformat(end_date_str.replace('Z', '+00:00'))
+
         # --- Initialization ---
         all_users_docs = list(db.collection('users').stream())
         all_orgs_docs = list(db.collection('organizations').stream())
@@ -820,17 +844,14 @@ def get_admin_dashboard_stats():
                 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
+            'total': len(user_profile_docs),
             'admins': admin_count,
             'approvedForBot': approved_users,
             'pendingApproval': pending_approvals
         }
-        # --- END OF FIX ---
         
         org_stats = {'total': len(all_orgs_docs)}
 
@@ -844,7 +865,13 @@ def get_admin_dashboard_stats():
                 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')
 
-                for sale_doc in bot_user_ref.collection('sales').stream():
+                sales_query = bot_user_ref.collection('sales')
+                if start_date:
+                    sales_query = sales_query.where('createdAt', '>=', start_date)
+                if end_date:
+                    sales_query = sales_query.where('createdAt', '<=', end_date)
+
+                for sale_doc in sales_query.stream():
                     details = sale_doc.to_dict().get('details', {})
                     currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
                     last_seen_currency_code = currency_code
@@ -861,7 +888,13 @@ def get_admin_dashboard_stats():
                     if item_name not in global_item_revenue: global_item_revenue[item_name] = {}
                     global_item_revenue[item_name][currency_code] = global_item_revenue[item_name].get(currency_code, 0) + sale_revenue
                 
-                for expense_doc in bot_user_ref.collection('expenses').stream():
+                expenses_query = bot_user_ref.collection('expenses')
+                if start_date:
+                    expenses_query = expenses_query.where('createdAt', '>=', start_date)
+                if end_date:
+                    expenses_query = expenses_query.where('createdAt', '<=', end_date)
+
+                for expense_doc in expenses_query.stream():
                     details = expense_doc.to_dict().get('details', {})
                     currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
                     last_seen_currency_code = currency_code