Mercurial > gemma
diff pkg/controllers/surveys.go @ 4244:4394daeea96a json-handler-middleware
Moved JSONHandler into middleware package.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 22 Aug 2019 11:26:48 +0200 |
| parents | d776110b4db0 |
| children | fc082c611b8b |
line wrap: on
line diff
--- a/pkg/controllers/surveys.go Thu Aug 22 10:54:08 2019 +0200 +++ b/pkg/controllers/surveys.go Thu Aug 22 11:26:48 2019 +0200 @@ -19,8 +19,11 @@ "database/sql" "net/http" + "github.com/gorilla/mux" + "gemma.intevation.de/gemma/pkg/models" - "github.com/gorilla/mux" + + mw "gemma.intevation.de/gemma/pkg/middleware" ) const ( @@ -41,13 +44,13 @@ WHERE b.objnam = $1 AND s.date_info::timestamptz <@ b.validity` ) -func listSurveys(req *http.Request) (jr JSONResult, err error) { +func listSurveys(req *http.Request) (jr mw.JSONResult, err error) { bottleneckName := mux.Vars(req)["bottleneck"] var rows *sql.Rows - rows, err = JSONConn(req).QueryContext(req.Context(), listSurveysSQL, bottleneckName) + rows, err = mw.JSONConn(req).QueryContext(req.Context(), listSurveysSQL, bottleneckName) if err != nil { return } @@ -80,7 +83,7 @@ return } - jr = JSONResult{ + jr = mw.JSONResult{ Result: struct { Surveys []*models.Survey `json:"surveys"` }{surveys},