New API routes added

Author: shashvat-kedia

models/user.go

@@ -1360,6 +1360,16 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) {
 		Find(&users)
 }
 
+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)
+	}
+	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
 func GetStarredRepos(userID int64, private bool) ([]*Repository, error) {
 	sess := x.Where("star.uid=?", userID).

routers/api/v1/admin/org.go

@@ -66,3 +66,20 @@ func CreateOrg(ctx *context.APIContext, form api.CreateOrgOption) {
 
 	ctx.JSON(201, convert.ToOrganization(org))
 }
+
+func GetAllOrgs(ctx *context.APIContext){
+	users,_,err := models.SearchUsersAPI(&models.SearchUserOptions{
+		Type:  models.UserTypeOrganization,
+		OrderBy: models.SearchOrderByAlphabetically,
+		Keyword: "",
+	})
+	if err != nil{
+		ctx.Error(500,"SearchOrganizations",err)
+		return
+	}
+	orgs := make([]*api.Organization,len(users))
+	for i := range users{
+		orgs[i] = convert.ToOrganization(users[i])
+	}
+	ctx.JSON(200,&orgs)
+}

routers/api/v1/admin/user.go

@@ -291,3 +291,16 @@ func DeleteUserPublicKey(ctx *context.APIContext) {
 
 	ctx.Status(204)
 }
+
+func GetAllUsers(ctx *context.APIContext){
+	users,_,err := models.SearchUsersAPI(&models.SearchUserOptions{
+		Type: models.UserTypeIndividual,
+		OrderBy: models.SearchOrderByAlphabetically,
+		Keyword: "",
+	})
+	if err != nil {
+		ctx.Error(500,"SearchUsers",err)
+		return
+	}
+	ctx.JSON(200,&users)
+}

routers/api/v1/api.go

@@ -667,7 +667,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 		})
 
 		m.Group("/admin", func() {
+			m.Get("/orgs",admin.GetAllOrgs)
 			m.Group("/users", func() {
+				m.Get("",admin.GetAllUsers)
 				m.Post("", bind(api.CreateUserOption{}), admin.CreateUser)
 				m.Group("/:username", func() {
 					m.Combo("").Patch(bind(api.EditUserOption{}), admin.EditUser).
@@ -676,6 +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.Post("/orgs", bind(api.CreateOrgOption{}), admin.CreateOrg)
 					m.Post("/repos", bind(api.CreateRepoOption{}), admin.CreateRepo)
 				})