mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-14 00:04:24 +00:00
Fix test coverage.
This commit is contained in:
@@ -158,9 +158,9 @@ class EditController extends Controller
|
||||
{
|
||||
$index = 0;
|
||||
$actions = [];
|
||||
|
||||
$currentActions = $rule->ruleActions()->orderBy('order','ASC')->get();
|
||||
/** @var RuleAction $entry */
|
||||
foreach ($rule->ruleActions as $entry) {
|
||||
foreach ($currentActions as $entry) {
|
||||
$count = ($index + 1);
|
||||
try {
|
||||
$actions[] = view(
|
||||
@@ -196,9 +196,9 @@ class EditController extends Controller
|
||||
{
|
||||
$index = 0;
|
||||
$triggers = [];
|
||||
|
||||
$currentTriggers = $rule->ruleTriggers()->orderBy('order','ASC')->get();
|
||||
/** @var RuleTrigger $entry */
|
||||
foreach ($rule->ruleTriggers as $entry) {
|
||||
foreach ($currentTriggers as $entry) {
|
||||
if ('user_action' !== $entry->trigger_type) {
|
||||
$count = ($index + 1);
|
||||
try {
|
||||
|
@@ -155,8 +155,8 @@ class SelectController extends Controller
|
||||
$strict = '1' === $request->get('strict');
|
||||
/** @var TransactionMatcher $matcher */
|
||||
$matcher = app(TransactionMatcher::class);
|
||||
$matcher->setLimit($limit);
|
||||
$matcher->setRange($range);
|
||||
$matcher->setSearchLimit($range);
|
||||
$matcher->setTriggeredLimit($limit);
|
||||
$matcher->setTriggers($triggers);
|
||||
$matcher->setStrict($strict);
|
||||
try {
|
||||
@@ -222,8 +222,8 @@ class SelectController extends Controller
|
||||
|
||||
/** @var TransactionMatcher $matcher */
|
||||
$matcher = app(TransactionMatcher::class);
|
||||
$matcher->setLimit($limit);
|
||||
$matcher->setRange($range);
|
||||
$matcher->setTriggeredLimit($limit);
|
||||
$matcher->setSearchLimit($range);
|
||||
$matcher->setRule($rule);
|
||||
try {
|
||||
$matchingTransactions = $matcher->findTransactionsByRule();
|
||||
|
@@ -142,7 +142,7 @@ class MassController extends Controller
|
||||
|
||||
$this->rememberPreviousUri('transactions.mass-edit.uri');
|
||||
|
||||
$transformer = new TransactionTransformer(new ParameterBag, $this->repository);
|
||||
$transformer = new TransactionTransformer(new ParameterBag);
|
||||
/** @var TransactionCollectorInterface $collector */
|
||||
$collector = app(TransactionCollectorInterface::class);
|
||||
$collector->setUser($user);
|
||||
|
@@ -253,7 +253,7 @@ class TransactionController extends Controller
|
||||
$collector->setJournals(new Collection([$journal]));
|
||||
$set = $collector->getTransactions();
|
||||
$transactions = [];
|
||||
$transformer = new TransactionTransformer(new ParameterBag, $this->repository);
|
||||
$transformer = new TransactionTransformer(new ParameterBag);
|
||||
/** @var Transaction $transaction */
|
||||
foreach ($set as $transaction) {
|
||||
$transactions[] = $transformer->transform($transaction);
|
||||
|
@@ -58,8 +58,8 @@ class RuleFormRequest extends Request
|
||||
'description' => $this->string('description'),
|
||||
'stop_processing' => $this->boolean('stop_processing'),
|
||||
'strict' => $this->boolean('strict'),
|
||||
'rule_triggers' => $this->getRuleTriggerData(),
|
||||
'rule_actions' => $this->getRuleActionData(),
|
||||
'triggers' => $this->getRuleTriggerData(),
|
||||
'actions' => $this->getRuleActionData(),
|
||||
];
|
||||
|
||||
return $data;
|
||||
@@ -83,16 +83,16 @@ class RuleFormRequest extends Request
|
||||
|
||||
// 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',
|
||||
'rule_triggers.*.name' => 'required|in:' . implode(',', $validTriggers),
|
||||
'rule_triggers.*.value' => sprintf('required_if:rule_triggers.*.name,%s|min:1|ruleTriggerValue', $contextTriggers),
|
||||
'rule-actions.*.name' => 'required|in:' . implode(',', $validActions),
|
||||
'rule_actions.*.value' => sprintf('required_if:rule_actions.*.name,%s|min:1|ruleActionValue', $contextActions),
|
||||
'strict' => 'in:0,1',
|
||||
'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.*.name' => 'required|in:' . implode(',', $validTriggers),
|
||||
'triggers.*.value' => sprintf('required_if:triggers.*.name,%s|min:1|ruleTriggerValue', $contextTriggers),
|
||||
'actions.*.name' => 'required|in:' . implode(',', $validActions),
|
||||
'actions.*.value' => sprintf('required_if:actions.*.name,%s|min:1|ruleActionValue', $contextActions),
|
||||
'strict' => 'in:0,1',
|
||||
];
|
||||
|
||||
/** @var Rule $rule */
|
||||
@@ -111,7 +111,7 @@ class RuleFormRequest extends Request
|
||||
private function getRuleActionData(): array
|
||||
{
|
||||
$return = [];
|
||||
$actionData = $this->get('rule_actions');
|
||||
$actionData = $this->get('actions');
|
||||
if (\is_array($actionData)) {
|
||||
foreach ($actionData as $action) {
|
||||
$stopProcessing = $action['stop_processing'] ?? '0';
|
||||
@@ -132,7 +132,7 @@ class RuleFormRequest extends Request
|
||||
private function getRuleTriggerData(): array
|
||||
{
|
||||
$return = [];
|
||||
$triggerData = $this->get('rule_triggers');
|
||||
$triggerData = $this->get('triggers');
|
||||
if (\is_array($triggerData)) {
|
||||
foreach ($triggerData as $trigger) {
|
||||
$stopProcessing = $trigger['stop_processing'] ?? '0';
|
||||
|
@@ -42,6 +42,7 @@ class TestRuleFormRequest extends Request
|
||||
|
||||
/**
|
||||
* Rules for this request.
|
||||
* TODO these rules are not valid anymore.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
|
Reference in New Issue
Block a user