Merge pull request #133 from nyaruka/results

Results
nyaruka · Oct 31, 2017 · 0019cb9 · 0019cb9
2 parents 6ae3515 + 333ab86
commit 0019cb9
Show file tree

Hide file tree

Showing 29 changed files with 227 additions and 272 deletions.
diff --git a/cmd/flowrunner/testdata/flows/all_actions.json b/cmd/flowrunner/testdata/flows/all_actions.json
@@ -123,7 +123,7 @@
                         {
                             "uuid": "5508e6a7-26ce-4b3b-b32e-bb4e2e614f5d",
                             "type": "save_flow_result",
-                            "result_name": "gender",
+                            "name": "Gender",
                             "value": "m",
                             "category": "Male"
                         },

diff --git a/cmd/flowrunner/testdata/flows/all_actions_test.json b/cmd/flowrunner/testdata/flows/all_actions_test.json
@@ -268,8 +268,8 @@
           "event": {
             "category": "Male",
             "created_on": "2000-01-01T00:00:00.000000000-00:00",
+            "name": "Gender",
             "node_uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
-            "result_name": "gender",
             "type": "save_flow_result",
             "value": "m"
           },
@@ -586,8 +586,8 @@
                   {
                     "category": "Male",
                     "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                    "name": "Gender",
                     "node_uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
-                    "result_name": "gender",
                     "type": "save_flow_result",
                     "value": "m"
                   },
@@ -625,8 +625,9 @@
               "gender": {
                 "category": "Male",
                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                "input": "",
+                "name": "Gender",
                 "node_uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
-                "result_name": "gender",
                 "value": "m"
               }
             },
@@ -648,7 +649,6 @@
             "flow_uuid": "b7cf0d83-f1c9-411c-96fd-c511a4cfa86d",
             "parent_uuid": "",
             "path": [],
-            "results": {},
             "status": "completed",
             "uuid": ""
           }

diff --git a/cmd/flowrunner/testdata/flows/brochure.json b/cmd/flowrunner/testdata/flows/brochure.json
@@ -32,7 +32,7 @@
           "router": {
             "type": "switch",
             "default_exit_uuid": "0680b01f-ba0b-48f4-a688-d2f963130126",
-            "result_name": "name",
+            "result_name": "Name",
             "operand": "@run.input",
             "cases": [
               {

diff --git a/cmd/flowrunner/testdata/flows/brochure_test.json b/cmd/flowrunner/testdata/flows/brochure_test.json
@@ -114,7 +114,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "waiting",
             "uuid": ""
           }
@@ -140,8 +139,9 @@
           "event": {
             "category": "",
             "created_on": "2000-01-01T00:00:00.000000000-00:00",
+            "input": "Ryan Lewis",
+            "name": "Name",
             "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
-            "result_name": "name",
             "type": "save_flow_result",
             "value": "Ryan Lewis"
           },
@@ -279,8 +279,9 @@
                   {
                     "category": "",
                     "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                    "input": "Ryan Lewis",
+                    "name": "Name",
                     "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
-                    "result_name": "name",
                     "type": "save_flow_result",
                     "value": "Ryan Lewis"
                   }
@@ -330,8 +331,9 @@
             "results": {
               "name": {
                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                "input": "Ryan Lewis",
+                "name": "Name",
                 "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
-                "result_name": "name",
                 "value": "Ryan Lewis"
               }
             },

diff --git a/cmd/flowrunner/testdata/flows/date_parse_test.json b/cmd/flowrunner/testdata/flows/date_parse_test.json
@@ -105,7 +105,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "waiting",
             "uuid": ""
           }
@@ -131,8 +130,9 @@
           "event": {
             "category": "Valid",
             "created_on": "2000-01-01T00:00:00.000000000-00:00",
+            "input": "I was born on 1977.06.23 at 3:34 pm",
+            "name": "Birth Date",
             "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
-            "result_name": "Birth Date",
             "type": "save_flow_result",
             "value": "1977-06-23T15:34:00.000000-05:00"
           },
@@ -251,8 +251,9 @@
                   {
                     "category": "Valid",
                     "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                    "input": "I was born on 1977.06.23 at 3:34 pm",
+                    "name": "Birth Date",
                     "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
-                    "result_name": "Birth Date",
                     "type": "save_flow_result",
                     "value": "1977-06-23T15:34:00.000000-05:00"
                   }
@@ -295,8 +296,9 @@
               "birth_date": {
                 "category": "Valid",
                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                "input": "I was born on 1977.06.23 at 3:34 pm",
+                "name": "Birth Date",
                 "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
-                "result_name": "Birth Date",
                 "value": "1977-06-23T15:34:00.000000-05:00"
               }
             },

