Mercurial > gemma
changeset 5575:6709530f002e surveysperbottleneckid
surveys endpoint: enforce query parameters. Get rid of unnecessary else-clause
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Wed, 21 Jul 2021 15:14:40 +0200 |
| parents | 271888ef85bc |
| children | 2b862190aee4 |
| files | pkg/controllers/routes.go pkg/controllers/surveys.go |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/routes.go Wed Jul 21 14:33:35 2021 +0200 +++ b/pkg/controllers/routes.go Wed Jul 21 15:14:40 2021 +0200 @@ -179,7 +179,11 @@ // Survey selection api.Handle("/surveys", any(&mw.JSONHandler{ Handle: listSurveys, - })).Methods(http.MethodGet) + })).Methods(http.MethodGet).Queries("id", "{id}") + + api.Handle("/surveys", any(&mw.JSONHandler{ + Handle: listSurveys, + })).Methods(http.MethodGet).Queries("name", "{name}", "date", "{date}") // difference calculation api.Handle("/diff", any(&mw.JSONHandler{
--- a/pkg/controllers/surveys.go Wed Jul 21 14:33:35 2021 +0200 +++ b/pkg/controllers/surveys.go Wed Jul 21 15:14:40 2021 +0200 @@ -73,13 +73,6 @@ rows, err = mw.JSONConn(req).QueryContext(req.Context(), listSurveysByIdSQL, id) } else if date != "" && bottleneckName != "" && id == "" { rows, err = mw.JSONConn(req).QueryContext(req.Context(), listSurveysByNameDateSQL, bottleneckName, date) - } else { - jr = mw.JSONResult{ - Result: struct { - Surveys []*models.Survey `json:"surveys"` - }{surveys}, - } - return } if err != nil { return