kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-07 10:28:22 +00:00
Code Issues Projects Releases Wiki Activity

More code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-02-12 17:41:12 +01:00
parent 53d88dfd50
commit 28bce44f69
1 changed files with 40 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
app/Repositories/Rule/RuleRepository.php
View File

@@ -207,47 +207,10 @@ class RuleRepository implements RuleRepositoryInterface
$rule->save(); $rule->save();
// start storing triggers: // start storing triggers:
$order = 1; $this->storeTriggers($rule, $data);
$stopProcessing = false;
$triggerValues = [
'action' => 'user_action',
'value' => $data['trigger'],
'stopProcessing' => $stopProcessing,
'order' => $order,
];
$this->storeTrigger($rule, $triggerValues);
foreach ($data['rule-triggers'] as $index => $trigger) {
$value = $data['rule-trigger-values'][$index];
$stopProcessing = isset($data['rule-trigger-stop'][$index]) ? true : false;
$triggerValues = [
'action' => $trigger,
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,
];
$this->storeTrigger($rule, $triggerValues);
$order++;
}
// same for actions. // same for actions.
$order = 1; $this->storeActions($rule, $data);
foreach ($data['rule-actions'] as $index => $action) {
$value = $data['rule-action-values'][$index];
$stopProcessing = isset($data['rule-action-stop'][$index]) ? true : false;
$actionValues = [
'action' => $action,
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,
];
$this->storeAction($rule, $actionValues);
}
return $rule; return $rule;
} }
@@ -315,6 +278,44 @@ class RuleRepository implements RuleRepositoryInterface
$rule->ruleActions()->delete(); $rule->ruleActions()->delete();
// recreate triggers: // recreate triggers:
$this->storeTriggers($rule, $data);
// recreate actions:
$this->storeActions($rule, $data);
return $rule;
}
/**
* @param Rule $rule
* @param array $data
*/
private function storeActions(Rule $rule, array $data)
{
$order = 1;
foreach ($data['rule-actions'] as $index => $action) {
$value = $data['rule-action-values'][$index];
$stopProcessing = isset($data['rule-action-stop'][$index]) ? true : false;
$actionValues = [
'action' => $action,
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,
];
$this->storeAction($rule, $actionValues);
}
}
/**
* @param Rule $rule
* @param array $data
*/
private function storeTriggers(Rule $rule, array $data)
{
$order = 1; $order = 1;
$stopProcessing = false; $stopProcessing = false;
@@ -340,24 +341,5 @@ class RuleRepository implements RuleRepositoryInterface
$this->storeTrigger($rule, $triggerValues); $this->storeTrigger($rule, $triggerValues);
$order++; $order++;
} }
// recreate actions:
$order = 1;
foreach ($data['rule-actions'] as $index => $action) {
$value = $data['rule-action-values'][$index];
$stopProcessing = isset($data['rule-action-stop'][$index]) ? true : false;
$actionValues = [
'action' => $action,
'value' => $value,
'stopProcessing' => $stopProcessing,
'order' => $order,
];
$this->storeAction($rule, $actionValues);
}
return $rule;
} }
} }