IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Optimized queries.

Browse Source
This commit is contained in:
Sander Dorigo 2014-11-08 10:16:12 +01:00
parent 6d8f84654f
commit 8196313ac0
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/lib/FireflyIII/Database/TransactionJournal.php
View File

@ -40,12 +40,15 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
$end = clone $date;
$date->startOfMonth();
$end->endOfMonth();
$list = $this->getUser()->transactionjournals()->transactionTypes(['Deposit'])->before($end)->after($date)->get(['transaction_journals.*']);
$sum = 0;
/** @var \TransactionJournal $entry */
foreach ($list as $entry) {
$sum += $entry->getAmount();
}
$sum = \DB::table('transactions')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->where('amount', '>', 0)
->where('transaction_types.type', '=', 'Deposit')
->where('transaction_journals.date', '>=', $date->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))->sum('transactions.amount');
$sum = floatval($sum);
return $sum;
}
@ -54,16 +57,20 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
*
* @return float
*/
public function getSumOfExpensesByMonth(Carbon $date) {
public function getSumOfExpensesByMonth(Carbon $date)
{
$end = clone $date;
$date->startOfMonth();
$end->endOfMonth();
$list = $this->getUser()->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($date)->get(['transaction_journals.*']);
$sum = 0;
/** @var \TransactionJournal $entry */
foreach ($list as $entry) {
$sum += $entry->getAmount();
}
$sum = \DB::table('transactions')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->where('amount', '>', 0)
->where('transaction_types.type', '=', 'Withdrawal')
->where('transaction_journals.date', '>=', $date->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))->sum('transactions.amount');
$sum = floatval($sum);
return $sum;
}

2
app/models/TransactionJournal.php
View File

@ -50,11 +50,13 @@ class TransactionJournal extends Ardent
*/
public function getAmount()
{
foreach ($this->transactions as $t) {
if (floatval($t->amount) > 0) {
return floatval($t->amount);
}
}
return -0.01;
}
/**