search database to detect whether the user is first time contributors

Author: lunny

models/issues/pull_list.go

@@ -199,3 +199,14 @@ func (prs PullRequestList) GetIssueIDs() []int64 {
 	}
 	return issueIDs
 }
+
+// CountMergedPullRequestInRepo return the count the user merged into the repository via pull request
+func CountMergedPullRequestInRepo(ctx context.Context, repoID, posterID int64) (int64, error) {
+	return db.GetEngine(ctx).
+		Join("INNER", "pull", "pull.issue_id = issue.id").
+		Where("repo_id=?", repoID).
+		And("poster_id=?", posterID).
+		And("is_pull=?", true).
+		And("pull.has_merged=?", true).
+		Count(new(Issue))
+}

routers/web/repo/issue.go

@@ -1284,22 +1284,12 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 		return roleDescriptor, nil
 	}
 
-	// If the poster is the contributor of the repo
-	searchOpt := &issue_indexer.SearchOptions{
-		Paginator: &db.ListOptions{
-			Page:     1,
-			PageSize: 1,
-		},
-		RepoIDs:  []int64{repo.ID},
-		IsClosed: util.OptionalBoolTrue,
-		IsPull:   util.OptionalBoolTrue,
-		PosterID: &poster.ID,
-	}
-	if _, total, err := issue_indexer.SearchIssues(ctx, searchOpt); err != nil {
+	total, err := issues_model.CountMergedPullRequestInRepo(ctx, repo.ID, poster.ID)
+	if err != nil {
 		return roleDescriptor, err
 	} else if total > 0 {
 		roleDescriptor.RoleInRepo = issues_model.RoleRepoContributor
-	} else if total == 0 && issue.IsPull && !issue.IsClosed {
+	} else if total == 0 {
 		// only display first time contributor in the first opening pull request
 		roleDescriptor.RoleInRepo = issues_model.RoleRepoFirstTimeContributor
 	}