kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 00:04:24 +00:00
Code Issues Projects Releases Wiki Activity

Debug log for #366

Browse Source
This commit is contained in:
James Cole
2016-10-29 16:16:10 +02:00
parent 35f179625c
commit e9c2446cba
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Repositories/Budget/BudgetRepository.php
View File

@@ -27,6 +27,7 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* Class BudgetRepository * Class BudgetRepository
@@ -351,6 +352,11 @@ class BudgetRepository implements BudgetRepositoryInterface
// collect amount of transaction journals, which is easy: // collect amount of transaction journals, which is easy:
$budgetIds = $budgets->pluck('id')->toArray(); $budgetIds = $budgets->pluck('id')->toArray();
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
Log::debug('spentInPeriod: Now in spentInPeriod for these budgets: ', $budgetIds);
Log::debug('spentInPeriod: and these accounts: ', $accountIds);
Log::debug(sprintf('spentInPeriod: Start date is "%s", end date is "%s"', $start->format('Y-m-d'), $end->format('Y-m-d')));
$fromJournalsQuery = TransactionJournal $fromJournalsQuery = TransactionJournal
::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
@@ -376,6 +382,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$fromJournalsQuery->whereIn('transactions.account_id', $accountIds); $fromJournalsQuery->whereIn('transactions.account_id', $accountIds);
} }
$first = strval($fromJournalsQuery->sum('transactions.amount')); $first = strval($fromJournalsQuery->sum('transactions.amount'));
Log::debug(sprintf('spentInPeriod: Result from first query: %s', $first));
unset($fromJournalsQuery); unset($fromJournalsQuery);
// collect amount from transactions: // collect amount from transactions:
@@ -408,6 +415,9 @@ class BudgetRepository implements BudgetRepositoryInterface
$fromTransactionsQuery->whereIn('transactions.account_id', $accountIds); $fromTransactionsQuery->whereIn('transactions.account_id', $accountIds);
} }
$second = strval($fromTransactionsQuery->sum('transactions.amount')); $second = strval($fromTransactionsQuery->sum('transactions.amount'));
Log::debug(sprintf('spentInPeriod: Result from second query: %s', $second));
Log::debug(sprintf('spentInPeriod: FINAL: %s', bcadd($first, $second)));
return bcadd($first, $second); return bcadd($first, $second);
} }