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

Author: Bwko

models/action.go

@@ -15,6 +15,7 @@ import (
 	"unicode"
 
 	"github.com/Unknwon/com"
+	"github.com/go-xorm/builder"
 	"github.com/go-xorm/xorm"
 
 	"code.gitea.io/git"
@@ -712,10 +713,13 @@ type GetFeedsOptions struct {
 	IncludePrivate   bool // include private actions
 	OnlyPerformedBy  bool // only actions performed by requested user
 	IncludeDeleted   bool // include deleted actions
+	Collaborate      bool // Include collaborative repositories
 }
 
 // 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)
@@ -725,26 +729,28 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 		if repoIDs, err = env.RepoIDs(1, opts.RequestedUser.NumRepos); err != nil {
 			return nil, fmt.Errorf("GetUserRepositories: %v", err)
 		}
+
+		cond = cond.And(builder.In("repo_id", repoIDs))
+	}
+
+	if opts.Collaborate {
+		cond = builder.Eq{"user_id": opts.RequestedUser.ID}.Or(
+			builder.Expr(`repo_id IN (SELECT repo_id FROM "access" WHERE access.user_id = ?)`, opts.RequestedUser.ID))
+	} else {
+		cond = builder.Eq{"user_id": opts.RequestedUser.ID}
 	}
 
-	actions := make([]*Action, 0, 20)
-	sess := x.Limit(20).
-		Desc("id").
-		Where("user_id = ?", opts.RequestedUser.ID)
 	if opts.OnlyPerformedBy {
-		sess.And("act_user_id = ?", opts.RequestedUser.ID)
+		cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID})
 	}
 	if !opts.IncludePrivate {
-		sess.And("is_private = ?", false)
-	}
-	if opts.RequestedUser.IsOrganization() {
-		sess.In("repo_id", repoIDs)
+		cond = cond.And(builder.Eq{"is_private": false})
 	}
 
 	if !opts.IncludeDeleted {
-		sess.And("is_deleted = ?", false)
-
+		cond = cond.And(builder.Eq{"is_deleted": false})
 	}
 
-	return actions, sess.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
@@ -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,43 +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 {
+			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)
 		}
 	}

models/repo_list_test.go

@@ -42,6 +42,7 @@ func TestSearchRepositoryByName(t *testing.T) {
 		Keyword:  "repo_13",
 		Page:     1,
 		PageSize: 10,
+		Private:  true,
 		Searcher: &User{ID: 14},
 	})
 
@@ -54,6 +55,7 @@ func TestSearchRepositoryByName(t *testing.T) {
 		Keyword:  "test_repo",
 		Page:     1,
 		PageSize: 10,
+		Private:  true,
 		Searcher: &User{ID: 14},
 	})
 

routers/api/v1/repo/repo.go

@@ -42,6 +42,7 @@ func Search(ctx *context.APIContext) {
 	if ctx.IsSigned && opts.OwnerID > 0 {
 		if ctx.User.ID == opts.OwnerID {
 			opts.Private = true
+			opts.Collaborate = true
 		} else {
 			u, err := models.GetUserByID(opts.OwnerID)
 			if err != nil {
@@ -54,7 +55,10 @@ func Search(ctx *context.APIContext) {
 			if u.IsOrganization() && u.IsOwnedBy(ctx.User.ID) {
 				opts.Private = true
 			}
-			// FIXME: how about collaborators?
+
+			if !u.IsOrganization() {
+				opts.Collaborate = true
+			}
 		}
 	}
 

routers/user/home.go

@@ -54,24 +54,14 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
 }
 
 // retrieveFeeds loads feeds for the specified user
-func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isProfile bool, includeDeletedComments bool) {
-	var requestingID int64
-	if ctx.User != nil {
-		requestingID = ctx.User.ID
-	}
-	actions, err := models.GetFeeds(models.GetFeedsOptions{
-		RequestedUser:    user,
-		RequestingUserID: requestingID,
-		IncludePrivate:   includePrivate,
-		OnlyPerformedBy:  isProfile,
-		IncludeDeleted:   includeDeletedComments,
-	})
+func retrieveFeeds(ctx *context.Context, options models.GetFeedsOptions) {
+	actions, err := models.GetFeeds(options)
 	if err != nil {
 		ctx.Handle(500, "GetFeeds", err)
 		return
 	}
 
-	userCache := map[int64]*models.User{user.ID: user}
+	userCache := map[int64]*models.User{options.RequestedUser.ID: options.RequestedUser}
 	if ctx.User != nil {
 		userCache[ctx.User.ID] = ctx.User
 	}
@@ -133,52 +123,27 @@ func Dashboard(ctx *context.Context) {
 	ctx.Data["PageIsNews"] = true
 	ctx.Data["SearchLimit"] = setting.UI.User.RepoPagingNum
 
-	// Only user can have collaborative repositories.
-	if !ctxUser.IsOrganization() {
-		collaborateRepos, err := ctx.User.GetAccessibleRepositories(setting.UI.User.RepoPagingNum)
-		if err != nil {
-			ctx.Handle(500, "GetAccessibleRepositories", err)
-			return
-		} else if err = models.RepositoryList(collaborateRepos).LoadAttributes(); err != nil {
-			ctx.Handle(500, "RepositoryList.LoadAttributes", err)
-			return
-		}
-		ctx.Data["CollaborativeRepos"] = collaborateRepos
-	}
-
 	var err error
-	var repos, mirrors []*models.Repository
+	var mirrors []*models.Repository
 	if ctxUser.IsOrganization() {
 		env, err := ctxUser.AccessibleReposEnv(ctx.User.ID)
 		if err != nil {
 			ctx.Handle(500, "AccessibleReposEnv", err)
 			return
 		}
-		repos, err = env.Repos(1, setting.UI.User.RepoPagingNum)
-		if err != nil {
-			ctx.Handle(500, "env.Repos", err)
-			return
-		}
 
 		mirrors, err = env.MirrorRepos()
 		if err != nil {
 			ctx.Handle(500, "env.MirrorRepos", err)
 			return
 		}
 	} else {
-		if err = ctxUser.GetRepositories(1, setting.UI.User.RepoPagingNum); err != nil {
-			ctx.Handle(500, "GetRepositories", err)
-			return
-		}
-		repos = ctxUser.Repos
-
 		mirrors, err = ctxUser.GetMirrorRepositories()
 		if err != nil {
 			ctx.Handle(500, "GetMirrorRepositories", err)
 			return
 		}
 	}
-	ctx.Data["Repos"] = repos
 	ctx.Data["MaxShowRepoNum"] = setting.UI.User.RepoPagingNum
 
 	if err := models.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil {
@@ -188,7 +153,12 @@ func Dashboard(ctx *context.Context) {
 	ctx.Data["MirrorCount"] = len(mirrors)
 	ctx.Data["Mirrors"] = mirrors
 
-	retrieveFeeds(ctx, ctxUser, true, false, false)
+	retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
+		IncludePrivate:  true,
+		OnlyPerformedBy: false,
+		Collaborate:     true,
+		IncludeDeleted:  false,
+	})
 	if ctx.Written() {
 		return
 	}

routers/user/profile.go

@@ -138,7 +138,12 @@ func Profile(ctx *context.Context) {
 	ctx.Data["Keyword"] = keyword
 	switch tab {
 	case "activity":
-		retrieveFeeds(ctx, ctxUser, showPrivate, true, false)
+		retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
+			IncludePrivate:  showPrivate,
+			OnlyPerformedBy: true,
+			Collaborate:     true,
+			IncludeDeleted:  false,
+		})
 		if ctx.Written() {
 			return
 		}