kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-23 00:27:48 -07:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/12169

Browse Source
This commit is contained in:
James Cole
2026-04-22 07:54:53 +02:00
parent a9723a85d1
commit 32250ddc1a
5 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/TransactionRules/Engine/SearchRuleEngine.php
+24
View File
@@ -25,6 +25,9 @@ declare(strict_types=1);
namespace FireflyIII\TransactionRules\Engine;
use Carbon\Carbon;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Note;
use FireflyIII\Models\Rule;
@@ -399,9 +402,17 @@ class SearchRuleEngine implements RuleEngineInterface
private function fireNonStrictRule(Rule $rule): bool
{
Log::debug(sprintf('SearchRuleEngine::fireNonStrictRule(%d)!', $rule->id));
$flags = new TransactionGroupEventFlags();
$flags->applyRules = false;
$flags->fireWebhooks = false;
$objects = new TransactionGroupEventObjects();
$collection = $this->findNonStrictRule($rule);
$objects->collectFromCollection($collection);
$this->processResults($rule, $collection);
// collect from collection, again!
$objects->collectFromCollection($collection);
event(new UpdatedSingleTransactionGroup($flags, $objects));
Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
return $collection->count() > 0;
@@ -438,10 +449,23 @@ class SearchRuleEngine implements RuleEngineInterface
private function fireStrictRule(Rule $rule): bool
{
Log::debug(sprintf('SearchRuleEngine::fireStrictRule(%d)!', $rule->id));
$flags = new TransactionGroupEventFlags();
$flags->applyRules = false;
$flags->fireWebhooks = false;
$objects = new TransactionGroupEventObjects();
$collection = $this->findStrictRule($rule);
$objects->collectFromCollection($collection);
$this->processResults($rule, $collection);
// collect from collection, again!
$objects->collectFromCollection($collection);
// fire event for changed groups.
event(new UpdatedSingleTransactionGroup($flags, $objects));
$result = $collection->count() > 0;
if ($result) {
Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));