noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify REST errors

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-05-23 15:20:36 +01:00
parent 6dc0f90e98
commit 2bf8471712
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web/routes.go
View file

@ -23,14 +23,12 @@ func output(c *fibre.Context, res interface{}) error {
switch ret := res.(*db.Response); ret.Status { switch ret := res.(*db.Response); ret.Status {
case "OK": case "OK":
return c.Send(200, ret.Result) return c.Send(200, ret.Result)
case "ERR_CODE": case "ERR_DB":
return c.Send(500, oops(500, ret.Detail)) return fibre.NewHTTPError(500)
case "ERR_JSON":
return fibre.NewHTTPError(422)
case "ERR_EXISTS": case "ERR_EXISTS":
return fibre.NewHTTPError(409) return fibre.NewHTTPError(409)
default: default:
return fibre.NewHTTPError(500) return fibre.NewHTTPError(400)
} }
} }
@ -51,7 +49,12 @@ func routes(s *fibre.Fibre) {
s.Post("/sql", func(c *fibre.Context) error { s.Post("/sql", func(c *fibre.Context) error {
res, err := db.Execute(c, c.Request().Body) res, err := db.Execute(c, c.Request().Body)
if err != nil { if err != nil {
return fibre.NewHTTPError(400) return c.Send(400, map[string]interface{}{
"code": 400,
"details": "Request problems detected",
"documentation": "https://docs.surreal.io/",
"information": err.Error(),
})
} }
return c.Send(200, res) return c.Send(200, res)
}) })