Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Catch already linked transactions.
James Coled78fd86d7a6d
diff --git a/app/TransactionRules/Actions/UpdatePiggyBank.php b/app/TransactionRules/Actions/UpdatePiggyBank.phpindex 29937334dc..44c9603c22 100644--- a/app/TransactionRules/Actions/UpdatePiggyBank.php+++ b/app/TransactionRules/Actions/UpdatePiggyBank.php@@ -40,7 +40,9 @@ class UpdatePiggyBank implements ActionInterface/*** TriggerInterface constructor.*/- public function __construct(private readonly RuleAction $action) {}+ public function __construct(private readonly RuleAction $action)+ {+ }public function actOnArray(array $journal): bool{@@ -50,12 +52,12 @@ class UpdatePiggyBank implements ActionInterface// refresh the transaction type./** @var User $user */- $user = User::find($journal['user_id']);+ $user = User::find($journal['user_id']);/** @var TransactionJournal $journalObj */- $journalObj = $user->transactionJournals()->find($journal['transaction_journal_id']);+ $journalObj = $user->transactionJournals()->find($journal['transaction_journal_id']);- $piggyBank = $this->findPiggyBank($user, $actionValue);+ $piggyBank = $this->findPiggyBank($user, $actionValue);if (!$piggyBank instanceof PiggyBank) {Log::info(sprintf('No piggy bank named "%s", cant execute action #%d of rule #%d', $actionValue, $this->action->id, $this->action->rule_id)@@ -67,10 +69,19 @@ class UpdatePiggyBank implements ActionInterfaceLog::debug(sprintf('Found piggy bank #%d ("%s")', $piggyBank->id, $piggyBank->name));+ // piggy bank already has an event for this transaction journal?+ if ($this->alreadyEventPresent($piggyBank, $journal)) {+ Log::info(sprintf('Piggy bank #%d ("%s") already has an event for transaction journal #%d, so no action will be taken.', $piggyBank->id, $piggyBank->name, $journalObj->id));++ event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.cannot_find_piggy', ['name' => $actionValue])));+ return false;+ }++/** @var Transaction $destination */$destination = $journalObj->transactions()->where('amount', '>', 0)->first();- $accounts = $this->getAccounts($journalObj);+ $accounts = $this->getAccounts($journalObj);Log::debug(sprintf('Source account is #%d: "%s"', $accounts['source']->id, $accounts['source']->name));Log::debug(sprintf('Destination account is #%d: "%s"', $accounts['destination']->id, $accounts['source']->name));@@ -86,9 +97,9 @@ class UpdatePiggyBank implements ActionInterfacenull,['currency_symbol' => $journalObj->transactionCurrency->symbol,- 'decimal_places' => $journalObj->transactionCurrency->decimal_places,- 'amount' => $destination->amount,- 'piggy' => $piggyBank->name,+ 'decimal_places' => $journalObj->transactionCurrency->decimal_places,+ 'amount' => $destination->amount,+ 'piggy' => $piggyBank->name,]));@@ -109,10 +120,10 @@ class UpdatePiggyBank implements ActionInterfacenull,['currency_symbol' => $journalObj->transactionCurrency->symbol,- 'decimal_places' => $journalObj->transactionCurrency->decimal_places,- 'amount' => $destination->amount,- 'piggy' => $piggyBank->name,- 'piggy_id' => $piggyBank->id,+ 'decimal_places' => $journalObj->transactionCurrency->decimal_places,+ 'amount' => $destination->amount,+ 'piggy' => $piggyBank->name,+ 'piggy_id' => $piggyBank->id,]));@@ -143,7 +154,7 @@ class UpdatePiggyBank implements ActionInterfaceprivate function getAccounts(TransactionJournal $journal): array{return [- 'source' => $journal->transactions()->where('amount', '<', '0')->first()?->account,+ 'source' => $journal->transactions()->where('amount', '<', '0')->first()?->account,'destination' => $journal->transactions()->where('amount', '>', '0')->first()?->account,];}@@ -169,11 +180,11 @@ class UpdatePiggyBank implements ActionInterface$repository->setUser($journal->user);// how much can we remove from this piggy bank?- $toRemove = $repository->getCurrentAmount($piggyBank, $account);+ $toRemove = $repository->getCurrentAmount($piggyBank, $account);Log::debug(sprintf('Amount is %s, max to remove is %s', $amount, $toRemove));// if $amount is bigger than $toRemove, shrink it.- $amount = -1 === bccomp($amount, $toRemove) ? $amount : $toRemove;+ $amount = -1 === bccomp($amount, $toRemove) ? $amount : $toRemove;Log::debug(sprintf('Amount is now %s', $amount));// if amount is zero, stop.@@ -202,7 +213,7 @@ class UpdatePiggyBank implements ActionInterface// how much can we add to the piggy bank?if (0 !== bccomp($piggyBank->target_amount, '0')) {- $toAdd = bcsub($piggyBank->target_amount, $repository->getCurrentAmount($piggyBank, $account));+ $toAdd = bcsub($piggyBank->target_amount, $repository->getCurrentAmount($piggyBank, $account));Log::debug(sprintf('Max amount to add to piggy bank is %s, amount is %s', $toAdd, $amount));// update amount to fit:@@ -231,4 +242,9 @@ class UpdatePiggyBank implements ActionInterface$repository->addAmount($piggyBank, $account, $amount, $journal);}++ private function alreadyEventPresent(PiggyBank $piggyBank, array $journal): bool+ {+ return $piggyBank->piggyBankEvents()->where('transaction_journal_id', $journal['transaction_journal_id'])->exists();+ }}diff --git a/resources/lang/en_US/rules.php b/resources/lang/en_US/rules.phpindex 9cd328a98f..bdcd5ba17a 100644--- a/resources/lang/en_US/rules.php+++ b/resources/lang/en_US/rules.php@@ -68,6 +68,7 @@ return ['cannot_find_piggy' => 'Firefly III can\'t find a piggy bank named ":name"','no_link_piggy' => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken','both_link_piggy' => 'This transaction\'s accounts are both linked to the piggy bank, so no action will be taken',+ 'already_linked' => 'This transaction is already linked to piggy bank ":name"','cannot_unlink_tag' => 'Tag ":tag" isn\'t linked to this transaction','cannot_find_budget' => 'Firefly III can\'t find budget ":name"','cannot_find_category' => 'Firefly III can\'t find category ":name"',