Deal with parameters with multiple preset values

Author: pietern

sqlanalytics/api/query.go

@@ -162,34 +162,130 @@ type QueryParameterMultipleValuesOptions struct {
 type QueryParameterEnum struct {
 	QueryParameter
 
-	Value   string                               `json:"value"`
+	Values []string `json:"-"`
+
+	Value   json.RawMessage                      `json:"value"`
 	Options string                               `json:"enumOptions"`
 	Multi   *QueryParameterMultipleValuesOptions `json:"multiValuesOptions,omitempty"`
 }
 
 // MarshalJSON sets the type before marshaling.
 func (p QueryParameterEnum) MarshalJSON() ([]byte, error) {
 	p.QueryParameter.Type = queryParameterEnumTypeName
+
+	// Set `Value` depending on multiple options being allowed or not.
+	var err error
+	if p.Multi == nil {
+		// Set as single string.
+		p.Value, err = json.Marshal(p.Values[0])
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		// Set as array of strings.
+		p.Value, err = json.Marshal(p.Values)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	type localQueryParameter QueryParameterEnum
 	return json.Marshal((localQueryParameter)(p))
 }
 
+// UnmarshalJSON deals with polymorphism of the `value` field.
+func (p *QueryParameterEnum) UnmarshalJSON(b []byte) error {
+	type localQueryParameter QueryParameterEnum
+	err := json.Unmarshal(b, (*localQueryParameter)(p))
+	if err != nil {
+		return err
+	}
+
+	// If multiple options aren't configured, assume `value` is a string.
+	// Otherwise, it's an array of strings.
+	if p.Multi == nil {
+		var v string
+		err = json.Unmarshal(p.Value, &v)
+		if err != nil {
+			return nil
+		}
+		p.Values = []string{v}
+	} else {
+		var vs []string
+		err = json.Unmarshal(p.Value, &vs)
+		if err != nil {
+			return nil
+		}
+		p.Values = vs
+	}
+
+	return nil
+}
+
 // QueryParameterQuery ...
 type QueryParameterQuery struct {
 	QueryParameter
 
-	Value   string                               `json:"value"`
+	Values []string `json:"-"`
+
+	Value   json.RawMessage                      `json:"value"`
 	QueryID string                               `json:"queryId"`
 	Multi   *QueryParameterMultipleValuesOptions `json:"multiValuesOptions,omitempty"`
 }
 
 // MarshalJSON sets the type before marshaling.
 func (p QueryParameterQuery) MarshalJSON() ([]byte, error) {
 	p.QueryParameter.Type = queryParameterQueryTypeName
+
+	// Set `Value` depending on multiple options being allowed or not.
+	var err error
+	if p.Multi == nil {
+		// Set as single string.
+		p.Value, err = json.Marshal(p.Values[0])
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		// Set as array of strings.
+		p.Value, err = json.Marshal(p.Values)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	type localQueryParameter QueryParameterQuery
 	return json.Marshal((localQueryParameter)(p))
 }
 
+// UnmarshalJSON deals with polymorphism of the `value` field.
+func (p *QueryParameterQuery) UnmarshalJSON(b []byte) error {
+	type localQueryParameter QueryParameterQuery
+	err := json.Unmarshal(b, (*localQueryParameter)(p))
+	if err != nil {
+		return err
+	}
+
+	// If multiple options aren't configured, assume `value` is a string.
+	// Otherwise, it's an array of strings.
+	if p.Multi == nil {
+		var v string
+		err = json.Unmarshal(p.Value, &v)
+		if err != nil {
+			return nil
+		}
+		p.Values = []string{v}
+	} else {
+		var vs []string
+		err = json.Unmarshal(p.Value, &vs)
+		if err != nil {
+			return nil
+		}
+		p.Values = vs
+	}
+
+	return nil
+}
+
 // QueryParameterDate ...
 type QueryParameterDate struct {
 	QueryParameter

sqlanalytics/resource_query.go

@@ -59,14 +59,22 @@ type QueryParameterNumber struct {
 
 // QueryParameterEnum ...
 type QueryParameterEnum struct {
-	Value    string                       `json:"value"`
+	// Value iff `multiple == nil`
+	Value string `json:"value,omitempty"`
+	// Values iff `multiple != nil`
+	Values []string `json:"values,omitempty"`
+
 	Options  []string                     `json:"options"`
 	Multiple *QueryParameterAllowMultiple `json:"multiple,omitempty"`
 }
 
 // QueryParameterQuery ...
 type QueryParameterQuery struct {
-	Value    string                       `json:"value"`
+	// Value iff `multiple == nil`
+	Value string `json:"value,omitempty"`
+	// Values iff `multiple != nil`
+	Values []string `json:"values,omitempty"`
+
 	QueryID  string                       `json:"query_id"`
 	Multiple *QueryParameterAllowMultiple `json:"multiple,omitempty"`
 }
@@ -181,21 +189,25 @@ func (r *queryResource) toAPIObject(d *schema.ResourceData) (*api.Query, error)
 			case p.Enum != nil:
 				tmp := api.QueryParameterEnum{
 					QueryParameter: ap,
-					Value:          p.Enum.Value,
 					Options:        strings.Join(p.Enum.Options, "\n"),
 				}
 				if p.Enum.Multiple != nil {
+					tmp.Values = p.Enum.Values
 					tmp.Multi = p.Enum.Multiple.toAPIObject()
+				} else {
+					tmp.Values = []string{p.Enum.Value}
 				}
 				iface = tmp
 			case p.Query != nil:
 				tmp := api.QueryParameterQuery{
 					QueryParameter: ap,
-					Value:          p.Query.Value,
 					QueryID:        p.Query.QueryID,
 				}
 				if p.Query.Multiple != nil {
+					tmp.Values = p.Query.Values
 					tmp.Multi = p.Query.Multiple.toAPIObject()
+				} else {
+					tmp.Values = []string{p.Query.Value}
 				}
 				iface = tmp
 			case p.Date != nil:
@@ -279,18 +291,26 @@ func (r *queryResource) fromAPIObject(aq *api.Query, d *schema.ResourceData) err
 				p.Name = apv.Name
 				p.Title = apv.Title
 				p.Enum = &QueryParameterEnum{
-					Value:    apv.Value,
 					Options:  strings.Split(apv.Options, "\n"),
 					Multiple: newQueryParameterAllowMultiple(apv.Multi),
 				}
+				if p.Enum.Multiple != nil {
+					p.Enum.Values = apv.Values
+				} else {
+					p.Enum.Value = apv.Values[0]
+				}
 			case *api.QueryParameterQuery:
 				p.Name = apv.Name
 				p.Title = apv.Title
 				p.Query = &QueryParameterQuery{
-					Value:    apv.Value,
 					QueryID:  apv.QueryID,
 					Multiple: newQueryParameterAllowMultiple(apv.Multi),
 				}
+				if p.Query.Multiple != nil {
+					p.Query.Values = apv.Values
+				} else {
+					p.Query.Value = apv.Values[0]
+				}
 			case *api.QueryParameterDate:
 				p.Name = apv.Name
 				p.Title = apv.Title

sqlanalytics/resource_query_test.go

@@ -156,6 +156,7 @@ func TestQueryUpdateWithParams(t *testing.T) {
 						Title: "Title for column 3",
 					},
 					Options: "e1\ne2",
+					Values:  []string{"e1"},
 					Multi: &api.QueryParameterMultipleValuesOptions{
 						Prefix:    "\"",
 						Suffix:    "\"",
@@ -168,6 +169,7 @@ func TestQueryUpdateWithParams(t *testing.T) {
 						Title: "Title for column 3 without multiple",
 					},
 					Options: "e1\ne2",
+					Values:  []string{"e1"},
 					Multi:   nil,
 				},
 				api.QueryParameterQuery{
@@ -176,6 +178,7 @@ func TestQueryUpdateWithParams(t *testing.T) {
 						Title: "Title for column 4",
 					},
 					QueryID: "abc",
+					Values:  []string{"e1"},
 					Multi: &api.QueryParameterMultipleValuesOptions{
 						Prefix:    "\"",
 						Suffix:    "\"",
@@ -188,6 +191,7 @@ func TestQueryUpdateWithParams(t *testing.T) {
 						Title: "Title for column 4 without multiple",
 					},
 					QueryID: "abc",
+					Values:  []string{"e1"},
 					Multi:   nil,
 				},
 				api.QueryParameterDate{
@@ -264,8 +268,8 @@ func TestQueryUpdateWithParams(t *testing.T) {
 				name = "3"
 				title = "Title for column 3"
 				enum {
-					value = ""
 					options = ["e1", "e2"]
+					values = ["e1"]
 					multiple {
 						prefix = "\""
 						suffix = "\""
@@ -278,17 +282,17 @@ func TestQueryUpdateWithParams(t *testing.T) {
 				name = "3"
 				title = "Title for column 3 without multiple"
 				enum {
-					value = ""
 					options = ["e1", "e2"]
+					value = "e1"
 				}
 			}
 
 			parameter {
 				name = "4"
 				title = "Title for column 4"
 				query {
-					value = ""
 					query_id = "abc"
+					values = ["e1"]
 					multiple {
 						prefix = "\""
 						suffix = "\""
@@ -301,13 +305,8 @@ func TestQueryUpdateWithParams(t *testing.T) {
 				name = "4"
 				title = "Title for column 4 without multiple"
 				query {
-					value = ""
 					query_id = "abc"
-					multiple {
-						prefix = "\""
-						suffix = "\""
-						separator = ","
-					}
+					value = "e1"
 				}
 			}