Add collaborative repositories to the dashboard (#2205)

* Add collaborative repositories to the dashboard

Remove some unused code from the Dashboard func

* fix some bug and some refactor

* fix tests

1 files changed, 30 insertions, 26 deletions

diff --git a/models/repo_list.go b/models/repo_list.go
index 2158cfe676..905408ae6b 100644
--- a/models/repo_list.go
+++ b/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
@@ -98,13 +97,14 @@ type SearchRepoOptions struct {
 	// Owner in we search search
 	//
 	// in: query
-	OwnerID   int64  `json:"uid"`
-	Searcher  *User  `json:"-"` //ID of the person who's seeking
-	OrderBy   string `json:"-"`
-	Private   bool   `json:"-"` // Include private repositories in results
-	Starred   bool   `json:"-"`
-	Page      int    `json:"-"`
-	IsProfile bool   `json:"-"`
+	OwnerID     int64  `json:"uid"`
+	Searcher    *User  `json:"-"` //ID of the person who's seeking
+	OrderBy     string `json:"-"`
+	Private     bool   `json:"-"` // Include private repositories in results
+	Collaborate bool   `json:"-"` // Include collaborative repositories
+	Starred     bool   `json:"-"`
+	Page        int    `json:"-"`
+	IsProfile   bool   `json:"-"`
 	// Limit of result
 	//
 	// maximum: setting.ExplorePagingNum
@@ -115,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 {
@@ -157,27 +153,33 @@ 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 {
+			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 {
@@ -185,7 +187,9 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 		}
 	}
 
+	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 {
@@ -193,7 +197,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 	}
 
 	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)
 		}
 	}