Extend inputs for ChoiceTask

Author: matteonardelli

internal/workflow/choice_task.go

@@ -36,8 +36,16 @@ func (c *ChoiceTask) Evaluate(input *TaskData, r *Request) (TaskId, error) {
 
 	// simply evaluate the Conditions and set the matching one
 	matchedCondition := -1
+	var extendedInputs = make(map[string]interface{})
+	for k, v := range r.Params {
+		extendedInputs[k] = v
+	}
+	for k, v := range input.Data {
+		extendedInputs[k] = v
+	}
+
 	for i, condition := range c.Conditions {
-		ok, err := condition.Evaluate(input.Data)
+		ok, err := condition.Evaluate(extendedInputs)
 		if err != nil {
 			return "", fmt.Errorf("error while testing condition: %v", err)
 		}