Use budgets (createdBy) as primary source for recommendations

app/smart_recommendation.py

@@ -36,33 +36,34 @@ class SmartBudgetRecommender:
         Returns:
             List of budget recommendations for each category
         """
-        # Get past expenses (last 6 months for better accuracy)
-        end_date = datetime(year, month, 1) - timedelta(days=1)
-        start_date = end_date - timedelta(days=180)  # ~6 months
-        
-        expenses = list(
-            self.db.expenses.find(
-                {
-                    "user_id": user_id,
-                    "date": {"$gte": start_date, "$lte": end_date},
-                    "type": "expense",
-                }
+        # 1) Try to build stats from existing budgets for this user (createdBy)
+        category_data = self._get_category_stats_from_budgets(user_id, month, year)
+
+        # 2) If there are no budgets, fall back to expenses history
+        if not category_data:
+            end_date = datetime(year, month, 1) - timedelta(days=1)
+            start_date = end_date - timedelta(days=180)  # ~6 months
+
+            expenses = list(
+                self.db.expenses.find(
+                    {
+                        "user_id": user_id,
+                        "date": {"$gte": start_date, "$lte": end_date},
+                        "type": "expense",
+                    }
+                )
             )
-        )
 
-        recommendations: List[BudgetRecommendation] = []
+            if not expenses:
+                return []
 
-        if expenses:
             # Group expenses by category and calculate monthly averages
             category_data = self._calculate_category_statistics(
                 expenses, start_date, end_date
             )
-        else:
-            # No expenses found: fallback to existing budgets for this period
-            category_data = self._get_category_stats_from_budgets(user_id, month, year)
-            if not category_data:
-                return []
         
+        recommendations: List[BudgetRecommendation] = []
+
         for category, data in category_data.items():
             avg_expense = data["average_monthly"]
             confidence = self._calculate_confidence(data)
@@ -249,17 +250,16 @@ class SmartBudgetRecommender:
         self, user_id: str, month: int, year: int
     ) -> Dict:
         """
-        Fallback source when there are no expenses:
-        use existing budgets for the requested month/year as the 'average' spend.
+        Build category stats from existing budgets for this user.
+
+        We treat each budget document (e.g. \"Office Maintenance\", \"LOGICGO\")
+        as a spending category and derive an \"average\" from its amounts.
         """
         budgets = list(
             self.db.budgets.find(
                 {
-                    "user_id": user_id,
-                    "period": {"$in": ["monthly", "MONTHLY"]},
-                    "start_date": {
-                        "$lte": datetime(year, month, 28)
-                    },  # loosely within month
+                    "createdBy": user_id,
+                    "status": "OPEN",
                 }
             )
         )
@@ -269,26 +269,36 @@ class SmartBudgetRecommender:
 
         result: Dict[str, Dict] = {}
         for b in budgets:
-            category = b.get("category", "Uncategorized")
-            amount = float(b.get("amount", 0))
+            # Use budget \"name\" as category label
+            category = b.get("name", "Uncategorized")
+
+            # Derive a base amount from WalletSync fields
+            max_amount = float(b.get("maxAmount", 0) or 0)
+            spend_amount = float(b.get("spendAmount", 0) or 0)
+
+            # If there is recorded spend, use that as \"average\"; otherwise maxAmount
+            base_amount = spend_amount if spend_amount > 0 else max_amount
+            if base_amount <= 0:
+                continue
+
             if category not in result:
                 result[category] = {
-                    "average_monthly": amount,
-                    "total": amount,
+                    "average_monthly": base_amount,
+                    "total": base_amount,
                     "count": 1,
                     "months_analyzed": 1,
                     "std_dev": 0.0,
-                    "monthly_values": [amount],
+                    "monthly_values": [base_amount],
                 }
             else:
                 # If multiple budgets per category, average them
-                result[category]["total"] += amount
+                result[category]["total"] += base_amount
                 result[category]["count"] += 1
                 result[category]["months_analyzed"] = result[category]["count"]
                 result[category]["average_monthly"] = (
                     result[category]["total"] / result[category]["count"]
                 )
-                result[category]["monthly_values"].append(amount)
+                result[category]["monthly_values"].append(base_amount)
 
         return result