kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 13:16:31 +00:00
Code Issues Projects Releases Wiki Activity

Account search fixed.

Browse Source
This commit is contained in:
James Cole
2020-08-28 11:24:55 +02:00
parent 63794cab07
commit 093f34b7a8
26 changed files with 157 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
app/TransactionRules/Actions/ConvertToTransfer.php
View File

@@ -52,166 +52,6 @@ class ConvertToTransfer implements ActionInterface
$this->action = $action;
}
/**
* Execute the action.
* @deprecated
* @codeCoverageIgnore
* @param TransactionJournal $journal
*
* @return bool
*/
public function act(TransactionJournal $journal): bool
{
$type = $journal->transactionType->type;
if (TransactionType::TRANSFER === $type) {
// @codeCoverageIgnoreStart
Log::error(sprintf('Journal #%d is already a transfer so cannot be converted (rule "%s").', $journal->id, $this->action->rule->title));
return false;
// @codeCoverageIgnoreEnd
}
// find the asset account in the action value.
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser($journal->user);
$asset = $repository->findByName(
$this->action->action_value, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]
);
if (null === $asset) {
// @codeCoverageIgnoreStart
Log::error(
sprintf(
'Journal #%d cannot be converted because no asset with name "%s" exists (rule "%s").', $journal->id, $this->action->action_value,
$this->action->rule->title
)
);
return false;
// @codeCoverageIgnoreEnd
}
$destTransactions = $journal->transactions()->where('amount', '>', 0)->get();
$sourceTransactions = $journal->transactions()->where('amount', '<', 0)->get();
// break if count is zero:
if (1 !== $sourceTransactions->count()) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has %d source transactions. ConvertToTransfer failed. (rule "%s").',
[$journal->id, $sourceTransactions->count(), $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
if (0 === $destTransactions->count()) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has %d dest transactions. ConvertToTransfer failed. (rule "%s").',
[$journal->id, $destTransactions->count(), $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
if (TransactionType::WITHDRAWAL === $type) {
Log::debug('Going to transform a withdrawal to a transfer.');
return $this->convertWithdrawal($journal, $asset);
}
if (TransactionType::DEPOSIT === $type) {
Log::debug('Going to transform a deposit to a transfer.');
return $this->convertDeposit($journal, $asset);
}
return false; // @codeCoverageIgnore
}
/**
* A deposit is from Revenue to Asset.
* We replace the Revenue with another asset.
* @deprecated
* @codeCoverageIgnore
* @param TransactionJournal $journal
* @param Account $assetAccount
*
* @return bool
*/
private function convertDeposit(TransactionJournal $journal, Account $assetAccount): bool
{
/** @var Account $destinationAsset */
$destinationAsset = $journal->transactions()->where('amount', '>', 0)->first()->account;
if ($destinationAsset->id === $assetAccount->id) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has already has "%s" as a destination asset. ConvertToTransfer failed. (rule "%s").',
[$journal->id, $assetAccount->name, $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
// update source transactions
$journal->transactions()->where('amount', '<', 0)
->update(['account_id' => $assetAccount->id]);
// change transaction type of journal:
$newType = TransactionType::whereType(TransactionType::TRANSFER)->first();
$journal->transaction_type_id = $newType->id;
$journal->save();
Log::debug('Converted deposit to transfer.');
return true;
}
/**
* A withdrawal is from Asset to Expense.
* We replace the Expense with another asset.
* @deprecated
* @codeCoverageIgnore
* @param TransactionJournal $journal
* @param Account $assetAccount
*
* @return bool
*/
private function convertWithdrawal(TransactionJournal $journal, Account $assetAccount): bool
{
/** @var Account $sourceAsset */
$sourceAsset = $journal->transactions()->where('amount', '<', 0)->first()->account;
if ($sourceAsset->id === $assetAccount->id) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has already has "%s" as a source asset. ConvertToTransfer failed. (rule "%s").',
[$journal->id, $assetAccount->name, $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
// update destination transactions
$journal->transactions()->where('amount', '>', 0)
->update(['account_id' => $assetAccount->id]);
// change transaction type of journal:
$newType = TransactionType::whereType(TransactionType::TRANSFER)->first();
$journal->transaction_type_id = $newType->id;
$journal->save();
Log::debug('Converted withdrawal to transfer.');
return true;
}
/**
* @inheritDoc
*/