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

Merge branch 'feature/test-triggers' of github.com:roberthorlings/firefly-iii into feature/test-triggers

Browse Source
This commit is contained in:
Robert Horlings
2016-02-17 16:26:29 +01:00
parent 7ec5cce2c8 bc3d64a2ff
commit 2eb7d8ba91
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Rules/Processor.php
View File

@@ -15,9 +15,9 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Rules\Actions\ActionInterface; use FireflyIII\Rules\Actions\ActionInterface;
use FireflyIII\Rules\Actions\ActionFactory;
use FireflyIII\Rules\Triggers\TriggerInterface; use FireflyIII\Rules\Triggers\TriggerInterface;
use FireflyIII\Rules\Triggers\TriggerFactory; use FireflyIII\Rules\Triggers\TriggerFactory;
use FireflyIII\Support\Domain;
use Log; use Log;
/** /**
@@ -31,6 +31,10 @@ class Processor
protected $journal; protected $journal;
/** @var Rule */ /** @var Rule */
protected $rule; protected $rule;
/** @var array */
private $actionTypes = [];
/** @var array */
private $triggerTypes = [];
/** /**
* Processor constructor. * Processor constructor.
@@ -42,6 +46,8 @@ class Processor
{ {
$this->rule = $rule; $this->rule = $rule;
$this->journal = $journal; $this->journal = $journal;
$this->triggerTypes = Domain::getRuleTriggers();
$this->actionTypes = Domain::getRuleActions();
} }
/** /**
@@ -113,6 +119,12 @@ class Processor
* @var RuleAction $action * @var RuleAction $action
*/ */
foreach ($this->rule->ruleActions()->orderBy('order', 'ASC')->get() as $action) { foreach ($this->rule->ruleActions()->orderBy('order', 'ASC')->get() as $action) {
$type = $action->action_type;
$class = $this->actionTypes[$type];
Log::debug('Action #' . $action->id . ' for rule #' . $action->rule_id . ' (' . $type . ')');
if (!class_exists($class)) {
abort(500, 'Could not instantiate class for rule action type "' . $type . '" (' . $class . ').');
}
/** @var ActionInterface $actionClass */ /** @var ActionInterface $actionClass */
$actionClass = ActionFactory::getAction($action, $this->journal); $actionClass = ActionFactory::getAction($action, $this->journal);
$actionClass->act(); $actionClass->act();
@@ -126,6 +138,8 @@ class Processor
} }
/** /**
* Method to check whether the current transaction would be triggered
* by the given list of triggers
* @return bool * @return bool
*/ */
protected function triggeredBy($triggers) { protected function triggeredBy($triggers) {