scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-05 08:10:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

inverseEnabled check for bool type

Browse source
This commit is contained in:
Linh Vo 2017-04-20 22:11:01 -05:00
parent 9c02edc4e3
commit 9198dfab59
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
handler.go
View file

@ -250,7 +250,7 @@ func (p *postDBRequest) UnmarshalJSON(b []byte) error {
for k, v := range values {
switch k {
case "columnLabel":
p.Options.ColumnLabel = v
p.Options.ColumnLabel = v.(string)
}
}
default:
@ -260,24 +260,35 @@ func (p *postDBRequest) UnmarshalJSON(b []byte) error {
return nil
}
func validateOptions(data map[string]interface{}, field []string) (map[string]string, error) {
func validateOptions(data map[string]interface{}, field []string) (map[string]interface{}, error) {
options, ok := data["options"].(map[string]interface{})
optionValue := make(map[string]interface{})
if !ok {
return map[string]string{}, errors.New("options is not map[string]interface{}")
return nil, errors.New("options is not map[string]interface{}")
}
optionValue := make(map[string]string)
if len(options) == 0 {
optionValue = map[string]string{}
optionValue = nil
} else {
for k, v := range options {
if foundItem(field, k) {
val, ok := options[k].(string)
if !ok {
return map[string]string{}, fmt.Errorf("invalid option %v: {%v:%v}", field, k, v)
switch k {
case "inverseEnabled":
val, ok := options[k].(bool)
if !ok {
return nil, fmt.Errorf("invalid option type %v: {%v:%v}", field, k, v)
}
optionValue[k] = val
default:
val, ok := options[k].(string)
if !ok {
return nil, fmt.Errorf("invalid option %v: {%v:%v}", field, k, v)
}
optionValue[k] = val
}
optionValue[k] = val
} else {
return map[string]string{}, fmt.Errorf("invalid key for options {%v:%v}", k, v)
return nil, fmt.Errorf("invalid key for options {%v:%v}", k, v)
}
}
}
@ -494,15 +505,11 @@ func (p *postFrameRequest) UnmarshalJSON(b []byte) error {
for k, v := range values {
switch k {
case "rowLabel":
p.Options.RowLabel = v
p.Options.RowLabel = v.(string)
case "cacheType":
p.Options.CacheType = v
p.Options.CacheType = v.(string)
case "inverseEnabled":
inverse, err := strconv.ParseBool(v)
if err != nil {
continue
}
p.Options.InverseEnabled = inverse
p.Options.InverseEnabled = v.(bool)
}
}

6
handler_internal_test.go
View file

@ -54,9 +54,9 @@ func TestPostFrameRequestUnmarshalJSON(t *testing.T) {
{json: `{"option": {}}`, err: "Unknown key: {option:map[]}"},
{json: `{"options": {"rowLabel": "test"}}`, expected: postFrameRequest{Options: FrameOptions{RowLabel: "test"}}},
{json: `{"options": {"rowLabl": "test"}}`, err: "invalid key for options {rowLabl:test}"},
{json: `{"options": {"rowLabel": "test", "inverseEnabled": "true"}}`, expected: postFrameRequest{Options: FrameOptions{RowLabel: "test", InverseEnabled: true}}},
{json: `{"options": {"rowLabel": "test", "inverseEnabled": "true", "cacheType": "type"}}`, expected: postFrameRequest{Options: FrameOptions{RowLabel: "test", InverseEnabled: true, CacheType: "type"}}},
{json: `{"options": {"rowLabel": "test", "inverse": "true", "cacheType": "type"}}`, err: "invalid key for options {inverse:true}"},
{json: `{"options": {"rowLabel": "test", "inverseEnabled": true}}`, expected: postFrameRequest{Options: FrameOptions{RowLabel: "test", InverseEnabled: true}}},
{json: `{"options": {"rowLabel": "test", "inverseEnabled": true, "cacheType": "type"}}`, expected: postFrameRequest{Options: FrameOptions{RowLabel: "test", InverseEnabled: true, CacheType: "type"}}},
{json: `{"options": {"rowLabel": "test", "inverse": true, "cacheType": "type"}}`, err: "invalid key for options {inverse:true}"},
}
for _, test := range tests {
actual := &postFrameRequest{}