From e46561347da487473c544b70d38c16304dd70921 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 18 Dec 2018 07:08:46 +0100
Subject: [PATCH] Some rule fixes.

---
 app/Http/Requests/RuleFormRequest.php                | 12 ++++++------
 .../Controllers/Rule/CreateControllerTest.php        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index d6d01409c0..38e4ad8ac2 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -88,10 +88,10 @@ class RuleFormRequest extends Request
             '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),
+            'triggers.*.type'  => 'required|in:' . implode(',', $validTriggers),
+            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|min:1|ruleTriggerValue', $contextTriggers),
+            'actions.*.type'   => 'required|in:' . implode(',', $validActions),
+            'actions.*.value'  => sprintf('required_if:actions.*.type,%s|min:1|ruleActionValue', $contextActions),
             'strict'           => 'in:0,1',
         ];
 
@@ -116,7 +116,7 @@ class RuleFormRequest extends Request
             foreach ($actionData as $action) {
                 $stopProcessing = $action['stop_processing'] ?? '0';
                 $return[]       = [
-                    'name'            => $action['name'] ?? 'invalid',
+                    'type'            => $action['type'] ?? 'invalid',
                     'value'           => $action['value'] ?? '',
                     'stop_processing' => 1 === (int)$stopProcessing,
                 ];
@@ -137,7 +137,7 @@ class RuleFormRequest extends Request
             foreach ($triggerData as $trigger) {
                 $stopProcessing = $trigger['stop_processing'] ?? '0';
                 $return[]       = [
-                    'name'            => $trigger['name'] ?? 'invalid',
+                    'type'            => $trigger['type'] ?? 'invalid',
                     'value'           => $trigger['value'] ?? '',
                     'stop_processing' => 1 === (int)$stopProcessing,
                 ];
diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php
index 78a6321ca0..c2c05b7774 100644
--- a/tests/Feature/Controllers/Rule/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php
@@ -156,7 +156,7 @@ class CreateControllerTest extends TestCase
             'description'   => 'D',
             'rule_triggers' => [
                 [
-                    'name'            => 'description_is',
+                    'type'            => 'description_is',
                     'value'           => 'A',
                     'stop_processing' => '0',
 
@@ -164,7 +164,7 @@ class CreateControllerTest extends TestCase
             ],
             'rule_actions'  => [
                 [
-                    'name'            => 'set_category',
+                    'type'            => 'set_category',
                     'value'           => 'C',
                     'stop_processing' => '0',