Merge pull request #1245 from nyaruka/rem_templating_params

Remove deprecated params in templating

Author: rowanseymour

flows/actions/send_msg.go

@@ -11,7 +11,6 @@ import (
 	"github.com/nyaruka/goflow/assets"
 	"github.com/nyaruka/goflow/flows"
 	"github.com/nyaruka/goflow/flows/events"
-	"github.com/nyaruka/goflow/utils"
 )
 
 func init() {
@@ -177,16 +176,11 @@ func (a *SendMsgAction) getTemplateMsg(run flows.Run, urn urns.URN, channelRef *
 	components := make([]*flows.TemplatingComponent, 0, len(translation.Components()))
 	for _, comp := range translation.Components() {
 		if len(comp.Variables()) > 0 {
-			tc := &flows.TemplatingComponent{Type: comp.Type(), Name: comp.Name(), Variables: comp.Variables()}
-
-			// TODO remove when courier updated
-			tc.Params = make([]*flows.TemplatingVariable, 0, len(comp.Variables()))
-			for _, vn := range utils.SortedKeys(comp.Variables()) {
-				vi := comp.Variables()[vn]
-				tc.Params = append(tc.Params, variables[vi])
-			}
-
-			components = append(components, tc)
+			components = append(components, &flows.TemplatingComponent{
+				Type:      comp.Type(),
+				Name:      comp.Name(),
+				Variables: comp.Variables(),
+			})
 		}
 	}
 

flows/actions/testdata/send_msg.json

@@ -466,17 +466,7 @@
                                 "variables": {
                                     "1": 0,
                                     "2": 1
-                                },
-                                "params": [
-                                    {
-                                        "type": "text",
-                                        "value": "Ryan Lewis"
-                                    },
-                                    {
-                                        "type": "text",
-                                        "value": "boy"
-                                    }
-                                ]
+                                }
                             }
                         ],
                         "variables": [
@@ -577,17 +567,7 @@
                                 "variables": {
                                     "1": 0,
                                     "2": 1
-                                },
-                                "params": [
-                                    {
-                                        "type": "text",
-                                        "value": "Ryan Lewis"
-                                    },
-                                    {
-                                        "type": "text",
-                                        "value": "niño"
-                                    }
-                                ]
+                                }
                             }
                         ],
                         "variables": [
@@ -927,30 +907,14 @@
                                 "variables": {
                                     "1": 0,
                                     "2": 1
-                                },
-                                "params": [
-                                    {
-                                        "type": "text",
-                                        "value": "Ryan Lewis"
-                                    },
-                                    {
-                                        "type": "text",
-                                        "value": "niño"
-                                    }
-                                ]
+                                }
                             },
                             {
                                 "type": "button/quick_reply",
                                 "name": "button.0",
                                 "variables": {
                                     "1": 2
-                                },
-                                "params": [
-                                    {
-                                        "type": "text",
-                                        "value": "Sip"
-                                    }
-                                ]
+                                }
                             }
                         ],
                         "variables": [

flows/msg.go

@@ -174,10 +174,9 @@ type TemplatingVariable struct {
 }
 
 type TemplatingComponent struct {
-	Type      string                `json:"type"`
-	Name      string                `json:"name"`
-	Variables map[string]int        `json:"variables"`
-	Params    []*TemplatingVariable `json:"params"` // deprecated
+	Type      string         `json:"type"`
+	Name      string         `json:"name"`
+	Variables map[string]int `json:"variables"`
 }
 
 // MsgTemplating represents any substituted message template that should be applied when sending this message

flows/msg_test.go

@@ -189,8 +189,7 @@ func TestMsgTemplating(t *testing.T) {
 			{
 				"type": "body",
 				"name": "body",
-				"variables": {"1": 0, "2": 1},
-				"params": null
+				"variables": {"1": 0, "2": 1}
 			}
 		],
 		"variables": [