kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Renamed various fields from their old camel casing to new ones.

Browse Source
This commit is contained in:
James Cole
2019-06-16 13:16:04 +02:00
parent 23d7abd55f
commit bc33d1b67d
22 changed files with 979 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Repositories/Account/AccountRepository.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Factory\AccountFactory;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
@@ -619,4 +620,19 @@ class AccountRepository implements AccountRepositoryInterface
->transactionTypes([TransactionType::OPENING_BALANCE])
->first(['transaction_journals.*']);
}
/**
* @param Account $account
* @return TransactionGroup|null
*/
public function getOpeningBalanceGroup(Account $account): ?TransactionGroup
{
$journal = $this->getOpeningBalance($account);
$group = null;
if (null !== $journal) {
$group = $journal->transactionGroup;
}
return $group;
}
}

7
app/Repositories/Account/AccountRepositoryInterface.php
View File

@@ -26,6 +26,7 @@ use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\User;
use Illuminate\Support\Collection;
@@ -43,6 +44,12 @@ interface AccountRepositoryInterface
*/
public function getOpeningBalance(Account $account): ?TransactionJournal;
/**
* @param Account $account
* @return TransactionGroup|null
*/
public function getOpeningBalanceGroup(Account $account): ?TransactionGroup;
/**
* Moved here from account CRUD.
*

15
app/Repositories/Journal/JournalRepository.php
View File

@@ -813,4 +813,19 @@ class JournalRepository implements JournalRepositoryInterface
->with(['user', 'transactionType', 'transactionCurrency', 'transactions', 'transactions.account'])
->get(['transaction_journals.*']);
}
/**
* Get all transaction journals with a specific type, for the logged in user.
*
* @param array $types
* @return Collection
*/
public function getJournals(array $types): Collection
{
return $this->user->transactionJournals()
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->whereIn('transaction_types.type', $types)
->with(['user', 'transactionType', 'transactionCurrency', 'transactions', 'transactions.account'])
->get(['transaction_journals.*']);
}
}

8
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -49,6 +49,14 @@ interface JournalRepositoryInterface
*/
public function getAllJournals(array $types): Collection;
/**
* Get all transaction journals with a specific type, for the logged in user.
*
* @param array $types
* @return Collection
*/
public function getJournals(array $types): Collection;
/**
* @param TransactionJournal $journal
* @param TransactionType $type

40
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -57,7 +57,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param string $amount
*
* @return bool
*/
@@ -79,7 +79,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBankRepetition $repetition
* @param string $amount
* @param string $amount
*
* @return string
*/
@@ -94,7 +94,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param string $amount
*
* @return bool
*/
@@ -110,7 +110,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param string $amount
*
* @return bool
*/
@@ -143,7 +143,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param string $amount
*
* @return PiggyBankEvent
*/
@@ -156,8 +156,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
}
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param PiggyBank $piggyBank
* @param string $amount
* @param TransactionJournal $journal
*
* @return PiggyBankEvent
@@ -225,20 +225,14 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
}
/**
* @param PiggyBank|null $piggyBank
* @param int|null $piggyBankId
* @param string|null $piggyBankName
* @param int|null $piggyBankId
* @param string|null $piggyBankName
*
* @return PiggyBank|null
*/
public function findPiggyBank(?PiggyBank $piggyBank, ?int $piggyBankId, ?string $piggyBankName): ?PiggyBank
public function findPiggyBank(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank
{
Log::debug('Searching for piggy information.');
if ($piggyBank instanceof PiggyBank && $piggyBank->account->user_id === $this->user->id) {
Log::debug(sprintf('Piggy object in parameters, will return Piggy #%d', $piggyBank->id));
return $piggyBank;
}
if (null !== $piggyBankId) {
$searchResult = $this->findNull((int)$piggyBankId);
@@ -291,9 +285,9 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* Used for connecting to a piggy bank.
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
* @param PiggyBankRepetition $repetition
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -466,7 +460,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
* Get for piggy account what is left to put in piggies.
*
* @param PiggyBank $piggyBank
* @param Carbon $date
* @param Carbon $date
*
* @return string
*/
@@ -491,7 +485,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $amount
* @param string $amount
*
* @return bool
*/
@@ -511,7 +505,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
* set id of piggy bank.
*
* @param PiggyBank $piggyBank
* @param int $order
* @param int $order
*
* @return bool
*/
@@ -556,7 +550,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param array $data
* @param array $data
*
* @return PiggyBank
*/
@@ -588,7 +582,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/**
* @param PiggyBank $piggyBank
* @param string $note
* @param string $note
*
* @return bool
* @throws \Exception

3
app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
View File

@@ -117,13 +117,12 @@ interface PiggyBankRepositoryInterface
public function findNull(int $piggyBankId): ?PiggyBank;
/**
* @param PiggyBank|null $piggyBank
* @param int|null $piggyBankId
* @param string|null $piggyBankName
*
* @return PiggyBank|null
*/
public function findPiggyBank(?PiggyBank $piggyBank, ?int $piggyBankId, ?string $piggyBankName): ?PiggyBank;
public function findPiggyBank(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank;
/**
* Get current amount saved in piggy bank.