chore: ⚡ Improved Convex functions

Author: subhamBharadwaz

convex/budgets.ts

@@ -41,6 +41,9 @@ export const getAllBudgets = query({
         )
         .reduce((sum, tx) => sum + tx.amount, 0);
 
+      // Calculate the actual remaining amount based on the budget amount and transactions
+      const remaining = budget.amount - totalSpend + totalIncome;
+
       return {
         ...budget,
         category: {
@@ -49,6 +52,7 @@ export const getAllBudgets = query({
         },
         spend: totalSpend,
         income: totalIncome,
+        remaining: remaining,
       };
     });
     return budgetWithDetails;
@@ -97,11 +101,25 @@ export const updateBudget = mutation({
       throw new ConvexError("Budget not found");
     }
 
-    // Calculate the spent amount (existingAmount - remaining)
-    const spent = existingBudget.amount - existingBudget.remaining;
+    // Get all transactions for this category
+    const transactions = await ctx.db
+      .query("transactions")
+      .withIndex("by_category", (q) =>
+        q.eq("categoryId", existingBudget.categoryId),
+      )
+      .collect();
+
+    // Calculate total spend and income
+    const totalSpend = transactions
+      .filter((tx) => tx.type === "expense")
+      .reduce((sum, tx) => sum + tx.amount, 0);
+
+    const totalIncome = transactions
+      .filter((tx) => tx.type === "income")
+      .reduce((sum, tx) => sum + tx.amount, 0);
 
     // Calculate the new remaining amount
-    const newRemaining = args.amount - spent;
+    const newRemaining = args.amount - totalSpend + totalIncome;
 
     await ctx.db.patch(args.id, {
       categoryId: args.categoryId,

convex/transactions.ts

@@ -272,27 +272,28 @@ export const deleteTransaction = mutation({
       );
     }
 
-    const budget = await ctx.db
-      .query("budgets")
-      .withIndex("by_category", (q) =>
-        q.eq("categoryId", existingTransaction.categoryId),
-      )
-      .first();
-
-    if (!budget) {
-      throw new ConvexError("No budget found for the selected category");
-    }
-    // Adjust the remaining based on the transaction type
-    let remaining = budget.remaining;
-    if (existingTransaction.type === "expense") {
-      remaining += existingTransaction.amount; // Revert the expense
-    } else if (existingTransaction.type === "income") {
-      remaining -= existingTransaction.amount; // Revert the income
+    // If there's a categoryId, try to update the associated budget
+    if (existingTransaction.categoryId) {
+      const budget = await ctx.db
+        .query("budgets")
+        .withIndex("by_category", (q) =>
+          q.eq("categoryId", existingTransaction.categoryId),
+        )
+        .first();
+      // Only update budget if one exists
+      if (budget) {
+        let remaining = budget.remaining;
+        if (existingTransaction.type === "expense") {
+          remaining += existingTransaction.amount; // Revert the expense
+        } else if (existingTransaction.type === "income") {
+          remaining -= existingTransaction.amount; // Revert the income
+        }
+        await ctx.db.patch(budget._id, { remaining: remaining });
+      }
     }
 
     //Delete the transaction and patch the budget
     await ctx.db.delete(args.id);
-    await ctx.db.patch(budget._id, { remaining: remaining });
   },
 });