Optimised whole budget chart to use less queries.

app/Http/Controllers/Chart/BudgetController.php

@@ -130,11 +130,6 @@ class BudgetController extends Controller
         $first = $repository->getFirstBudgetLimitDate($budget);
         $range = Preferences::get('viewRange', '1M')->data;
         $last  = Session::get('end', new Carbon);
-        $final = clone $last;
-        $final->addYears(2);
-        $last     = Navigation::endOfX($last, $range, $final);
-        $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
-
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -142,18 +137,29 @@ class BudgetController extends Controller
         $cache->addProperty($last);
         $cache->addProperty('budget');
         if ($cache->has()) {
+
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $final = clone $last;
+        $final->addYears(2);
+        $last    = Navigation::endOfX($last, $range, $final);
         $entries = new Collection;
+        // get all expenses:
+        $set = $repository->getExpensesPerMonth($budget, $first, $last);
 
         while ($first < $last) {
-            $end = Navigation::addPeriod($first, $range, 0);
+            $monthFormatted = $first->format('Y-m');
-            $end->subDay();
+
-            $chartDate = clone $end;
+            $filtered = $set->filter(
-            $chartDate->startOfMonth();
+                function (Budget $obj) use ($monthFormatted) {
-            $spent = $repository->balanceInPeriod($budget, $first, $end, $accounts) * -1;
+                    return $obj->dateFormatted == $monthFormatted;
-            $entries->push([$chartDate, $spent]);
+                }
+            );
+            $spent    = is_null($filtered->first()) ? '0' : $filtered->first()->monthlyAmount;
+
+            $entries->push([$first, round(($spent * -1), 2)]);
+
             $first = Navigation::addPeriod($first, $range, 0);
         }
 

app/Repositories/Budget/BudgetRepository.php

@@ -49,26 +49,12 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
      */
     public function getExpensesPerDay(Budget $budget, Carbon $start, Carbon $end)
     {
-        /*
-         * select transaction_journals.date, SUM(transactions.amount) as dailyAmount from budgets
-left join budget_transaction_journal ON budget_transaction_journal.budget_id = budgets.id
-left join transaction_journals ON budget_transaction_journal.transaction_journal_id = transaction_journals.id
-left join transactions ON transaction_journals.id = transactions.transaction_journal_id
-where
-
-transaction_journals.date >= "2015-12-01"
-and transaction_journals.date <= "2015-12-31"
-and budgets.id = 1
-and transactions.amount < 0
-group by transaction_journals.date
-order by transaction_journals.date
-         */
-
         $set = Auth::user()->budgets()
                    ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
                    ->leftJoin('transaction_journals', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
                    ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                    ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                   ->whereNull('transaction_journals.deleted_at')
                    ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
                    ->where('budgets.id', $budget->id)
                    ->where('transactions.amount', '<', 0)
@@ -77,7 +63,39 @@ order by transaction_journals.date
                    ->get(['transaction_journals.date', DB::Raw('SUM(`transactions`.`amount`) as `dailyAmount`')]);
 
         return $set;
+    }
 
+    /**
+     * Returns the expenses for this budget grouped per month, with the date
+     * in "dateFormatted" (a string, not a Carbon) and the amount in "dailyAmount".
+     *
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function getExpensesPerMonth(Budget $budget, Carbon $start, Carbon $end)
+    {
+        $set = Auth::user()->budgets()
+                   ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
+                   ->leftJoin('transaction_journals', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                   ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                   ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                   ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                   ->whereNull('transaction_journals.deleted_at')
+                   ->where('budgets.id', $budget->id)
+                   ->where('transactions.amount', '<', 0)
+                   ->groupBy('dateFormatted')
+                   ->orderBy('transaction_journals.date')
+                   ->get(
+                       [
+                           DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'),
+                           DB::Raw('SUM(`transactions`.`amount`) as `monthlyAmount`')
+                       ]
+                   );
+
+        return $set;
     }
 
     /**

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -32,6 +32,18 @@ interface BudgetRepositoryInterface
      */
     public function getExpensesPerDay(Budget $budget, Carbon $start, Carbon $end);
 
+    /**
+     * Returns the expenses for this budget grouped per month, with the date
+     * in "date" (a string, not a Carbon) and the amount in "dailyAmount".
+     *
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function getExpensesPerMonth(Budget $budget, Carbon $start, Carbon $end);
+
     /**
      * @param Budget $budget
      *