Mercurial > gemma
diff pkg/controllers/srimports.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 | 6237e6165041 |
line wrap: on
line diff
--- a/pkg/controllers/srimports.go Thu Aug 22 10:54:08 2019 +0200 +++ b/pkg/controllers/srimports.go Thu Aug 22 11:26:48 2019 +0200 @@ -34,6 +34,8 @@ "gemma.intevation.de/gemma/pkg/imports" "gemma.intevation.de/gemma/pkg/misc" "gemma.intevation.de/gemma/pkg/models" + + mw "gemma.intevation.de/gemma/pkg/middleware" ) const ( @@ -176,7 +178,7 @@ }{ ID: jobID, } - SendJSON(rw, http.StatusCreated, &result) + mw.SendJSON(rw, http.StatusCreated, &result) } func loadMeta(f *zip.File) (*models.SoundingResultMeta, error) { @@ -189,7 +191,7 @@ return &m, m.Decode(r) } -func uploadSoundingResult(req *http.Request) (jr JSONResult, err error) { +func uploadSoundingResult(req *http.Request) (jr mw.JSONResult, err error) { var dir string if dir, err = misc.StoreUploadedFile( @@ -243,7 +245,7 @@ messages = append(messages, fmt.Sprintf("'meta.json' found but invalid: %v", err)) } else { - errs := meta.Validate(req.Context(), JSONConn(req)) + errs := meta.Validate(req.Context(), mw.JSONConn(req)) for _, err := range errs { messages = append(messages, fmt.Sprintf("invalid 'meta.json': %v", err)) @@ -274,7 +276,7 @@ result.Messages = messages - jr = JSONResult{ + jr = mw.JSONResult{ Code: code, Result: &result, } @@ -296,5 +298,5 @@ }{ Message: fmt.Sprintf("Token %s deleted.", token), } - SendJSON(rw, http.StatusOK, &result) + mw.SendJSON(rw, http.StatusOK, &result) }