Mercurial > gemma
diff pkg/controllers/importqueue.go @ 4243:d776110b4db0 json-handler-middleware
Made the de-serialized input of the JSON handler accessible via the context of the request.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 22 Aug 2019 10:54:08 +0200 |
| parents | 1458c9b0fdaa |
| children | 4394daeea96a |
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go Thu Aug 22 10:18:13 2019 +0200 +++ b/pkg/controllers/importqueue.go Thu Aug 22 10:54:08 2019 +0200 @@ -228,10 +228,7 @@ return &models.ImportTime{Time: when.UTC()} } -func listImports( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func listImports(req *http.Request) (jr JSONResult, err error) { var list, before, after *filledStmt @@ -322,10 +319,7 @@ return } -func importLogs( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func importLogs(req *http.Request) (jr JSONResult, err error) { ctx := req.Context() @@ -398,10 +392,7 @@ return } -func deleteImport( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func deleteImport(req *http.Request) (jr JSONResult, err error) { ctx := req.Context() id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) @@ -465,12 +456,9 @@ INSERT INTO import.import_logs (import_id, msg) VALUES ($1, $2)` ) -func reviewImports( - reviews interface{}, - req *http.Request, -) (JSONResult, error) { +func reviewImports(req *http.Request) (JSONResult, error) { - rs := *reviews.(*[]models.Review) + rs := *JSONInput(req).(*[]models.Review) type reviewResult struct { ID int64 `json:"id"` @@ -499,10 +487,7 @@ return JSONResult{Result: results}, nil } -func reviewImport( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func reviewImport(req *http.Request) (jr JSONResult, err error) { vars := mux.Vars(req) id, _ := strconv.ParseInt(vars["id"], 10, 64)