kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Various code clean up.

Browse Source
This commit is contained in:
James Cole
2017-07-07 13:50:15 +02:00
parent 71a41bc00d
commit 69eef30ad3
9 changed files with 83 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,42 +160,19 @@ class CategoryRepository implements CategoryRepositoryInterface
*/
public function lastUseDate(Category $category, Collection $accounts): Carbon
{
$last = null;
$last = new Carbon('1900-01-01');
$lastJournalDate = $this->getLastJournalDate($category, $accounts);
/** @var TransactionJournal $first */
$lastJournalQuery = $category->transactionJournals()->orderBy('date', 'DESC');
if ($accounts->count() > 0) {
// filter journals:
$ids = $accounts->pluck('id')->toArray();
$lastJournalQuery->leftJoin('transactions as t', 't.transaction_journal_id', '=', 'transaction_journals.id');
$lastJournalQuery->whereIn('t.account_id', $ids);
if ($lastJournalDate->year !== 1900) {
$last = clone $lastJournalDate;
unset($lastJournalDate);
}
$lastJournal = $lastJournalQuery->first(['transaction_journals.*']);
$lastTransactionDate = $this->getLastTransactionDate($category, $accounts);
if ($lastJournal) {
$last = $lastJournal->date;
}
// check transactions:
$lastTransactionQuery = $category->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->orderBy('transaction_journals.date', 'DESC');
if ($accounts->count() > 0) {
// filter journals:
$ids = $accounts->pluck('id')->toArray();
$lastTransactionQuery->whereIn('transactions.account_id', $ids);
}
$lastTransaction = $lastTransactionQuery->first(['transaction_journals.*']);
if (!is_null($lastTransaction) && ((!is_null($last) && $lastTransaction->date < $last) || is_null($last))) {
$last = new Carbon($lastTransaction->date);
}
if (is_null($last)) {
return new Carbon('1900-01-01');
if ($lastTransactionDate->year !== 1900 && $lastTransactionDate < $last) {
$last = clone $lastTransactionDate;
unset($lastTransactionDate);
}
return $last;
@@ -479,4 +456,53 @@ class CategoryRepository implements CategoryRepositoryInterface
return $category;
}
/**
* @param Category $category
* @param Collection $accounts
*
* @return Carbon
*/
private function getLastJournalDate(Category $category, Collection $accounts): Carbon
{
$query = $category->transactionJournals()->orderBy('date', 'DESC');
if ($accounts->count() > 0) {
$query->leftJoin('transactions as t', 't.transaction_journal_id', '=', 'transaction_journals.id');
$query->whereIn('t.account_id', $accounts->pluck('id')->toArray());
}
$result = $query->first(['transaction_journals.*']);
if (!is_null($result)) {
return $result->date;
}
return new Carbon('1900-01-01');
}
/**
* @param Category $category
* @param Collection $accounts
*
* @return Carbon
*/
private function getLastTransactionDate(Category $category, Collection $accounts): Carbon
{
// check transactions:
$query = $category->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->orderBy('transaction_journals.date', 'DESC');
if ($accounts->count() > 0) {
// filter journals:
$query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray());
}
$lastTransaction = $query->first(['transaction_journals.*']);
if (!is_null($lastTransaction)) {
return new Carbon($lastTransaction->date);
}
return new Carbon('1900-01-01');
}
}