diff --git a/cmd/flowrunner/testdata/flows/default_result_test.json b/cmd/flowrunner/testdata/flows/default_result_test.json
@@ -112,7 +112,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "waiting",
             "uuid": ""
           }
@@ -137,8 +136,9 @@
           "event": {
             "category": "All Responses",
             "created_on": "2000-01-01T00:00:00.000000000-00:00",
+            "input": "Ryan Lewis",
+            "name": "Contact Name",
             "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
-            "result_name": "Contact Name",
             "type": "save_flow_result",
             "value": "Ryan Lewis"
           },
@@ -271,8 +271,9 @@
                   {
                     "category": "All Responses",
                     "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                    "input": "Ryan Lewis",
+                    "name": "Contact Name",
                     "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
-                    "result_name": "Contact Name",
                     "type": "save_flow_result",
                     "value": "Ryan Lewis"
                   }
@@ -321,8 +322,9 @@
               "contact_name": {
                 "category": "All Responses",
                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
+                "input": "Ryan Lewis",
+                "name": "Contact Name",
                 "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
-                "result_name": "Contact Name",
                 "value": "Ryan Lewis"
               }
             },

diff --git a/cmd/flowrunner/testdata/flows/dynamic_groups_test.json b/cmd/flowrunner/testdata/flows/dynamic_groups_test.json
@@ -223,7 +223,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "completed",
             "uuid": ""
           }

diff --git a/cmd/flowrunner/testdata/flows/empty_test.json b/cmd/flowrunner/testdata/flows/empty_test.json
@@ -40,7 +40,6 @@
             "expires_on": "2000-01-01T00:00:00.000000000-00:00",
             "flow_uuid": "76f0a02f-3b75-4b86-9064-e9195e1b3a02",
             "path": [],
-            "results": {},
             "status": "completed",
             "uuid": ""
           }

diff --git a/cmd/flowrunner/testdata/flows/node_loop_test.json b/cmd/flowrunner/testdata/flows/node_loop_test.json
@@ -92,7 +92,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "errored",
             "uuid": ""
           }

diff --git a/cmd/flowrunner/testdata/flows/subflow.json b/cmd/flowrunner/testdata/flows/subflow.json
@@ -97,7 +97,7 @@
                         "type": "msg"
                     },
                     "router": {
-                        "result_name": "name",
+                        "result_name": "Name",
                         "type": "switch",
                         "default": "910521f5-d709-437e-b7b7-5aab3d83ffb5",
                         "operand": "@run.input.text",

diff --git a/cmd/flowrunner/testdata/flows/subflow_loop_test.json b/cmd/flowrunner/testdata/flows/subflow_loop_test.json
@@ -137,7 +137,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "errored",
             "uuid": ""
           },
@@ -173,7 +172,6 @@
                 "uuid": ""
               }
             ],
-            "results": {},
             "status": "errored",
             "uuid": ""
           }

diff --git a/cmd/flowrunner/testdata/flows/subflow_other.json b/cmd/flowrunner/testdata/flows/subflow_other.json
@@ -112,7 +112,7 @@
                     ],
                     "router": {
                         "type": "switch",
-                        "result_name": "answer",
+                        "result_name": "Answer",
                         "cases": [
                             {
                                 "type": "has_any_word",
@@ -203,7 +203,7 @@
                     ],
                     "router": {
                         "type": "switch",
-                        "result_name": "answer",
+                        "result_name": "Answer",
                         "cases": [
                             {
                                 "type": "has_any_word",