From 9d08139f4363d3503398002bc82cb3746e3438cf Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 23 Sep 2018 21:02:26 -0700 Subject: Improve request package and add more unit tests --- api/user.go | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'api/user.go') diff --git a/api/user.go b/api/user.go index 167fd72..b9274bb 100644 --- a/api/user.go +++ b/api/user.go @@ -63,12 +63,7 @@ func (c *Controller) UpdateUser(w http.ResponseWriter, r *http.Request) { return } - userID, err := request.IntParam(r, "userID") - if err != nil { - json.BadRequest(w, err) - return - } - + userID := request.RouteInt64Param(r, "userID") userChanges, err := decodeUserModificationPayload(r.Body) if err != nil { json.BadRequest(w, err) @@ -124,12 +119,7 @@ func (c *Controller) UserByID(w http.ResponseWriter, r *http.Request) { return } - userID, err := request.IntParam(r, "userID") - if err != nil { - json.BadRequest(w, err) - return - } - + userID := request.RouteInt64Param(r, "userID") user, err := c.store.UserByID(userID) if err != nil { json.BadRequest(w, errors.New("Unable to fetch this user from the database")) @@ -152,7 +142,7 @@ func (c *Controller) UserByUsername(w http.ResponseWriter, r *http.Request) { return } - username := request.Param(r, "username", "") + username := request.RouteStringParam(r, "username") user, err := c.store.UserByUsername(username) if err != nil { json.BadRequest(w, errors.New("Unable to fetch this user from the database")) @@ -174,12 +164,7 @@ func (c *Controller) RemoveUser(w http.ResponseWriter, r *http.Request) { return } - userID, err := request.IntParam(r, "userID") - if err != nil { - json.BadRequest(w, err) - return - } - + userID := request.RouteInt64Param(r, "userID") user, err := c.store.UserByID(userID) if err != nil { json.ServerError(w, err) -- cgit v1.2.3