Build fix

Author: shashvat-kedia

models/user.go

@@ -1362,14 +1362,14 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) {
 
 //SearchUsersAPI takes options i.e keyword and part of user name to search
 //it returns all the results found and the number of total results.
-func SearchUsersAPI(opts *SearchUserOptions) (users []*User,_ int64,_ error){
+func SearchUsersAPI(opts *SearchUserOptions) (users []*User, _ int64, _ error) {
 	cond := opts.toConds()
-	count,err := x.Where(cond).Count(new(User))
-	if err!=nil{
-		return nil,0,fmt.Errorf("Count: %v",err)
+	count, err := x.Where(cond).Count(new(User))
+	if err != nil {
+		return nil, 0, fmt.Errorf("Count: %v", err)
 	}
-	users = make([]*User,0,count)
-	return users,count,x.Where(cond).OrderBy(opts.OrderBy.String()).Find(&users)
+	users = make([]*User, 0, count)
+	return users, count, x.Where(cond).OrderBy(opts.OrderBy.String()).Find(&users)
 }
 
 // GetStarredRepos returns the repos starred by a particular user

routers/api/v1/admin/org.go

@@ -68,7 +68,7 @@ func CreateOrg(ctx *context.APIContext, form api.CreateOrgOption) {
 }
 
 //GetAllOrgs API for getting information of all the organizations
-func GetAllOrgs(ctx *context.APIContext){
+func GetAllOrgs(ctx *context.APIContext) {
 	// swagger:operation GET /admin/orgs admin adminGetAllOrgs
 	// ---
 	// summary: List all organizations
@@ -79,18 +79,18 @@ func GetAllOrgs(ctx *context.APIContext){
 	//     "$ref": "#/responses/OrganizationList"
 	//   "403":
 	//     "$ref": "#/responses/forbidden"
-	users,_,err := models.SearchUsersAPI(&models.SearchUserOptions{
-		Type:  models.UserTypeOrganization,
+	users, _, err := models.SearchUsersAPI(&models.SearchUserOptions{
+		Type:    models.UserTypeOrganization,
 		OrderBy: models.SearchOrderByAlphabetically,
 		Keyword: "",
 	})
-	if err != nil{
-		ctx.Error(500,"SearchOrganizations",err)
+	if err != nil {
+		ctx.Error(500, "SearchOrganizations", err)
 		return
 	}
-	orgs := make([]*api.Organization,len(users))
-	for i := range users{
+	orgs := make([]*api.Organization, len(users))
+	for i := range users {
 		orgs[i] = convert.ToOrganization(users[i])
 	}
-	ctx.JSON(200,&orgs)
+	ctx.JSON(200, &orgs)
 }

routers/api/v1/admin/user.go

@@ -293,7 +293,7 @@ func DeleteUserPublicKey(ctx *context.APIContext) {
 }
 
 //GetAllUsers API for getting information of all the users
-func GetAllUsers(ctx *context.APIContext){
+func GetAllUsers(ctx *context.APIContext) {
 	// swagger:operation GET /admin/users admin adminGetAllUsers
 	// ---
 	// summary: List all organizations
@@ -304,14 +304,14 @@ func GetAllUsers(ctx *context.APIContext){
 	//     "$ref": "#/responses/UserList"
 	//   "403":
 	//     "$ref": "#/responses/forbidden"
-	users,_,err := models.SearchUsersAPI(&models.SearchUserOptions{
-		Type: models.UserTypeIndividual,
+	users, _, err := models.SearchUsersAPI(&models.SearchUserOptions{
+		Type:    models.UserTypeIndividual,
 		OrderBy: models.SearchOrderByAlphabetically,
 		Keyword: "",
 	})
 	if err != nil {
-		ctx.Error(500,"SearchUsers",err)
+		ctx.Error(500, "SearchUsers", err)
 		return
 	}
-	ctx.JSON(200,&users)
+	ctx.JSON(200, &users)
 }

routers/api/v1/api.go

@@ -667,9 +667,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 		})
 
 		m.Group("/admin", func() {
-			m.Get("/orgs",admin.GetAllOrgs)
+			m.Get("/orgs", admin.GetAllOrgs)
 			m.Group("/users", func() {
-				m.Get("",admin.GetAllUsers)
+				m.Get("", admin.GetAllUsers)
 				m.Post("", bind(api.CreateUserOption{}), admin.CreateUser)
 				m.Group("/:username", func() {
 					m.Combo("").Patch(bind(api.EditUserOption{}), admin.EditUser).
@@ -678,7 +678,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 						m.Post("", bind(api.CreateKeyOption{}), admin.CreatePublicKey)
 						m.Delete("/:id", admin.DeleteUserPublicKey)
 					})
-					m.Get("/orgs",org.ListUserOrgs)
+					m.Get("/orgs", org.ListUserOrgs)
 					m.Post("/orgs", bind(api.CreateOrgOption{}), admin.CreateOrg)
 					m.Post("/repos", bind(api.CreateRepoOption{}), admin.CreateRepo)
 				})