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

Some issues fixed for scrutiniser.

Browse Source
This commit is contained in:
James Cole
2016-09-25 08:36:35 +02:00
parent 45bc23b8af
commit 0d198193db
4 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,26 +121,17 @@ class CategoryRepository implements CategoryRepositoryInterface
}
/**
* @param Category $category
* @param Collection $accounts
* @param Category $category
*
* @return Carbon
*/
public function firstUseDate(Category $category, Collection $accounts): Carbon
public function firstUseDate(Category $category): Carbon
{
$first = null;
/** @var TransactionJournal $first */
$firstJournalQuery = $category->transactionJournals()->orderBy('date', 'ASC');
if ($accounts->count() > 0) {
// filter journals:
$ids = $accounts->pluck('id')->toArray();
$firstJournalQuery->leftJoin('transactions as t', 't.transaction_journal_id', '=', 'transaction_journals.id');
$firstJournalQuery->whereIn('t.account_id', $ids);
}
$firstJournal = $firstJournalQuery->first(['transaction_journals.date']);
$firstJournal = $category->transactionJournals()->orderBy('date', 'ASC')->first(['transaction_journals.date']);
if ($firstJournal) {
$first = $firstJournal->date;
@@ -148,16 +139,9 @@ class CategoryRepository implements CategoryRepositoryInterface
// check transactions:
$firstTransactionQuery = $category->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->orderBy('transaction_journals.date', 'ASC');
if ($accounts->count() > 0) {
// filter journals:
$ids = $accounts->pluck('id')->toArray();
$firstTransactionQuery->whereIn('transactions.account_id', $ids);
}
$firstTransaction = $firstTransactionQuery->first(['transaction_journals.date']);
$firstTransaction = $category->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->orderBy('transaction_journals.date', 'ASC')->first(['transaction_journals.date']);
if (!is_null($firstTransaction) && ((!is_null($first) && $firstTransaction->date < $first) || is_null($first))) {
$first = new Carbon($firstTransaction->date);

3
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@@ -70,11 +70,10 @@ interface CategoryRepositoryInterface
/**
* @param Category $category
* @param Collection $accounts
*
* @return Carbon
*/
public function firstUseDate(Category $category, Collection $accounts): Carbon;
public function firstUseDate(Category $category): Carbon;
/**
* Returns a list of all the categories belonging to a user.