Merge pull request #756 from nyaruka/legacy-WA-components

Fix legacy WA components parameters
nyaruka · Jun 14, 2024 · 4273997 · 4273997
2 parents 03a119f + e4adb29
commit 4273997
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/handlers/whatsapp_legacy/handler.go b/handlers/whatsapp_legacy/handler.go
@@ -726,7 +726,7 @@ func buildPayloads(msg courier.MsgOut, h *handler, clog *courier.ChannelLog) ([]
 					compParams = append(compParams, msg.Templating().Variables[comp.Variables[varName]])
 				}
 
-				if comp.Type == "body" {
+				if comp.Type == "body" || strings.HasPrefix(comp.Type, "body/") {
 					component := &Component{Type: "body"}
 					for _, p := range compParams {
 						component.Parameters = append(component.Parameters, Param{Type: p.Type, Text: p.Value})

diff --git a/handlers/whatsapp_legacy/handler_test.go b/handlers/whatsapp_legacy/handler_test.go
@@ -772,7 +772,7 @@ var defaultSendTestCases = []OutgoingTestCase{
 		MsgTemplating: `{
 			"template": {"uuid": "171f8a4d-f725-46d7-85a6-11aceff0bfe3", "name": "revive_issue"}, 
 			"components": [
-				{"type": "body", "name": "body", "variables": {"1": 0, "2": 1}}
+				{"type": "body/text", "name": "body", "variables": {"1": 0, "2": 1}}
 			],
 			"variables": [
 				{"type": "text", "value": "Chef"},
@@ -821,7 +821,7 @@ var defaultSendTestCases = []OutgoingTestCase{
 		MsgTemplating: `{
 			"template": {"uuid": "171f8a4d-f725-46d7-85a6-11aceff0bfe3", "name": "revive_issue"},
 			"components": [
-				{"type": "body", "name": "body", "variables": {"1": 0, "2": 1}}
+				{"type": "body/text", "name": "body", "variables": {"1": 0, "2": 1}}
 			],
 			"variables": [
 				{"type": "text", "value": "Chef"},
@@ -849,7 +849,7 @@ var defaultSendTestCases = []OutgoingTestCase{
 			"template": {"uuid": "171f8a4d-f725-46d7-85a6-11aceff0bfe3", "name": "revive_issue"},
 			"namespace": "wa_template_namespace", 
 			"components": [
-				{"type": "body", "name": "body", "variables": {"1": 0, "2": 1}}
+				{"type": "body/text", "name": "body", "variables": {"1": 0, "2": 1}}
 			],
 			"variables": [
 				{"type": "text", "value": "Chef"},
@@ -876,7 +876,7 @@ var defaultSendTestCases = []OutgoingTestCase{
 		MsgTemplating: `{
 			"template": {"uuid": "171f8a4d-f725-46d7-85a6-11aceff0bfe3", "name": "revive_issue"},
 			"components": [
-				{"type": "body", "name": "body", "variables": {"1": 0, "2": 1}}
+				{"type": "body/text", "name": "body", "variables": {"1": 0, "2": 1}}
 			],
 			"variables": [
 				{"type": "text", "value": "Chef"},