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

Auto commit for release 'develop' on 2025-02-08

Browse Source
This commit is contained in:
github-actions
2025-02-08 08:18:18 +01:00
parent 2189fb46a2
commit f3fe86167c
48 changed files with 498 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Handlers/Events/StoredGroupEventHandler.php
View File

@@ -45,7 +45,6 @@ class StoredGroupEventHandler
$this->triggerWebhooks($event);
}
/**
* This method grabs all the users rules and processes them.
*/
@@ -58,14 +57,14 @@ class StoredGroupEventHandler
}
app('log')->debug('Now in StoredGroupEventHandler::processRules()');
$journals = $storedGroupEvent->transactionGroup->transactionJournals;
$array = [];
$journals = $storedGroupEvent->transactionGroup->transactionJournals;
$array = [];
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$array[] = $journal->id;
}
$journalIds = implode(',', $array);
$journalIds = implode(',', $array);
app('log')->debug(sprintf('Add local operator for journal(s): %s', $journalIds));
// collect rules:
@@ -74,10 +73,10 @@ class StoredGroupEventHandler
// add the groups to the rule engine.
// it should run the rules in the group and cancel the group if necessary.
$groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');
$groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');
// create and fire rule engine.
$newRuleEngine = app(RuleEngineInterface::class);
$newRuleEngine = app(RuleEngineInterface::class);
$newRuleEngine->setUser($storedGroupEvent->transactionGroup->user);
$newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalIds]);
$newRuleEngine->setRuleGroups($groups);
@@ -86,7 +85,7 @@ class StoredGroupEventHandler
private function recalculateCredit(StoredTransactionGroup $event): void
{
$group = $event->transactionGroup;
$group = $event->transactionGroup;
/** @var CreditRecalculateService $object */
$object = app(CreditRecalculateService::class);
@@ -100,14 +99,14 @@ class StoredGroupEventHandler
private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
{
app('log')->debug(__METHOD__);
$group = $storedGroupEvent->transactionGroup;
$group = $storedGroupEvent->transactionGroup;
if (false === $storedGroupEvent->fireWebhooks) {
app('log')->info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
return;
}
$user = $group->user;
$user = $group->user;
/** @var MessageGeneratorInterface $engine */
$engine = app(MessageGeneratorInterface::class);

4
app/Handlers/Events/UpdatedGroupEventHandler.php
View File

@@ -41,7 +41,8 @@ use Illuminate\Support\Collection;
*/
class UpdatedGroupEventHandler
{
public function runAllHandlers(UpdatedTransactionGroup $event): void {
public function runAllHandlers(UpdatedTransactionGroup $event): void
{
$this->unifyAccounts($event);
$this->processRules($event);
$this->recalculateCredit($event);
@@ -49,7 +50,6 @@ class UpdatedGroupEventHandler
}
/**
* This method will check all the rules when a journal is updated.
*/