Mercurial > gemma
comparison 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 |
comparison
equal
deleted
inserted
replaced
4242:1458c9b0fdaa | 4243:d776110b4db0 |
---|---|
226 return nil | 226 return nil |
227 } | 227 } |
228 return &models.ImportTime{Time: when.UTC()} | 228 return &models.ImportTime{Time: when.UTC()} |
229 } | 229 } |
230 | 230 |
231 func listImports( | 231 func listImports(req *http.Request) (jr JSONResult, err error) { |
232 _ interface{}, | |
233 req *http.Request, | |
234 ) (jr JSONResult, err error) { | |
235 | 232 |
236 var list, before, after *filledStmt | 233 var list, before, after *filledStmt |
237 | 234 |
238 if list, before, after, err = buildFilters(req); err != nil { | 235 if list, before, after, err = buildFilters(req); err != nil { |
239 return | 236 return |
320 }, | 317 }, |
321 } | 318 } |
322 return | 319 return |
323 } | 320 } |
324 | 321 |
325 func importLogs( | 322 func importLogs(req *http.Request) (jr JSONResult, err error) { |
326 _ interface{}, | |
327 req *http.Request, | |
328 ) (jr JSONResult, err error) { | |
329 | 323 |
330 ctx := req.Context() | 324 ctx := req.Context() |
331 | 325 |
332 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) | 326 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) |
333 | 327 |
396 }, | 390 }, |
397 } | 391 } |
398 return | 392 return |
399 } | 393 } |
400 | 394 |
401 func deleteImport( | 395 func deleteImport(req *http.Request) (jr JSONResult, err error) { |
402 _ interface{}, | |
403 req *http.Request, | |
404 ) (jr JSONResult, err error) { | |
405 | 396 |
406 ctx := req.Context() | 397 ctx := req.Context() |
407 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) | 398 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) |
408 | 399 |
409 var tx *sql.Tx | 400 var tx *sql.Tx |
463 | 454 |
464 logDecisionSQL = ` | 455 logDecisionSQL = ` |
465 INSERT INTO import.import_logs (import_id, msg) VALUES ($1, $2)` | 456 INSERT INTO import.import_logs (import_id, msg) VALUES ($1, $2)` |
466 ) | 457 ) |
467 | 458 |
468 func reviewImports( | 459 func reviewImports(req *http.Request) (JSONResult, error) { |
469 reviews interface{}, | 460 |
470 req *http.Request, | 461 rs := *JSONInput(req).(*[]models.Review) |
471 ) (JSONResult, error) { | |
472 | |
473 rs := *reviews.(*[]models.Review) | |
474 | 462 |
475 type reviewResult struct { | 463 type reviewResult struct { |
476 ID int64 `json:"id"` | 464 ID int64 `json:"id"` |
477 Message string `json:"message,omitempty"` | 465 Message string `json:"message,omitempty"` |
478 Error string `json:"error,omitempty"` | 466 Error string `json:"error,omitempty"` |
497 } | 485 } |
498 | 486 |
499 return JSONResult{Result: results}, nil | 487 return JSONResult{Result: results}, nil |
500 } | 488 } |
501 | 489 |
502 func reviewImport( | 490 func reviewImport(req *http.Request) (jr JSONResult, err error) { |
503 _ interface{}, | |
504 req *http.Request, | |
505 ) (jr JSONResult, err error) { | |
506 | 491 |
507 vars := mux.Vars(req) | 492 vars := mux.Vars(req) |
508 id, _ := strconv.ParseInt(vars["id"], 10, 64) | 493 id, _ := strconv.ParseInt(vars["id"], 10, 64) |
509 state := vars["state"] | 494 state := vars["state"] |
510 | 495 |