scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-06 16:45:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revise unmarshalJSON

Browse source
This commit is contained in:
Linh Vo 2017-04-05 10:50:56 -05:00
parent 1be7a42d14
commit 22475df035
2 changed files with 75 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
handler.go
View file

@ -350,28 +350,50 @@ func (p *postDBRequest) UnmarshalJSON(b []byte) error {
if err := json.Unmarshal(b, &data); err != nil {
return err
}
f := func(key string, m map[string]interface{}) bool { _, ok := m[key]; return ok }
if !f("db", data) {
return errors.New("db required")
}
p.DB = data["db"].(string)
if f("options", data) {
options := data["options"].(map[string]interface{})
if len(options) == 0 {
return nil
} else if f("columnLabel", options) {
err := ValidateName(options["columnLabel"].(string))
if err != nil {
return errors.New("invalid columnLabel")
for key, value := range data {
switch key {
case "db":
if val, ok := data["db"].(string); !ok {
return errors.New("db required and must be a string")
} else {
p.DB = val
}
p.Options = DBOptions{ColumnLabel: options["columnLabel"].(string)}
} else {
return errors.New("columnLabel required")
case "options":
options, ok := data["options"].(map[string]interface{})
if !ok {
return errors.New("options is not map[string]interface{}")
}
if len(options) == 0 {
return nil
}
err := validateOptions(options, "columnLabel")
if err != nil {
return err
} else {
p.Options = DBOptions{ColumnLabel: options["columnLabel"].(string)}
}
default:
return fmt.Errorf("Unknown key: %v:%v", key, value)
}
}
return nil
}
} else if len(data) > 1 {
return errors.New("options required")
func validateOptions(options map[string]interface{}, field string) error {
for k, v := range options {
switch k {
case field:
if colValue, ok := options[field].(string); !ok {
return fmt.Errorf("invalid option %v: {%v:%v}", field, k, v)
} else {
err := ValidateName(colValue)
if err != nil {
return fmt.Errorf("invalid %v value: %v", field, v)
}
}
default:
return fmt.Errorf("invalid key for options {%v:%v}", k, v)
}
}
return nil
}
@ -547,35 +569,41 @@ func (p *postFrameRequest) UnmarshalJSON(b []byte) error {
if err := json.Unmarshal(b, &data); err != nil {
return err
}
f := func(key string, m map[string]interface{}) bool { _, ok := m[key]; return ok }
if !f("db", data) {
return errors.New("db required")
}
p.DB = data["db"].(string)
if !f("frame", data) {
return errors.New("frame required")
}
p.Frame = data["frame"].(string)
if f("options", data) {
options := data["options"].(map[string]interface{})
if len(options) == 0 {
return nil
} else if f("rowLabel", options) {
err := ValidateName(options["rowLabel"].(string))
if err != nil {
return errors.New("invalid rowLabel")
for key, value := range data {
switch key {
case "db":
if val, ok := data["db"].(string); !ok {
return errors.New("db required and must be a string")
} else {
p.DB = val
}
case "frame":
if val, ok := data["frame"].(string); !ok {
return errors.New("frame required and must be a string")
} else {
p.Frame = val
}
p.Options = FrameOptions{RowLabel: options["rowLabel"].(string)}
} else {
return errors.New("rowLabel required")
}
} else if len(data) > 2 {
return errors.New("options required")
case "options":
options, ok := data["options"].(map[string]interface{})
if !ok {
return errors.New("options is not map[string]interface{}")
}
if len(options) == 0 {
return nil
}
err := validateOptions(options, "rowLabel")
if err != nil {
return err
} else {
p.Options = FrameOptions{RowLabel: options["rowLabel"].(string)}
}
default:
return fmt.Errorf("Unknown key: {%v:%v}", key, value)
}
}
return nil
}
type postFrameRequest struct {

6
handler_test.go
View file

@ -889,7 +889,7 @@ func TestHandler_DB_Options(t *testing.T) {
t.Fatalf("unexpected status: %d", resp.StatusCode)
} else if buf, err := ioutil.ReadAll(resp.Body); err != nil {
t.Fatal(err)
} else if string(buf) != "options required"+"\n" {
} else if string(buf) != "Unknown key: columnLabel:location"+"\n" {
t.Fatalf("unexpected response body: %s", buf)
}
@ -919,7 +919,7 @@ func TestHandler_Frame_Options(t *testing.T) {
t.Fatalf("unexpected status: %d", resp.StatusCode)
} else if buf, err := ioutil.ReadAll(resp.Body); err != nil {
t.Fatal(err)
} else if string(buf) != "rowLabel required"+"\n" {
} else if string(buf) != "invalid key for options {columnLabel:location}"+"\n" {
t.Fatalf("unexpected response body: %s", buf)
}
}
@ -948,7 +948,7 @@ func TestHandler_OptionsValue(t *testing.T) {
t.Fatalf("unexpected status: %d", resp.StatusCode)
} else if buf, err := ioutil.ReadAll(resp.Body); err != nil {
t.Fatal(err)
} else if string(buf) != "invalid rowLabel"+"\n" {
} else if string(buf) != "invalid rowLabel value: ///"+"\n" {
t.Fatalf("unexpected response body: %s", buf)
}
}