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

Fixed some things in the rule controllers.

Browse Source
This commit is contained in:
James Cole
2016-01-24 16:50:55 +01:00
parent 0f12ebb31c
commit 94700f4064
5 changed files with 158 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,14 @@ use FireflyIII\Models\RuleTrigger;
class RuleRepository implements RuleRepositoryInterface
{
/**
* @return int
*/
public function count()
{
return Auth::user()->rules()->count();
}
/**
* @param Rule $rule
*
@@ -41,6 +49,24 @@ class RuleRepository implements RuleRepositoryInterface
return true;
}
/**
* @return RuleGroup
*/
public function getFirstRuleGroup()
{
return Auth::user()->ruleGroups()->first();
}
/**
* @param RuleGroup $ruleGroup
*
* @return int
*/
public function getHighestOrderInRuleGroup(RuleGroup $ruleGroup)
{
return intval($ruleGroup->rules()->max('order'));
}
/**
* @param Rule $rule
*
@@ -63,31 +89,6 @@ class RuleRepository implements RuleRepositoryInterface
$this->resetRulesInGroupOrder($rule->ruleGroup);
}
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup)
{
$ruleGroup->rules()->whereNotNull('deleted_at')->update(['order' => 0]);
$set = $ruleGroup->rules()
->orderBy('order', 'ASC')
->orderBy('updated_at', 'DESC')
->get();
$count = 1;
/** @var Rule $entry */
foreach ($set as $entry) {
$entry->order = $count;
$entry->save();
$count++;
}
return true;
}
/**
* @param Rule $rule
*
@@ -153,6 +154,31 @@ class RuleRepository implements RuleRepositoryInterface
return true;
}
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup)
{
$ruleGroup->rules()->whereNotNull('deleted_at')->update(['order' => 0]);
$set = $ruleGroup->rules()
->orderBy('order', 'ASC')
->orderBy('updated_at', 'DESC')
->get();
$count = 1;
/** @var Rule $entry */
foreach ($set as $entry) {
$entry->order = $count;
$entry->save();
$count++;
}
return true;
}
/**
* @param array $data
*
@@ -168,7 +194,7 @@ class RuleRepository implements RuleRepositoryInterface
// start by creating a new rule:
$rule = new Rule;
$rule->user()->associate(Auth::user());
$rule->user()->associate(Auth::user()); // TODO must be $data['user']
$rule->rule_group_id = $data['rule_group_id'];
$rule->order = ($order + 1);
@@ -190,7 +216,7 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeTrigger($rule, 'user_action', $data['trigger'], $stopProcessing, $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;
@@ -202,7 +228,7 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeTrigger($rule, $trigger, $value, $stopProcessing, $order);
$this->storeTrigger($rule, $triggerValues);
$order++;
}
@@ -219,42 +245,12 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeAction($rule, $action, $value, $stopProcessing, $order);
$this->storeAction($rule, $actionValues);
}
return $rule;
}
/**
* @param RuleGroup $ruleGroup
*
* @return int
*/
public function getHighestOrderInRuleGroup(RuleGroup $ruleGroup)
{
return intval($ruleGroup->rules()->max('order'));
}
/**
* @param Rule $rule
* @param array $values
*
* @return RuleTrigger
*/
public function storeTrigger(Rule $rule, array $values)
{
$ruleTrigger = new RuleTrigger;
$ruleTrigger->rule()->associate($rule);
$ruleTrigger->order = $values['order'];
$ruleTrigger->active = 1;
$ruleTrigger->stop_processing = $values['stopProcessing'];
$ruleTrigger->trigger_type = $values['action'];
$ruleTrigger->trigger_value = $values['value'];
$ruleTrigger->save();
return $ruleTrigger;
}
/**
* @param Rule $rule
* @param array $values
@@ -276,6 +272,26 @@ class RuleRepository implements RuleRepositoryInterface
return $ruleAction;
}
/**
* @param Rule $rule
* @param array $values
*
* @return RuleTrigger
*/
public function storeTrigger(Rule $rule, array $values)
{
$ruleTrigger = new RuleTrigger;
$ruleTrigger->rule()->associate($rule);
$ruleTrigger->order = $values['order'];
$ruleTrigger->active = 1;
$ruleTrigger->stop_processing = $values['stopProcessing'];
$ruleTrigger->trigger_type = $values['action'];
$ruleTrigger->trigger_value = $values['value'];
$ruleTrigger->save();
return $ruleTrigger;
}
/**
* @param Rule $rule
* @param array $data
@@ -308,7 +324,7 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeTrigger($rule, 'user_action', $data['trigger'], $stopProcessing, $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;
@@ -320,7 +336,7 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeTrigger($rule, $trigger, $value, $stopProcessing, $order);
$this->storeTrigger($rule, $triggerValues);
$order++;
}
@@ -337,7 +353,7 @@ class RuleRepository implements RuleRepositoryInterface
'order' => $order,
];
$this->storeAction($rule, $action, $value, $stopProcessing, $order);
$this->storeAction($rule, $actionValues);
}