change code for review

api/user.go

@@ -147,23 +147,35 @@ func (ua *UserAPI) Put() {
 			ua.CustomAbort(http.StatusForbidden, "Guests can only change their own account.")
 		}
 	}
+	userQuery := models.User{UserID: ua.userID}
+	u, err := dao.GetUser(userQuery)
+	if err != nil {
+		log.Errorf("Error occurred in GetUser, error: %v", err)
+		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
+	}
+	if u == nil {
+		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)
+	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
 	}
-	emailExist, err := dao.UserExists(user, "email")
+	if u.Email != user.Email {
-	if err != nil {
+		emailExist, err := dao.UserExists(user, "email")
-		log.Errorf("Error occurred in change user profile: %v", err)
+		if err != nil {
-		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
+			log.Errorf("Error occurred in change user profile: %v", err)
-	}
+			ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
-	if emailExist {
+		}
-		log.Warning("email has already been used!")
+		if emailExist {
-		ua.RenderError(http.StatusConflict, "email has already been used!")
+			log.Warning("email has already been used!")
-		return
+			ua.RenderError(http.StatusConflict, "email has already been used!")
+			return
+		}
 	}
 	if err := dao.ChangeUserProfile(user); err != nil {
 		log.Errorf("Failed to update user profile, error: %v", err)
@@ -289,11 +301,12 @@ func (ua *UserAPI) ToggleUserAdminRole() {
 	}
 	userQuery := models.User{UserID: ua.userID}
 	ua.DecodeJSONReq(&userQuery)
-	if err := dao.ToggleUserAdminRole(userQuery.UserID,userQuery.HasAdminRole); err != nil {
+	if err := dao.ToggleUserAdminRole(userQuery.UserID, userQuery.HasAdminRole); err != nil {
 		log.Errorf("Error occurred in ToggleUserAdminRole: %v", err)
 		ua.CustomAbort(http.StatusInternalServerError, "Internal error.")
 	}
 }
+
 // validate only validate when user register
 func validate(user models.User) error {
 

dao/accesslog.go

@@ -17,7 +17,7 @@ package dao
 
 import (
 	"strings"
-	"github.com/astaxie/beego/orm"
+
 	"github.com/vmware/harbor/models"
 	"github.com/vmware/harbor/utils/log"
 )
@@ -147,15 +147,15 @@ func GetRecentLogs(userID, linesNum int, startTime, endTime string) ([]models.Ac
 }
 
 //GetTopRepos return top  accessed public repos
-func GetTopRepos(countNum int) ([]orm.ParamsList, error) {
+func GetTopRepos(countNum int) ([]models.TopRepo, error) {
 
 	o := GetOrmer()
 
-	sql := "select log_id, access_log.user_id, access_log.project_id, repo_name, repo_tag, GUID, operation, op_time, COUNT(repo_name) as access_count from access_log left join project on access_log.project_id=project.project_id where project.public=1 and (access_log.operation = 'push' or access_log.operation = 'pull') group by repo_name order by access_count desc limit ? "
+	sql := "select repo_name, COUNT(repo_name) as access_count from access_log left join project on access_log.project_id=project.project_id where project.public = 1 and access_log.operation = 'pull' group by repo_name order by access_count desc limit ? "
 	queryParam := make([]interface{}, 1)
 	queryParam = append(queryParam, countNum)
-	var lists []orm.ParamsList
+	var lists []models.TopRepo
-	_, err := o.Raw(sql, queryParam).ValuesList(&lists)
+	_, err := o.Raw(sql, queryParam).QueryRows(&lists)
 	if err != nil {
 		return nil, err
 	}

models/toprepo.go

@@ -0,0 +1,22 @@
+/*
+   Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package models
+
+// TopRepo holds information about repository that accessed most
+type TopRepo struct {
+	RepoName    string `json:"reponame"`
+	AccessCount int64  `json:"accesscount"`
+}