kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Add some debug to find rules that stop.

Browse Source
This commit is contained in:
James Cole
2025-11-07 20:37:48 +01:00
parent 49d3b11f86
commit 33e6a44d6f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@@ -284,11 +284,11 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
Log::debug(sprintf('Now filtering group #%d', $group->id)); Log::debug(sprintf('Now filtering group #%d', $group->id));
// filter the rules in the rule group: // filter the rules in the rule group:
$group->rules = $group->rules->filter( $group->rules = $group->rules->filter(
static function (Rule $rule) use ($filter) { static function (Rule $rule) use ($filter, $group) {
Log::debug(sprintf('Now filtering rule #%d', $rule->id)); Log::debug(sprintf('Now filtering rule #%d', $rule->id));
foreach ($rule->ruleTriggers as $trigger) { foreach ($rule->ruleTriggers as $trigger) {
if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) { if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
Log::debug(sprintf('Rule #%d triggers on %s, include it.', $rule->id, $filter)); Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
return true; return true;
} }
@@ -341,11 +341,11 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
Log::debug(sprintf('Now filtering group #%d', $group->id)); Log::debug(sprintf('Now filtering group #%d', $group->id));
// filter the rules in the rule group: // filter the rules in the rule group:
$group->rules = $group->rules->filter( $group->rules = $group->rules->filter(
static function (Rule $rule) use ($filter) { static function (Rule $rule) use ($filter, $group) {
Log::debug(sprintf('Now filtering rule #%d', $rule->id)); Log::debug(sprintf('Now filtering rule #%d', $rule->id));
foreach ($rule->ruleTriggers as $trigger) { foreach ($rule->ruleTriggers as $trigger) {
if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) { if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
Log::debug(sprintf('Rule #%d triggers on %s, include it.', $rule->id, $filter)); Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
return true; return true;
} }

2
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@@ -278,7 +278,7 @@ class SearchRuleEngine implements RuleEngineInterface
++$count; ++$count;
// if trigger says stop processing, do so. // if trigger says stop processing, do so.
if (true === $ruleTrigger->stop_processing && $result->count() > 0) { if (true === $ruleTrigger->stop_processing && $result->count() > 0) {
Log::debug('The trigger says to stop processing, so stop processing other triggers.'); Log::debug('The trigger in this rule trigger says to stop processing, so stop processing other triggers.');
break; break;
} }