kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-05-02 20:49:19 +02:00
parent 5e1167b8ae
commit 3344bb7263
21 changed files with 105 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Repositories/Category/SingleCategoryRepository.php
View File

@@ -33,27 +33,24 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
}
/**
* @param Category $category
* @param Category $category
* @param Carbon|null $start
* @param Carbon|null $end
*
* @return int
*/
public function countJournals(Category $category): int
public function countJournals(Category $category, Carbon $start = null, Carbon $end = null): int
{
return $category->transactionjournals()->count();
$query = $category->transactionjournals();
if (!is_null($start)) {
$query->after($start);
}
if (!is_null($end)) {
$query->before($end);
}
}
return $query->count();
/**
* @param Category $category
*
* @param Carbon $start
* @param Carbon $end
*
* @return int
*/
public function countJournalsInRange(Category $category, Carbon $start, Carbon $end): int
{
return $category->transactionjournals()->before($end)->after($start)->count();
}
/**
@@ -153,11 +150,7 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
{
$offset = $page > 0 ? $page * $pageSize : 0;
return $category->transactionjournals()->expanded()->take($pageSize)->offset($offset)
->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC')
->get(TransactionJournal::queryFields());
return $category->transactionjournals()->expanded()->take($pageSize)->offset($offset)->get(TransactionJournal::queryFields());
}

16
app/Repositories/Category/SingleCategoryRepositoryInterface.php
View File

@@ -16,21 +16,13 @@ interface SingleCategoryRepositoryInterface
{
/**
* @param Category $category
* @param Category $category
* @param Carbon|null $start
* @param Carbon|null $end
*
* @return int
*/
public function countJournals(Category $category): int;
/**
* @param Category $category
*
* @param Carbon $start
* @param Carbon $end
*
* @return int
*/
public function countJournalsInRange(Category $category, Carbon $start, Carbon $end): int;
public function countJournals(Category $category, Carbon $start = null, Carbon $end = null): int;
/**
* @param Category $category