Merge pull request #158 from nyaruka/trigger_param_fix

Fix params on triggers so resolving doesn't blow up when they are empty

Author: rowanseymour

flows/interfaces.go

@@ -205,7 +205,7 @@ type Trigger interface {
 	Environment() utils.Environment
 	Flow() Flow
 	Contact() *Contact
-	Params() *utils.JSONFragment
+	Params() utils.JSONFragment
 	TriggeredOn() time.Time
 }
 

flows/triggers/base.go

@@ -12,14 +12,14 @@ type baseTrigger struct {
 	environment utils.Environment
 	flow        flows.Flow
 	contact     *flows.Contact
-	params      *utils.JSONFragment
+	params      utils.JSONFragment
 	triggeredOn time.Time
 }
 
 func (t *baseTrigger) Environment() utils.Environment { return t.environment }
 func (t *baseTrigger) Flow() flows.Flow               { return t.flow }
 func (t *baseTrigger) Contact() *flows.Contact        { return t.contact }
-func (t *baseTrigger) Params() *utils.JSONFragment    { return t.params }
+func (t *baseTrigger) Params() utils.JSONFragment     { return t.params }
 func (t *baseTrigger) TriggeredOn() time.Time         { return t.triggeredOn }
 
 func (t *baseTrigger) Default() interface{} {
@@ -30,7 +30,7 @@ func (t *baseTrigger) Default() interface{} {
 func (t *baseTrigger) Resolve(key string) interface{} {
 	switch key {
 	case "params":
-		return *t.params
+		return t.params
 	}
 
 	return fmt.Errorf("No such field '%s' on trigger", key)

flows/triggers/envelope.go

@@ -50,8 +50,9 @@ func unmarshalBaseTrigger(session flows.Session, base *baseTrigger, envelope *ba
 		}
 	}
 	if envelope.Params != nil {
-		params := utils.JSONFragment(envelope.Params)
-		base.params = &params
+		base.params = utils.JSONFragment(envelope.Params)
+	} else {
+		base.params = utils.EmptyJSONFragment
 	}
 
 	return nil
@@ -75,7 +76,7 @@ func marshalBaseTrigger(t *baseTrigger, envelope *baseTriggerEnvelope) error {
 		}
 	}
 	if t.params != nil {
-		envelope.Params = json.RawMessage(*t.params)
+		envelope.Params = json.RawMessage(t.params)
 	}
 	return nil
 }