kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 12:46:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed a bug mentioned by @vissert and added some logging for @sandermulders

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-09-12 18:43:10 +02:00
parent 5379e03447
commit a7351f348d
4 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Rules/Processor.php
View File

@@ -20,6 +20,7 @@ use FireflyIII\Rules\Factory\ActionFactory;
use FireflyIII\Rules\Factory\TriggerFactory;
use FireflyIII\Rules\Triggers\AbstractTrigger;
use Illuminate\Support\Collection;
use Log;
/**
* Class Processor
@@ -37,6 +38,8 @@ final class Processor
/** @var Collection */
public $triggers;
protected $foundTriggers = 0;
/**
* Processor constructor.
*
@@ -57,9 +60,17 @@ final class Processor
*/
public static function make(Rule $rule)
{
Log::debug(sprintf('Making new rule from Rule %d', $rule->id));
$self = new self;
$self->rule = $rule;
/*
* The number of "found triggers" must start at -1, because the first
* trigger is "create-journal" or "update-journal" when this Processor
* is called from a Rule.
*/
$self->setFoundTriggers(-1);
$triggerSet = $rule->ruleTriggers()->orderBy('order', 'ASC')->get();
/** @var RuleTrigger $trigger */
foreach ($triggerSet as $trigger) {
@@ -113,6 +124,22 @@ final class Processor
return $self;
}
/**
* @return int
*/
public function getFoundTriggers(): int
{
return $this->foundTriggers;
}
/**
* @param int $foundTriggers
*/
public function setFoundTriggers(int $foundTriggers)
{
$this->foundTriggers = $foundTriggers;
}
/**
*
* @return \FireflyIII\Models\Rule
@@ -176,25 +203,30 @@ final class Processor
*
* @return bool
*/
private function triggered()
private function triggered(): bool
{
$foundTriggers = 0;
Log::debug('start of Processor::triggered()');
$foundTriggers = $this->getFoundTriggers();
$hitTriggers = 0;
/** @var RuleTrigger $trigger */
/** @var AbstractTrigger $trigger */
foreach ($this->triggers as $trigger) {
$foundTriggers++;
Log::debug(sprintf('Now checking trigger %s with value %s', get_class($trigger), $trigger->getTriggerValue()));
/** @var AbstractTrigger $trigger */
if ($trigger->triggered($this->journal)) {
Log::debug('Is a match!');
$hitTriggers++;
}
if ($trigger->stopProcessing) {
Log::debug('Stop processing this trigger and break.');
break;
}
}
$result = ($hitTriggers == $foundTriggers && $foundTriggers > 0);
Log::debug('Result of triggered()', ['hitTriggers' => $hitTriggers, 'foundTriggers' => $foundTriggers, 'result' => $result]);
return ($hitTriggers == $foundTriggers && $foundTriggers > 0);
return $result;
}