IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused methods.

Browse Source
This commit is contained in:
James Cole 2020-10-31 06:54:33 +01:00
parent 0104d46206
commit 55c8b9012c
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 23 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
View File

@ -29,9 +29,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
@ -52,31 +50,17 @@ class TransferCurrenciesCorrections extends Command
* *
* @var string * @var string
*/ */
protected $signature = 'firefly-iii:transfer-currencies {--F|force : Force the execution of this command.}'; protected $signature = 'firefly-iii:transfer-currencies {--F|force : Force the execution of this command.}';
/** @var array */ private array $accountCurrencies;
private $accountCurrencies; private AccountRepositoryInterface $accountRepos;
/** @var AccountRepositoryInterface */ private JournalCLIRepositoryInterface $cliRepos;
private $accountRepos; private int $count;
/** @var JournalCLIRepositoryInterface */ private Account $destinationAccount;
private $cliRepos; private TransactionCurrency $destinationCurrency;
/** @var int */ private Transaction $destinationTransaction;
private $count; private Account $sourceAccount;
/** @var CurrencyRepositoryInterface */ private TransactionCurrency $sourceCurrency;
private $currencyRepos; private Transaction $sourceTransaction;
/** @var Account The destination account of the current journal. */
private $destinationAccount;
/** @var TransactionCurrency The currency preference of the destination account of the current journal. */
private $destinationCurrency;
/** @var Transaction The destination transaction of the current journal. */
private $destinationTransaction;
/** @var JournalRepositoryInterface */
private $journalRepos;
/** @var Account The source account of the current journal. */
private $sourceAccount;
/** @var TransactionCurrency The currency preference of the source account of the current journal. */
private $sourceCurrency;
/** @var Transaction The source transaction of the current journal. */
private $sourceTransaction;
/** /**
@ -124,7 +108,7 @@ class TransferCurrenciesCorrections extends Command
if (null === $this->destinationTransaction->transaction_currency_id && null !== $this->destinationCurrency) { if (null === $this->destinationTransaction->transaction_currency_id && null !== $this->destinationCurrency) {
$this->destinationTransaction $this->destinationTransaction
->transaction_currency_id ->transaction_currency_id
= (int) $this->destinationCurrency->id; = (int)$this->destinationCurrency->id;
$message = sprintf( $message = sprintf(
'Transaction #%d has no currency setting, now set to %s.', 'Transaction #%d has no currency setting, now set to %s.',
$this->destinationTransaction->id, $this->destinationTransaction->id,
@ -144,7 +128,7 @@ class TransferCurrenciesCorrections extends Command
private function fixDestNullForeignAmount(): void private function fixDestNullForeignAmount(): void
{ {
if (null === $this->destinationTransaction->foreign_amount && null !== $this->sourceTransaction->foreign_amount) { if (null === $this->destinationTransaction->foreign_amount && null !== $this->sourceTransaction->foreign_amount) {
$this->destinationTransaction->foreign_amount = bcmul((string) $this->sourceTransaction->foreign_amount, '-1'); $this->destinationTransaction->foreign_amount = bcmul((string)$this->sourceTransaction->foreign_amount, '-1');
$this->destinationTransaction->save(); $this->destinationTransaction->save();
$this->count++; $this->count++;
Log::debug( Log::debug(
@ -165,7 +149,7 @@ class TransferCurrenciesCorrections extends Command
{ {
if (null !== $this->destinationCurrency if (null !== $this->destinationCurrency
&& null === $this->destinationTransaction->foreign_amount && null === $this->destinationTransaction->foreign_amount
&& (int) $this->destinationTransaction->transaction_currency_id !== (int) $this->destinationCurrency->id && (int)$this->destinationTransaction->transaction_currency_id !== (int)$this->destinationCurrency->id
) { ) {
$message = sprintf( $message = sprintf(
'Transaction #%d has a currency setting #%d that should be #%d. Amount remains %s, currency is changed.', 'Transaction #%d has a currency setting #%d that should be #%d. Amount remains %s, currency is changed.',
@ -177,7 +161,7 @@ class TransferCurrenciesCorrections extends Command
Log::debug($message); Log::debug($message);
$this->line($message); $this->line($message);
$this->count++; $this->count++;
$this->destinationTransaction->transaction_currency_id = (int) $this->destinationCurrency->id; $this->destinationTransaction->transaction_currency_id = (int)$this->destinationCurrency->id;
$this->destinationTransaction->save(); $this->destinationTransaction->save();
} }
} }
@ -189,7 +173,7 @@ class TransferCurrenciesCorrections extends Command
*/ */
private function fixInvalidForeignCurrency(): void private function fixInvalidForeignCurrency(): void
{ {
if ((int) $this->destinationCurrency->id === (int) $this->sourceCurrency->id) { if ((int)$this->destinationCurrency->id === (int)$this->sourceCurrency->id) {
// update both transactions to match: // update both transactions to match:
$this->sourceTransaction->foreign_amount = null; $this->sourceTransaction->foreign_amount = null;
$this->sourceTransaction->foreign_currency_id = null; $this->sourceTransaction->foreign_currency_id = null;
@ -223,7 +207,7 @@ class TransferCurrenciesCorrections extends Command
*/ */
private function fixMismatchedForeignCurrency(): void private function fixMismatchedForeignCurrency(): void
{ {
if ((int) $this->sourceCurrency->id !== (int) $this->destinationCurrency->id) { if ((int)$this->sourceCurrency->id !== (int)$this->destinationCurrency->id) {
$this->sourceTransaction->transaction_currency_id = $this->sourceCurrency->id; $this->sourceTransaction->transaction_currency_id = $this->sourceCurrency->id;
$this->sourceTransaction->foreign_currency_id = $this->destinationCurrency->id; $this->sourceTransaction->foreign_currency_id = $this->destinationCurrency->id;
$this->destinationTransaction->transaction_currency_id = $this->sourceCurrency->id; $this->destinationTransaction->transaction_currency_id = $this->sourceCurrency->id;
@ -245,7 +229,7 @@ class TransferCurrenciesCorrections extends Command
if (null === $this->sourceTransaction->transaction_currency_id && null !== $this->sourceCurrency) { if (null === $this->sourceTransaction->transaction_currency_id && null !== $this->sourceCurrency) {
$this->sourceTransaction $this->sourceTransaction
->transaction_currency_id ->transaction_currency_id
= (int) $this->sourceCurrency->id; = (int)$this->sourceCurrency->id;
$message = sprintf( $message = sprintf(
'Transaction #%d has no currency setting, now set to %s.', 'Transaction #%d has no currency setting, now set to %s.',
$this->sourceTransaction->id, $this->sourceTransaction->id,
@ -265,7 +249,7 @@ class TransferCurrenciesCorrections extends Command
private function fixSourceNullForeignAmount(): void private function fixSourceNullForeignAmount(): void
{ {
if (null === $this->sourceTransaction->foreign_amount && null !== $this->destinationTransaction->foreign_amount) { if (null === $this->sourceTransaction->foreign_amount && null !== $this->destinationTransaction->foreign_amount) {
$this->sourceTransaction->foreign_amount = bcmul((string) $this->destinationTransaction->foreign_amount, '-1'); $this->sourceTransaction->foreign_amount = bcmul((string)$this->destinationTransaction->foreign_amount, '-1');
$this->sourceTransaction->save(); $this->sourceTransaction->save();
$this->count++; $this->count++;
Log::debug( Log::debug(
@ -286,7 +270,7 @@ class TransferCurrenciesCorrections extends Command
{ {
if (null !== $this->sourceCurrency if (null !== $this->sourceCurrency
&& null === $this->sourceTransaction->foreign_amount && null === $this->sourceTransaction->foreign_amount
&& (int) $this->sourceTransaction->transaction_currency_id !== (int) $this->sourceCurrency->id && (int)$this->sourceTransaction->transaction_currency_id !== (int)$this->sourceCurrency->id
) { ) {
$message = sprintf( $message = sprintf(
'Transaction #%d has a currency setting #%d that should be #%d. Amount remains %s, currency is changed.', 'Transaction #%d has a currency setting #%d that should be #%d. Amount remains %s, currency is changed.',
@ -298,7 +282,7 @@ class TransferCurrenciesCorrections extends Command
Log::debug($message); Log::debug($message);
$this->line($message); $this->line($message);
$this->count++; $this->count++;
$this->sourceTransaction->transaction_currency_id = (int) $this->sourceCurrency->id; $this->sourceTransaction->transaction_currency_id = (int)$this->sourceCurrency->id;
$this->sourceTransaction->save(); $this->sourceTransaction->save();
} }
} }
@ -310,7 +294,7 @@ class TransferCurrenciesCorrections extends Command
*/ */
private function fixTransactionJournalCurrency(TransactionJournal $journal): void private function fixTransactionJournalCurrency(TransactionJournal $journal): void
{ {
if ((int) $journal->transaction_currency_id !== (int) $this->sourceCurrency->id) { if ((int)$journal->transaction_currency_id !== (int)$this->sourceCurrency->id) {
$oldCurrencyCode = $journal->transactionCurrency->code ?? '(nothing)'; $oldCurrencyCode = $journal->transactionCurrency->code ?? '(nothing)';
$journal->transaction_currency_id = $this->sourceCurrency->id; $journal->transaction_currency_id = $this->sourceCurrency->id;
$message = sprintf( $message = sprintf(
@ -424,7 +408,7 @@ class TransferCurrenciesCorrections extends Command
{ {
$configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
if (null !== $configVar) { if (null !== $configVar) {
return (bool) $configVar->data; return (bool)$configVar->data;
} }
return false; // @codeCoverageIgnore return false; // @codeCoverageIgnore
@ -502,8 +486,6 @@ class TransferCurrenciesCorrections extends Command
* For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they * For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they
* like it or not. Previous routines MUST have set the currency setting for both accounts for this to work. * like it or not. Previous routines MUST have set the currency setting for both accounts for this to work.
* *
* A transfer always has the
*
* Both source and destination must match the respective currency preference. So FF3 must verify ALL * Both source and destination must match the respective currency preference. So FF3 must verify ALL
* transactions. * transactions.
*/ */
@ -527,8 +509,6 @@ class TransferCurrenciesCorrections extends Command
{ {
$this->count = 0; $this->count = 0;
$this->accountRepos = app(AccountRepositoryInterface::class); $this->accountRepos = app(AccountRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class);
$this->journalRepos = app(JournalRepositoryInterface::class);
$this->cliRepos = app(JournalCLIRepositoryInterface::class); $this->cliRepos = app(JournalCLIRepositoryInterface::class);
$this->accountCurrencies = []; $this->accountCurrencies = [];
$this->resetInformation(); $this->resetInformation();

39
app/Models/TransactionJournal.php
View File

@ -248,32 +248,6 @@ class TransactionJournal extends Model
return $this->hasMany(TransactionJournalLink::class, 'destination_id'); return $this->hasMany(TransactionJournalLink::class, 'destination_id');
} }
/**
* @codeCoverageIgnore
* @return bool
*/
public function isDeposit(): bool
{
if (null !== $this->transaction_type_type) {
return TransactionType::DEPOSIT === $this->transaction_type_type;
}
return $this->transactionType->isDeposit();
}
/**
* @codeCoverageIgnore
* @return bool
*/
public function isOpeningBalance(): bool
{
if (null !== $this->transaction_type_type) {
return TransactionType::OPENING_BALANCE === $this->transaction_type_type;
}
return $this->transactionType->isOpeningBalance();
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @return bool * @return bool
@ -287,19 +261,6 @@ class TransactionJournal extends Model
return $this->transactionType->isTransfer(); return $this->transactionType->isTransfer();
} }
/**
* @codeCoverageIgnore
* @return bool
*/
public function isWithdrawal(): bool
{
if (null !== $this->transaction_type_type) {
return TransactionType::WITHDRAWAL === $this->transaction_type_type;
}
return $this->transactionType->isWithdrawal();
}
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* Get all of the notes. * Get all of the notes.