Update main.py

main.py

@@ -263,14 +263,17 @@ def get_user_dashboard():
         last_seen_currency_code = default_currency_code
 
         # Process Sales
-        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)
+        sales_query = bot_user_ref.collection('sales').stream()
+        for doc in sales_query:
+            doc_data = doc.to_dict()
+            created_at = doc_data.get('createdAt')
 
-        for doc in sales_query.stream():
-            details = doc.to_dict().get('details', {})
+            if start_date and (not created_at or created_at < start_date):
+                continue
+            if end_date and (not created_at or created_at > end_date):
+                continue
+
+            details = doc_data.get('details', {})
             currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
             last_seen_currency_code = currency_code
             quantity, price, cost = int(details.get('quantity', 1)), float(details.get('price', 0)), float(details.get('cost', 0))
@@ -279,13 +282,16 @@ def get_user_dashboard():
             sales_count += 1
         
         # Process Expenses
-        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)
+        expenses_query = bot_user_ref.collection('expenses').stream()
+        for doc in expenses_query:
+            doc_data = doc.to_dict()
+            created_at = doc_data.get('createdAt')
+
+            if start_date and (not created_at or created_at < start_date):
+                continue
+            if end_date and (not created_at or created_at > end_date):
+                continue
 
-        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
@@ -865,14 +871,17 @@ 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')
 
-                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)
+                sales_query = bot_user_ref.collection('sales').stream()
+                for sale_doc in sales_query:
+                    sale_data = sale_doc.to_dict()
+                    created_at = sale_data.get('createdAt')
+
+                    if start_date and (not created_at or created_at < start_date):
+                        continue
+                    if end_date and (not created_at or created_at > end_date):
+                        continue
 
-                for sale_doc in sales_query.stream():
-                    details = sale_doc.to_dict().get('details', {})
+                    details = sale_data.get('details', {})
                     currency_code = normalize_currency_code(details.get('currency'), last_seen_currency_code)
                     last_seen_currency_code = currency_code
                     quantity, price, cost = int(details.get('quantity', 1)), float(details.get('price', 0)), float(details.get('cost', 0))
@@ -888,14 +897,17 @@ 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
                 
-                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', {})
+                expenses_query = bot_user_ref.collection('expenses').stream()
+                for expense_doc in expenses_query:
+                    expense_data = expense_doc.to_dict()
+                    created_at = expense_data.get('createdAt')
+
+                    if start_date and (not created_at or created_at < start_date):
+                        continue
+                    if end_date and (not created_at or created_at > end_date):
+                        continue
+
+                    details = expense_data.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))