Don't display repositories with no milestone and fix tests

Author: lunny

models/repo_list.go

@@ -163,6 +163,10 @@ type SearchRepoOptions struct {
 	TopicOnly bool
 	// include description in keyword search
 	IncludeDescription bool
+	// None -> include has milestones AND has no milestone
+	// True -> include just has milestones
+	// False -> include just has no milestone
+	HasMilestones util.OptionalBool
 }
 
 //SearchOrderBy is used to sort the result
@@ -294,6 +298,14 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
 	if opts.Actor != nil && opts.Actor.IsRestricted {
 		cond = cond.And(accessibleRepositoryCondition(opts.Actor))
 	}
+
+	switch opts.HasMilestones {
+	case util.OptionalBoolTrue:
+		cond = cond.And(builder.Gt{"num_milestones": 0})
+	case util.OptionalBoolFalse:
+		cond = cond.And(builder.Eq{"num_milestones": 0}.Or(builder.IsNull{"num_milestones"}))
+	}
+
 	return cond
 }
 

routers/user/home.go

@@ -175,11 +175,12 @@ func Milestones(ctx *context.Context) {
 
 	var (
 		repoOpts = models.SearchRepoOptions{
-			Actor:      ctxUser,
-			OwnerID:    ctxUser.ID,
-			Private:    true,
-			AllPublic:  false, // Include also all public repositories of users and public organisations
-			AllLimited: false, // Include also all public repositories of limited organisations
+			Actor:         ctxUser,
+			OwnerID:       ctxUser.ID,
+			Private:       true,
+			AllPublic:     false,                 // Include also all public repositories of users and public organisations
+			AllLimited:    false,                 // Include also all public repositories of limited organisations
+			HasMilestones: util.OptionalBoolTrue, // Just needs display repos has milestones
 		}
 
 		userRepoCond = models.SearchRepositoryCondition(&repoOpts) // all repo condition user could visit
@@ -232,16 +233,15 @@ func Milestones(ctx *context.Context) {
 		return
 	}
 
-	showRepos, _, err := models.SearchRepositoryByCondition(&repoOpts, userRepoCond, false)
+	userRepos, _, err := models.SearchRepositoryByCondition(&repoOpts, userRepoCond, false)
 	if err != nil {
 		ctx.ServerError("SearchRepositoryByCondition", err)
 		return
 	}
 
-	sort.Sort(showRepos)
-
+	var showRepos = userRepos /*make(models.RepositoryList, 0, len(userRepos))*/
 	for i := 0; i < len(milestones); {
-		for _, repo := range showRepos {
+		for _, repo := range userRepos {
 			if milestones[i].RepoID == repo.ID {
 				milestones[i].Repo = repo
 				break
@@ -253,6 +253,17 @@ func Milestones(ctx *context.Context) {
 			continue
 		}
 
+		/*var found bool
+		for _, repo := range showRepos {
+			if milestones[i].Repo.ID == repo.ID {
+				found = true
+				break
+			}
+		}
+		if !found {
+			showRepos = append(showRepos, milestones[i].Repo)
+		}*/
+
 		milestones[i].RenderedContent = string(markdown.Render([]byte(milestones[i].Content), milestones[i].Repo.Link(), milestones[i].Repo.ComposeMetas()))
 		if milestones[i].Repo.IsTimetrackerEnabled() {
 			err := milestones[i].LoadTotalTrackedTime()
@@ -264,6 +275,8 @@ func Milestones(ctx *context.Context) {
 		i++
 	}
 
+	sort.Sort(showRepos)
+
 	milestoneStats, err := models.GetMilestonesStats(repoCond)
 	if err != nil {
 		ctx.ServerError("GetMilestoneStats", err)

routers/user/home_test.go

@@ -48,7 +48,7 @@ func TestMilestones(t *testing.T) {
 	assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])
 	assert.EqualValues(t, 1, ctx.Data["Total"])
 	assert.Len(t, ctx.Data["Milestones"], 1)
-	assert.Len(t, ctx.Data["Repos"], 1)
+	assert.Len(t, ctx.Data["Repos"], 2) // both repo 42 and 1 have milestones and both are owned by user 2
 }
 
 func TestMilestonesForSpecificRepo(t *testing.T) {
@@ -68,5 +68,5 @@ func TestMilestonesForSpecificRepo(t *testing.T) {
 	assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])
 	assert.EqualValues(t, 1, ctx.Data["Total"])
 	assert.Len(t, ctx.Data["Milestones"], 1)
-	assert.Len(t, ctx.Data["Repos"], 1)
+	assert.Len(t, ctx.Data["Repos"], 2) // both repo 42 and 1 have milestones and both are owned by user 2
 }