mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-20 08:30:06 +00:00
Code cleanup.
This commit is contained in:
@@ -40,9 +40,6 @@ class RuleFormRequest extends FormRequest
|
||||
|
||||
/**
|
||||
* Get all data for controller.
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
*/
|
||||
public function getRuleData(): array
|
||||
{
|
||||
@@ -59,9 +56,69 @@ class RuleFormRequest extends FormRequest
|
||||
];
|
||||
}
|
||||
|
||||
public static function replaceAmountTrigger(array $array): array
|
||||
{
|
||||
// do some sneaky search and replace.
|
||||
$amountFields = [
|
||||
'amount_is',
|
||||
'amount',
|
||||
'amount_exactly',
|
||||
'amount_less',
|
||||
'amount_max',
|
||||
'amount_more',
|
||||
'amount_min',
|
||||
'foreign_amount_is',
|
||||
'foreign_amount',
|
||||
'foreign_amount_less',
|
||||
'foreign_amount_max',
|
||||
'foreign_amount_more',
|
||||
'foreign_amount_min',
|
||||
];
|
||||
if (in_array($array['type'], $amountFields, true) && '0' === $array['value']) {
|
||||
$array['value'] = '0.00';
|
||||
}
|
||||
|
||||
return $array;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
* Rules for this request.
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
$validTriggers = $this->getTriggers();
|
||||
$validActions = array_keys(config('firefly.rule-actions'));
|
||||
|
||||
// some actions require text (aka context):
|
||||
$contextActions = implode(',', config('firefly.context-rule-actions'));
|
||||
|
||||
// some triggers require text (aka context):
|
||||
$contextTriggers = implode(',', $this->getTriggersWithContext());
|
||||
|
||||
// initial set of rules:
|
||||
$rules = [
|
||||
'title' => 'required|between:1,100|uniqueObjectForUser:rules,title',
|
||||
'description' => 'between:1,5000|nullable',
|
||||
'stop_processing' => 'boolean',
|
||||
'rule_group_id' => 'required|belongsToUser:rule_groups',
|
||||
'trigger' => 'required|in:store-journal,update-journal',
|
||||
'triggers.*.type' => 'required|in:'.implode(',', $validTriggers),
|
||||
'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
|
||||
'actions.*.type' => 'required|in:'.implode(',', $validActions),
|
||||
'actions.*.value' => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions),
|
||||
'strict' => 'in:0,1',
|
||||
];
|
||||
|
||||
/** @var null|Rule $rule */
|
||||
$rule = $this->route()->parameter('rule');
|
||||
|
||||
if (null !== $rule) {
|
||||
$rules['title'] = 'required|between:1,100|uniqueObjectForUser:rules,title,'.$rule->id;
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
|
||||
private function getRuleTriggerData(): array
|
||||
{
|
||||
$return = [];
|
||||
@@ -84,38 +141,6 @@ class RuleFormRequest extends FormRequest
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $array
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function replaceAmountTrigger(array $array): array
|
||||
{
|
||||
// do some sneaky search and replace.
|
||||
$amountFields = [
|
||||
'amount_is',
|
||||
'amount',
|
||||
'amount_exactly',
|
||||
'amount_less',
|
||||
'amount_max',
|
||||
'amount_more',
|
||||
'amount_min',
|
||||
'foreign_amount_is',
|
||||
'foreign_amount',
|
||||
'foreign_amount_less',
|
||||
'foreign_amount_max',
|
||||
'foreign_amount_more',
|
||||
'foreign_amount_min',
|
||||
];
|
||||
if (in_array($array['type'], $amountFields, true) && '0' === $array['value']) {
|
||||
$array['value'] = '0.00';
|
||||
}
|
||||
return $array;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
private function getRuleActionData(): array
|
||||
{
|
||||
$return = [];
|
||||
@@ -133,44 +158,4 @@ class RuleFormRequest extends FormRequest
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Rules for this request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
$validTriggers = $this->getTriggers();
|
||||
$validActions = array_keys(config('firefly.rule-actions'));
|
||||
|
||||
// some actions require text (aka context):
|
||||
$contextActions = implode(',', config('firefly.context-rule-actions'));
|
||||
|
||||
// some triggers require text (aka context):
|
||||
$contextTriggers = implode(',', $this->getTriggersWithContext());
|
||||
|
||||
// initial set of rules:
|
||||
$rules = [
|
||||
'title' => 'required|between:1,100|uniqueObjectForUser:rules,title',
|
||||
'description' => 'between:1,5000|nullable',
|
||||
'stop_processing' => 'boolean',
|
||||
'rule_group_id' => 'required|belongsToUser:rule_groups',
|
||||
'trigger' => 'required|in:store-journal,update-journal',
|
||||
'triggers.*.type' => 'required|in:' . implode(',', $validTriggers),
|
||||
'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
|
||||
'actions.*.type' => 'required|in:' . implode(',', $validActions),
|
||||
'actions.*.value' => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions),
|
||||
'strict' => 'in:0,1',
|
||||
];
|
||||
|
||||
/** @var Rule|null $rule */
|
||||
$rule = $this->route()->parameter('rule');
|
||||
|
||||
if (null !== $rule) {
|
||||
$rules['title'] = 'required|between:1,100|uniqueObjectForUser:rules,title,' . $rule->id;
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user