Merge pull request #201 from ywk253100/search_api_modification_for_admin

Search api modification for admin
This commit is contained in:
Daniel Jiang 2016-05-11 12:04:27 +08:00
commit 5e12fd694d
3 changed files with 71 additions and 22 deletions

View File

@ -38,17 +38,36 @@ type searchResult struct {
} }
// Get ... // Get ...
func (n *SearchAPI) Get() { func (s *SearchAPI) Get() {
userID, ok := n.GetSession("userId").(int) userID, ok := s.GetSession("userId").(int)
if !ok { if !ok {
userID = dao.NonExistUserID userID = dao.NonExistUserID
} }
keyword := n.GetString("q")
projects, err := dao.QueryRelevantProjects(userID) keyword := s.GetString("q")
isSysAdmin, err := dao.IsAdminRole(userID)
if err != nil { if err != nil {
log.Errorf("Failed to get projects of user id: %d, error: %v", userID, err) log.Errorf("failed to check whether the user %d is system admin: %v", userID, err)
n.CustomAbort(http.StatusInternalServerError, "Failed to get project search result") s.CustomAbort(http.StatusInternalServerError, "internal error")
} }
var projects []models.Project
if isSysAdmin {
projects, err = dao.GetAllProjects()
if err != nil {
log.Errorf("failed to get all projects: %v", err)
s.CustomAbort(http.StatusInternalServerError, "internal error")
}
} else {
projects, err = dao.GetUserRelevantProjects(userID)
if err != nil {
log.Errorf("failed to get user %d 's relevant projects: %v", userID, err)
s.CustomAbort(http.StatusInternalServerError, "internal error")
}
}
projectSorter := &utils.ProjectSorter{Projects: projects} projectSorter := &utils.ProjectSorter{Projects: projects}
sort.Sort(projectSorter) sort.Sort(projectSorter)
projectResult := []map[string]interface{}{} projectResult := []map[string]interface{}{}
@ -69,17 +88,17 @@ func (n *SearchAPI) Get() {
repositories, err2 := svc_utils.GetRepoFromCache() repositories, err2 := svc_utils.GetRepoFromCache()
if err2 != nil { if err2 != nil {
log.Errorf("Failed to get repos from cache, error: %v", err2) log.Errorf("Failed to get repos from cache, error: %v", err2)
n.CustomAbort(http.StatusInternalServerError, "Failed to get repositories search result") s.CustomAbort(http.StatusInternalServerError, "Failed to get repositories search result")
} }
sort.Strings(repositories) sort.Strings(repositories)
repositoryResult := filterRepositories(repositories, projects, keyword) repositoryResult := filterRepositories(repositories, projects, keyword)
result := &searchResult{Project: projectResult, Repository: repositoryResult} result := &searchResult{Project: projectResult, Repository: repositoryResult}
n.Data["json"] = result s.Data["json"] = result
n.ServeJSON() s.ServeJSON()
} }
func filterRepositories(repositories []string, projects []models.Project, keyword string) []map[string]interface{} { func filterRepositories(repositories []string, projects []models.Project, keyword string) []map[string]interface{} {
var i, j int = 0, 0 i, j := 0, 0
result := []map[string]interface{}{} result := []map[string]interface{}{}
for i < len(repositories) && j < len(projects) { for i < len(repositories) && j < len(projects) {
r := &utils.Repository{Name: repositories[i]} r := &utils.Repository{Name: repositories[i]}

View File

@ -353,7 +353,7 @@ func TestChangeUserPasswordWithIncorrectOldPassword(t *testing.T) {
} }
func TestQueryRelevantProjectsWhenNoProjectAdded(t *testing.T) { func TestQueryRelevantProjectsWhenNoProjectAdded(t *testing.T) {
projects, err := QueryRelevantProjects(currentUser.UserID) projects, err := GetUserRelevantProjects(currentUser.UserID)
if err != nil { if err != nil {
t.Errorf("Error occurred in QueryRelevantProjects: %v", err) t.Errorf("Error occurred in QueryRelevantProjects: %v", err)
} }
@ -631,10 +631,10 @@ func TestProjectPermission(t *testing.T) {
} }
} }
func TestQueryRelevantProjects(t *testing.T) { func TestGetUserRelevantProjects(t *testing.T) {
projects, err := QueryRelevantProjects(currentUser.UserID) projects, err := GetUserRelevantProjects(currentUser.UserID)
if err != nil { if err != nil {
t.Errorf("Error occurred in QueryRelevantProjects: %v", err) t.Errorf("Error occurred in GetUserRelevantProjects: %v", err)
} }
if len(projects) != 2 { if len(projects) != 2 {
t.Errorf("Expected length of relevant projects is 2, but actual: %d, the projects: %+v", len(projects), projects) t.Errorf("Expected length of relevant projects is 2, but actual: %d, the projects: %+v", len(projects), projects)
@ -644,6 +644,19 @@ func TestQueryRelevantProjects(t *testing.T) {
} }
} }
func TestGetAllProjects(t *testing.T) {
projects, err := GetAllProjects()
if err != nil {
t.Errorf("Error occurred in GetAllProjects: %v", err)
}
if len(projects) != 2 {
t.Errorf("Expected length of projects is 2, but actual: %d, the projects: %+v", len(projects), projects)
}
if projects[1].Name != projectName {
t.Errorf("Expected project name in the list: %s, actual: %s", projectName, projects[1].Name)
}
}
func TestAddProjectMember(t *testing.T) { func TestAddProjectMember(t *testing.T) {
err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER) err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER)
if err != nil { if err != nil {

View File

@ -208,18 +208,35 @@ func ToggleProjectPublicity(projectID int64, publicity int) error {
return err return err
} }
// QueryRelevantProjects returns all projects that the user is a member of. // GetUserRelevantProjects returns a project list,
func QueryRelevantProjects(userID int) ([]models.Project, error) { // which satisfies the following conditions:
// 1. the project is not deleted
// 2. the prject is public or the user is a member of the project
func GetUserRelevantProjects(userID int) ([]models.Project, error) {
o := orm.NewOrm() o := orm.NewOrm()
sql := `select distinct p.project_id, p.name, p.public sql := `select distinct p.project_id, p.name, p.public
from project p from project p
left join project_member pm on p.project_id = pm.project_id left join project_member pm on p.project_id = pm.project_id
left join user u on u.user_id = pm.user_id where (pm.user_id = ? or p.public = 1) and p.deleted = 0`
where u.user_id = ? or p.public = 1 and p.deleted = 0`
var res []models.Project var projects []models.Project
_, err := o.Raw(sql, userID).QueryRows(&res)
if err != nil { if _, err := o.Raw(sql, userID).QueryRows(&projects); err != nil {
return nil, err return nil, err
} }
return res, err
return projects, nil
}
// GetAllProjects returns all projects which are not deleted
func GetAllProjects() ([]models.Project, error) {
o := orm.NewOrm()
sql := `select project_id, name, public
from project
where deleted = 0`
var projects []models.Project
if _, err := o.Raw(sql).QueryRows(&projects); err != nil {
return nil, err
}
return projects, nil
} }