Code reordering and reformatting. I should really start employing style CI.

This commit is contained in:
James Cole
2021-09-18 10:26:12 +02:00
parent 9b9d52e99f
commit 4003cea759
344 changed files with 2776 additions and 2605 deletions

View File

@@ -37,6 +37,7 @@ use FireflyIII\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Support\Collection;
use JsonException;
/**
* Class JournalRepository.
@@ -68,18 +69,6 @@ class JournalRepository implements JournalRepositoryInterface
$service->destroy($journal);
}
/**
* @inheritDoc
*/
public function findByType(array $types): Collection
{
return $this->user
->transactionJournals()
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->whereIn('transaction_types.type', $types)
->get(['transaction_journals.*']);
}
/**
* Find a specific journal.
*
@@ -92,6 +81,18 @@ class JournalRepository implements JournalRepositoryInterface
return $this->user->transactionJournals()->find($journalId);
}
/**
* @inheritDoc
*/
public function findByType(array $types): Collection
{
return $this->user
->transactionJournals()
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->whereIn('transaction_types.type', $types)
->get(['transaction_journals.*']);
}
/**
* Get users first transaction journal or NULL.
*
@@ -129,7 +130,7 @@ class JournalRepository implements JournalRepositoryInterface
* @param TransactionJournal $journal
*
* @return string
* @throws \JsonException
* @throws JsonException
*/
public function getJournalTotal(TransactionJournal $journal): string
{
@@ -137,7 +138,7 @@ class JournalRepository implements JournalRepositoryInterface
$cache->addProperty($journal->id);
$cache->addProperty('amount-positive');
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
// saves on queries:
@@ -186,7 +187,7 @@ class JournalRepository implements JournalRepositoryInterface
* @param string $field
*
* @return null|Carbon
* @throws \JsonException
* @throws JsonException
*/
public function getMetaDateById(int $journalId, string $field): ?Carbon
{
@@ -196,7 +197,7 @@ class JournalRepository implements JournalRepositoryInterface
$cache->addProperty($field);
if ($cache->has()) {
return new Carbon($cache->get());
return new Carbon($cache->get());
}
$entry = TransactionJournalMeta::where('transaction_journal_id', $journalId)
->where('name', $field)->first();