Merge pull request #175 from ayaz9616/feature/income-by-category

Add Income by Category feature

Author: archa8

backend/controllers/transactionController.js

@@ -201,9 +201,25 @@ const getChartData = async (req, res) => {
     const thirtyDaysAgo = new Date();
     thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
 
+    // Optional date range from query for category aggregations
+    const { startDate, endDate } = req.query;
+    let dateMatch = {};
+    if (startDate || endDate) {
+      dateMatch.addedOn = {};
+      if (startDate) dateMatch.addedOn.$gte = new Date(startDate);
+      if (endDate) dateMatch.addedOn.$lte = new Date(endDate);
+    }
+
     // Data for Expenses by Category (Pie Chart)
     const expensesByCategory = await IncomeExpense.aggregate([
-      { $match: { user: userId, isIncome: false, isDeleted: false } },
+      { $match: { user: userId, isIncome: false, isDeleted: false, ...(dateMatch.addedOn ? { addedOn: dateMatch.addedOn } : {}) } },
+      { $group: { _id: '$category', total: { $sum: '$cost' } } },
+      { $project: { name: '$_id', total: 1, _id: 0 } }
+    ]);
+
+    // Data for Income by Category (Pie Chart)
+    const incomeByCategory = await IncomeExpense.aggregate([
+      { $match: { user: userId, isIncome: true, isDeleted: false, ...(dateMatch.addedOn ? { addedOn: dateMatch.addedOn } : {}) } },
       { $group: { _id: '$category', total: { $sum: '$cost' } } },
       { $project: { name: '$_id', total: 1, _id: 0 } }
     ]);
@@ -234,7 +250,7 @@ const getChartData = async (req, res) => {
       { $project: { date: '$_id', total: 1, _id: 0 } }
     ]);
 
-    res.json({ expensesByCategory, expensesOverTime, incomeOverTime });
+    res.json({ expensesByCategory, incomeByCategory, expensesOverTime, incomeOverTime });
   } catch (error) {
     // Also log the error to the backend console for easier debugging
     console.error('Error in getChartData:', error);

backend/models/IncomeExpense.js

@@ -41,4 +41,10 @@ const incomeExpenseSchema = new mongoose.Schema({
   timestamps: true,
 });
 
+// Helpful indexes for common filters and aggregations
+// Queries often filter by user, isIncome, isDeleted, date, and group by category
+incomeExpenseSchema.index({ user: 1, isDeleted: 1, isIncome: 1, addedOn: -1 });
+incomeExpenseSchema.index({ user: 1, isDeleted: 1, category: 1 });
+incomeExpenseSchema.index({ user: 1, isDeleted: 1, addedOn: -1 });
+
 module.exports = mongoose.model('IncomeExpense', incomeExpenseSchema);