From 8459fcf7dc7bc3fc4f6c619f5d39b44c57893c0a Mon Sep 17 00:00:00 2001 From: shixi_weimeng Date: Mon, 6 Jun 2016 23:07:17 +0800 Subject: [PATCH] change code for review --- api/user.go | 16 ++++++++-------- models/toprepo.go | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/user.go b/api/user.go index 35bb7bcbff..1e37448546 100644 --- a/api/user.go +++ b/api/user.go @@ -147,6 +147,14 @@ func (ua *UserAPI) Put() { ua.CustomAbort(http.StatusForbidden, "Guests can only change their own account.") } } + user := models.User{UserID: ua.userID} + ua.DecodeJSONReq(&user) + err = commonValidate(user) + if err != nil { + log.Warning("Bad request in change user profile: %v", err) + ua.RenderError(http.StatusBadRequest, "change user profile error:"+err.Error()) + return + } userQuery := models.User{UserID: ua.userID} u, err := dao.GetUser(userQuery) if err != nil { @@ -157,14 +165,6 @@ func (ua *UserAPI) Put() { log.Errorf("User with Id: %d does not exist", ua.userID) ua.CustomAbort(http.StatusNotFound, "") } - user := models.User{UserID: ua.userID} - ua.DecodeJSONReq(&user) - err = commonValidate(user) - if err != nil { - log.Warning("Bad request in change user profile: %v", err) - ua.RenderError(http.StatusBadRequest, "change user profile error:"+err.Error()) - return - } if u.Email != user.Email { emailExist, err := dao.UserExists(user, "email") if err != nil { diff --git a/models/toprepo.go b/models/toprepo.go index be796c2295..14bcffa662 100644 --- a/models/toprepo.go +++ b/models/toprepo.go @@ -17,6 +17,6 @@ package models // TopRepo holds information about repository that accessed most type TopRepo struct { - RepoName string `json:"reponame"` - AccessCount int64 `json:"accesscount"` + RepoName string `json:"name"` + AccessCount int64 `json:"count"` }