fix some bug and some refactor

Author: lunny

models/action.go

@@ -718,6 +718,8 @@ type GetFeedsOptions struct {
 
 // GetFeeds returns actions according to the provided options
 func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
+	cond := builder.NewCond()
+
 	var repoIDs []int64
 	if opts.RequestedUser.IsOrganization() {
 		env, err := opts.RequestedUser.AccessibleReposEnv(opts.RequestingUserID)
@@ -727,12 +729,9 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 		if repoIDs, err = env.RepoIDs(1, opts.RequestedUser.NumRepos); err != nil {
 			return nil, fmt.Errorf("GetUserRepositories: %v", err)
 		}
-	}
 
-	actions := make([]*Action, 0, 20)
-	cond := builder.NewCond()
-	sess := x.Limit(20).
-		Desc("id")
+		cond = cond.And(builder.In("repo_id", repoIDs))
+	}
 
 	if opts.Collaborate {
 		cond = builder.Eq{"user_id": opts.RequestedUser.ID}.Or(
@@ -747,14 +746,11 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 	if !opts.IncludePrivate {
 		cond = cond.And(builder.Eq{"is_private": false})
 	}
-	if opts.RequestedUser.IsOrganization() {
-		cond = cond.And(builder.In("repo_id", repoIDs))
-	}
 
 	if !opts.IncludeDeleted {
 		cond = cond.And(builder.Eq{"is_deleted": false})
-
 	}
 
-	return actions, sess.Where(cond).Find(&actions)
+	actions := make([]*Action, 0, 20)
+	return actions, x.Limit(20).Desc("id").Where(cond).Find(&actions)
 }

models/repo_list.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/go-xorm/builder"
-	"github.com/go-xorm/xorm"
 )
 
 // RepositoryList contains a list of repositories
@@ -116,25 +115,21 @@ type SearchRepoOptions struct {
 // SearchRepositoryByName takes keyword and part of repository name to search,
 // it returns results in given range and number of total results.
 func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, count int64, err error) {
-	var (
-		sess *xorm.Session
-		cond = builder.NewCond()
-	)
-
-	opts.Keyword = strings.ToLower(opts.Keyword)
-
+	var cond = builder.NewCond()
 	if opts.Page <= 0 {
 		opts.Page = 1
 	}
 
-	repos = make([]*Repository, 0, opts.PageSize)
-
 	if opts.Starred && opts.OwnerID > 0 {
 		cond = builder.Eq{
 			"star.uid": opts.OwnerID,
 		}
 	}
-	cond = cond.And(builder.Like{"lower_name", opts.Keyword})
+
+	opts.Keyword = strings.ToLower(opts.Keyword)
+	if opts.Keyword != "" {
+		cond = cond.And(builder.Like{"lower_name", opts.Keyword})
+	}
 
 	// Append conditions
 	if !opts.Starred && opts.OwnerID > 0 {
@@ -158,48 +153,51 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 			ownerIds = append(ownerIds, org.ID)
 		}
 
-		cond = cond.Or(builder.And(builder.Like{"lower_name", opts.Keyword}, builder.In("owner_id", ownerIds)))
-
+		searcherReposCond := builder.In("owner_id", ownerIds)
 		if opts.Collaborate {
-			cond = cond.Or(builder.Expr(`id IN (SELECT repo_id FROM "access" WHERE access.user_id = ? AND owner_id != ?)`, opts.Searcher.ID, opts.Searcher.ID),
-				builder.And(builder.Like{"lower_name", opts.Keyword}, builder.Eq{"is_private": opts.Private}))
+			searcherReposCond = searcherReposCond.Or(builder.Expr(`id IN (SELECT repo_id FROM "access" WHERE access.user_id = ? AND owner_id != ?)`,
+				opts.Searcher.ID, opts.Searcher.ID))
 		}
+		cond = cond.And(searcherReposCond)
 	}
 
 	if len(opts.OrderBy) == 0 {
 		opts.OrderBy = "name ASC"
 	}
 
+	sess := x.NewSession()
+	defer sess.Close()
+
 	if opts.Starred && opts.OwnerID > 0 {
-		sess = x.
-			Join("INNER", "star", "star.repo_id = repository.id").
-			Where(cond)
-		count, err = x.
+		count, err = sess.
 			Join("INNER", "star", "star.repo_id = repository.id").
 			Where(cond).
 			Count(new(Repository))
 		if err != nil {
 			return nil, 0, fmt.Errorf("Count: %v", err)
 		}
+
+		sess.Join("INNER", "star", "star.repo_id = repository.id")
 	} else {
-		sess = x.Where(cond)
-		count, err = x.
+		count, err = sess.
 			Where(cond).
 			Count(new(Repository))
 		if err != nil {
 			return nil, 0, fmt.Errorf("Count: %v", err)
 		}
 	}
 
+	repos = make([]*Repository, 0, opts.PageSize)
 	if err = sess.
+		Where(cond).
 		Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).
 		OrderBy(opts.OrderBy).
 		Find(&repos); err != nil {
 		return nil, 0, fmt.Errorf("Repo: %v", err)
 	}
 
 	if !opts.IsProfile {
-		if err = repos.loadAttributes(x); err != nil {
+		if err = repos.loadAttributes(sess); err != nil {
 			return nil, 0, fmt.Errorf("LoadAttributes: %v", err)
 		}
 	}