kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Less queries for category frontpage chart.

Browse Source
This commit is contained in:
James Cole
2015-12-29 10:08:40 +01:00
parent 658265c938
commit 0fd0d7d080
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -123,7 +123,6 @@ class CategoryController extends Controller
$data = $this->generator->frontpage($set); $data = $this->generator->frontpage($set);
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);
} }

71
app/Repositories/Category/CategoryRepository.php
View File

@@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Category;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Crypt;
use DB; use DB;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -137,7 +136,6 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
/** /**
*
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* *
@@ -145,36 +143,55 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
*/ */
public function getCategoriesAndExpenses(Carbon $start, Carbon $end) public function getCategoriesAndExpenses(Carbon $start, Carbon $end)
{ {
$set = Auth::user()->transactionjournals() $set = Auth::user()->categories()
->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin( ->leftJoin(
'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' 'transactions', function (JoinClause $join) {
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
}
) )
->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->before($end) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where('categories.user_id', Auth::user()->id) ->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL])
->after($start) ->whereNull('transaction_journals.deleted_at')
->transactionTypes([TransactionType::WITHDRAWAL]) ->groupBy('categories.id')
->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']); ->orderBy('totalAmount')
->get(
bcscale(2); [
$result = []; 'categories.*',
DB::Raw('SUM(`transactions`.`amount`) as `totalAmount`')
]
);
$array = [];
/** @var Category $entry */
foreach ($set as $entry) { foreach ($set as $entry) {
$categoryId = intval($entry->category_id); $id = $entry->id;
if (isset($result[$categoryId])) { $array[$id] = ['name' => $entry->name, 'sum' => $entry->totalAmount];
$result[$categoryId]['sum'] = bcadd($result[$categoryId]['sum'], $entry->amount);
} else {
$isEncrypted = intval($entry->category_encrypted) === 1 ? true : false;
$name = strlen($entry->name) === 0 ? trans('firefly.no_category') : $entry->name;
$name = $isEncrypted ? Crypt::decrypt($name) : $name;
$result[$categoryId] = [
'name' => $name,
'sum' => $entry->amount,
];
}
} }
return $result; // without category:
$single = Auth::user()->transactionjournals()
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin(
'transactions', function (JoinClause $join) {
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
}
)
->whereNull('category_transaction_journal.id')
->whereNull('transaction_journals.deleted_at')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL])
->whereNull('transaction_journals.deleted_at')
->first([DB::Raw('SUM(transactions.amount) as `totalAmount`')]);
$noCategory = is_null($single->totalAmount) ? '0' : $single->totalAmount;
$array[0] = ['name' => trans('firefly.no_category'), 'sum' => $noCategory];
return $array;
} }
/** /**