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

Revamped a part of the rule test code.

Browse Source 
- clean way of constructing triggers
- processor can be constructed in a number of ways.
- cleaner transaction matcher using collections instead of arrays
This commit is contained in:
James Cole
2016-02-17 21:03:59 +01:00
parent 1cf0125d1b
commit 6c22bad77a
5 changed files with 178 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/Rules/Processor.php
View File

@@ -16,8 +16,8 @@ use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Rules\Actions\ActionFactory;
use FireflyIII\Rules\Actions\ActionInterface;
use FireflyIII\Rules\Triggers\AbstractTrigger;
use FireflyIII\Rules\Triggers\TriggerFactory;
use FireflyIII\Rules\Triggers\TriggerInterface;
use Illuminate\Support\Collection;
use Log;
@@ -43,7 +43,8 @@ class Processor
*/
private function __construct()
{
$this->triggers = new Collection;
$this->actions = new Collection;
}
/**
@@ -53,16 +54,55 @@ class Processor
*/
public static function make(Rule $rule)
{
$self = new self;
$self->rule = $rule;
$self->triggers = $rule->ruleTriggers()->orderBy('order', 'ASC')->get();
$self->actions = $rule->ruleActions()->orderBy('order', 'ASC')->get();
$self = new self;
$self->rule = $rule;
$triggerSet = $rule->ruleTriggers()->orderBy('order', 'ASC')->get();
/** @var RuleTrigger $trigger */
foreach ($triggerSet as $trigger) {
$self->triggers->push(TriggerFactory::getTrigger($trigger));
}
$self->actions = $rule->ruleActions()->orderBy('order', 'ASC')->get();
return $self;
}
/**
* @param string $triggerName
* @param string $triggerValue
*
* @return Processor
*/
public static function makeFromString(string $triggerName, string $triggerValue)
{
$self = new self;
$trigger = TriggerFactory::makeTriggerFromStrings($triggerName, $triggerValue, false);
$self->triggers->push($trigger);
return $self;
}
/**
* @param array $triggers
*
* @return Processor
*/
public static function makeFromStringArray(array $triggers)
{
$self = new self;
foreach ($triggers as $entry) {
$trigger = TriggerFactory::makeTriggerFromStrings($entry['type'], $entry['value'], $entry['stopProcessing']);
$self->triggers->push($trigger);
}
return $self;
}
/**
* @param TransactionJournal $journal
*
* @return bool
*/
public function handleTransactionJournal(TransactionJournal $journal)
{
@@ -70,10 +110,15 @@ class Processor
// get all triggers:
$triggered = $this->triggered();
if ($triggered) {
Log::debug('Rule #' . $this->rule->id . ' was triggered. Now process each action.');
$this->actions();
if ($this->actions->count() > 0) {
$this->actions();
}
return true;
}
return false;
}
/**
@@ -112,13 +157,11 @@ class Processor
foreach ($this->triggers as $trigger) {
$foundTriggers++;
/** @var TriggerInterface $triggerObject */
$triggerObject = TriggerFactory::getTrigger($trigger);
// no need to keep pushing the journal around!
if ($triggerObject->triggered($this->journal)) {
/** @var AbstractTrigger $trigger */
if ($trigger->triggered($this->journal)) {
$hitTriggers++;
}
if ($trigger->stop_processing) {
if ($trigger->stopProcessing) {
break;
}