Skip to content

Firefly III: a personal finances manager

Add some debug to find rules that stop.

James Cole33e6a44d6f77
diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php
index 45557e6a2b..37b6066a64 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -284,11 +284,11 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
Log::debug(sprintf('Now filtering group #%d', $group->id));
// filter the rules in the rule group:
$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));
foreach ($rule->ruleTriggers as $trigger) {
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;
}
@@ -341,11 +341,11 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
Log::debug(sprintf('Now filtering group #%d', $group->id));
// filter the rules in the rule group:
$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));
foreach ($rule->ruleTriggers as $trigger) {
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;
}
diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php
index 72f7228f20..5861cf888f 100644
--- a/app/TransactionRules/Engine/SearchRuleEngine.php
+++ b/app/TransactionRules/Engine/SearchRuleEngine.php
@@ -278,7 +278,7 @@ class SearchRuleEngine implements RuleEngineInterface
++$count;
// if trigger says stop processing, do so.
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;
}