Mercurial > gemma
comparison controllers/user.go @ 257:dfc2b035e055
Slimming down the signature of the JSONHandler type to
not take the http.ResponseWriter.
Idea of this handler is to simply transform JSON to JSON.
The input is already parsed. The output is generated from
JSONResult. So there is no need to pass the ResponseWriter
to the handler function.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 27 Jul 2018 13:03:56 +0200 |
parents | de6fdb316b8f |
children | ab9859981ee3 |
comparison
equal
deleted
inserted
replaced
254:de6fdb316b8f | 257:dfc2b035e055 |
---|---|
181 } | 181 } |
182 return errNoValidRole | 182 return errNoValidRole |
183 } | 183 } |
184 | 184 |
185 func deleteUser( | 185 func deleteUser( |
186 rw http.ResponseWriter, req *http.Request, | 186 input interface{}, req *http.Request, |
187 input interface{}, db *sql.DB, | 187 db *sql.DB, |
188 ) (jr JSONResult, err error) { | 188 ) (jr JSONResult, err error) { |
189 | 189 |
190 user := mux.Vars(req)["user"] | 190 user := mux.Vars(req)["user"] |
191 if user == "" { | 191 if user == "" { |
192 err = JSONError{http.StatusBadRequest, "error: user empty"} | 192 err = JSONError{http.StatusBadRequest, "error: user empty"} |
209 jr = JSONResult{Code: http.StatusNoContent} | 209 jr = JSONResult{Code: http.StatusNoContent} |
210 return | 210 return |
211 } | 211 } |
212 | 212 |
213 func updateUser( | 213 func updateUser( |
214 rw http.ResponseWriter, req *http.Request, | 214 input interface{}, req *http.Request, |
215 input interface{}, db *sql.DB, | 215 db *sql.DB, |
216 ) (jr JSONResult, err error) { | 216 ) (jr JSONResult, err error) { |
217 | 217 |
218 user := mux.Vars(req)["user"] | 218 user := mux.Vars(req)["user"] |
219 if user == "" { | 219 if user == "" { |
220 err = JSONError{http.StatusBadRequest, "error: user empty"} | 220 err = JSONError{http.StatusBadRequest, "error: user empty"} |
261 } | 261 } |
262 return | 262 return |
263 } | 263 } |
264 | 264 |
265 func createUser( | 265 func createUser( |
266 rw http.ResponseWriter, req *http.Request, | 266 input interface{}, req *http.Request, |
267 input interface{}, db *sql.DB, | 267 db *sql.DB, |
268 ) (jr JSONResult, err error) { | 268 ) (jr JSONResult, err error) { |
269 | 269 |
270 user := input.(*User) | 270 user := input.(*User) |
271 | 271 |
272 if user.Extent == nil { | 272 if user.Extent == nil { |
305 } | 305 } |
306 return | 306 return |
307 } | 307 } |
308 | 308 |
309 func listUsers( | 309 func listUsers( |
310 rw http.ResponseWriter, req *http.Request, | 310 input interface{}, req *http.Request, |
311 input interface{}, db *sql.DB, | 311 db *sql.DB, |
312 ) (jr JSONResult, err error) { | 312 ) (jr JSONResult, err error) { |
313 | 313 |
314 var rows *sql.Rows | 314 var rows *sql.Rows |
315 | 315 |
316 rows, err = db.Query(listUsersSQL) | 316 rows, err = db.Query(listUsersSQL) |
345 } | 345 } |
346 return | 346 return |
347 } | 347 } |
348 | 348 |
349 func listUser( | 349 func listUser( |
350 rw http.ResponseWriter, req *http.Request, | 350 input interface{}, req *http.Request, |
351 input interface{}, db *sql.DB, | 351 db *sql.DB, |
352 ) (jr JSONResult, err error) { | 352 ) (jr JSONResult, err error) { |
353 | 353 |
354 user := mux.Vars(req)["user"] | 354 user := mux.Vars(req)["user"] |
355 if user == "" { | 355 if user == "" { |
356 err = JSONError{http.StatusBadRequest, "error: user empty"} | 356 err = JSONError{http.StatusBadRequest, "error: user empty"} |