Merge pull request #717 from nyaruka/template_tweak

Make processing of template components deterministic
nyaruka · Mar 15, 2024 · 9ba8161 · 9ba8161
2 parents ce71e14 + 00fd2c4
commit 9ba8161
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/handlers/meta/whatsapp/templates.go b/handlers/meta/whatsapp/templates.go
@@ -2,11 +2,13 @@ package whatsapp
 
 import (
 	"encoding/json"
+	"sort"
 	"strings"
 
 	"github.com/nyaruka/courier"
 	"github.com/nyaruka/courier/utils"
 	"github.com/pkg/errors"
+	"golang.org/x/exp/maps"
 )
 
 type MsgTemplating struct {
@@ -48,7 +50,12 @@ func GetTemplating(msg courier.MsgOut) (*MsgTemplating, error) {
 func GetTemplatePayload(templating MsgTemplating) *Template {
 	template := &Template{Name: templating.Template.Name, Language: &Language{Policy: "deterministic", Code: templating.Language}}
 
-	for k, v := range templating.Params {
+	compKeys := maps.Keys(templating.Params)
+	sort.Strings(compKeys) // so that final component order is deterministic
+
+	for _, k := range compKeys {
+		v := templating.Params[k]
+
 		if strings.HasPrefix(k, "button.") {
 
 			for _, p := range v {