kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Synchronise API and app rule management.

Browse Source
This commit is contained in:
James Cole
2018-08-05 15:41:13 +02:00
parent 422e80530b
commit 0a89f4000d
2 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Api/V1/Requests/RuleRequest.php
View File

@@ -56,27 +56,12 @@ class RuleRequest extends Request
'rule_group_title' => $this->string('rule_group_title'), 'rule_group_title' => $this->string('rule_group_title'),
'trigger' => $this->string('trigger'), 'trigger' => $this->string('trigger'),
'strict' => $this->boolean('strict'), 'strict' => $this->boolean('strict'),
'stop-processing' => $this->boolean('stop_processing'), 'stop_processing' => $this->boolean('stop_processing'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'rule-triggers' => [], 'rule_triggers' => $this->getRuleTriggers(),
'rule-actions' => [], 'rule_actions' => $this->getRuleActions(),
]; ];
foreach ($this->get('rule-triggers') as $trigger) {
$data['rule-triggers'][] = [
'name' => $trigger['name'],
'value' => $trigger['value'],
'stop-processing' => 1 === (int)($trigger['stop-processing'] ?? 0),
];
}
foreach ($this->get('rule-actions') as $action) {
$data['rule-actions'][] = [
'name' => $action['name'],
'value' => $action['value'],
'stop-processing' => 1 === (int)($action['stop-processing'] ?? 0),
];
}
return $data; return $data;
} }
@@ -99,12 +84,12 @@ class RuleRequest extends Request
'rule_group_id' => 'required|belongsToUser:rule_groups|required_without:rule_group_title', 'rule_group_id' => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
'rule_group_title' => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title', 'rule_group_title' => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
'trigger' => 'required|in:store-journal,update-journal', 'trigger' => 'required|in:store-journal,update-journal',
'rule-triggers.*.name' => 'required|in:' . implode(',', $validTriggers), 'rule_triggers.*.name' => 'required|in:' . implode(',', $validTriggers),
'rule-triggers.*.stop-processing' => 'boolean', 'rule_triggers.*.stop_processing' => 'boolean',
'rule-triggers.*.value' => 'required|min:1|ruleTriggerValue', // 'rule_triggers.*.value' => 'required|min:1|ruleTriggerValue',
'rule-actions.*.name' => 'required|in:' . implode(',', $validActions), 'rule_actions.*.name' => 'required|in:' . implode(',', $validActions),
'rule-actions.*.value' => 'required_if:rule-action.*.type,' . $contextActions . '|ruleActionValue', 'rule_actions.*.value' => 'required_if:rule_actions.*.type,' . $contextActions . '|ruleActionValue',
'rule-actions.*.stop-processing' => 'boolean', 'rule_actions.*.stop_processing' => 'boolean',
'strict' => 'required|boolean', 'strict' => 'required|boolean',
'stop_processing' => 'required|boolean', 'stop_processing' => 'required|boolean',
'active' => 'required|boolean', 'active' => 'required|boolean',
@@ -138,7 +123,7 @@ class RuleRequest extends Request
protected function atLeastOneAction(Validator $validator): void protected function atLeastOneAction(Validator $validator): void
{ {
$data = $validator->getData(); $data = $validator->getData();
$repetitions = $data['rule-actions'] ?? []; $repetitions = $data['rule_actions'] ?? [];
// need at least one transaction // need at least one transaction
if (0 === \count($repetitions)) { if (0 === \count($repetitions)) {
$validator->errors()->add('title', (string)trans('validation.at_least_one_action')); $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
@@ -153,10 +138,50 @@ class RuleRequest extends Request
protected function atLeastOneTrigger(Validator $validator): void protected function atLeastOneTrigger(Validator $validator): void
{ {
$data = $validator->getData(); $data = $validator->getData();
$repetitions = $data['rule-triggers'] ?? []; $repetitions = $data['rule_triggers'] ?? [];
// need at least one transaction // need at least one transaction
if (0 === \count($repetitions)) { if (0 === \count($repetitions)) {
$validator->errors()->add('title', (string)trans('validation.at_least_one_trigger')); $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
} }
} }
/**
* @return array
*/
private function getRuleActions(): array
{
$actions = $this->get('rule_actions');
$return = [];
if (\is_array($actions)) {
foreach ($actions as $action) {
$return[] = [
'name' => $action['name'],
'value' => $action['value'],
'stop_processing' => 1 === (int)($action['stop-processing'] ?? '0'),
];
}
}
return $return;
}
/**
* @return array
*/
private function getRuleTriggers(): array
{
$triggers = $this->get('rule_triggers');
$return = [];
if (\is_array($triggers)) {
foreach ($triggers as $trigger) {
$return[] = [
'name' => $trigger['name'],
'value' => $trigger['value'],
'stop_processing' => 1 === (int)($trigger['stop-processing'] ?? '0'),
];
}
}
return $return;
}
} }

5
app/Validation/FireflyValidator.php
View File

@@ -337,7 +337,10 @@ class FireflyValidator extends Validator
// and finally a "will match everything check": // and finally a "will match everything check":
$classes = app('config')->get('firefly.rule-triggers'); $classes = app('config')->get('firefly.rule-triggers');
/** @var TriggerInterface $class */ /** @var TriggerInterface $class */
$class = $classes[$triggerType]; $class = $classes[$triggerType] ?? false;
if(false === $class) {
return false;
}
return !$class::willMatchEverything($value); return !$class::willMatchEverything($value);
} }