use HasMergedPullRequestInRepo

Author: wxiaoguang

models/issues/pull_list.go

@@ -200,13 +200,15 @@ 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) {
+// HasMergedPullRequestInRepo returns whether the user(poster) has merged pull-request in the repo
+func HasMergedPullRequestInRepo(ctx context.Context, repoID, posterID int64) (bool, error) {
 	return db.GetEngine(ctx).
-		Join("INNER", "pull", "pull.issue_id = issue.id").
+		Join("INNER", "pull_request", "pull_request.issue_id = issue.id").
 		Where("repo_id=?", repoID).
 		And("poster_id=?", posterID).
 		And("is_pull=?", true).
-		And("pull.has_merged=?", true).
-		Count(new(Issue))
+		And("pull_request.has_merged=?", true).
+		Select("issue.id").
+		Limit(1).
+		Get(new(Issue))
 }

routers/web/repo/issue.go

@@ -1284,12 +1284,12 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 		return roleDescriptor, nil
 	}
 
-	total, err := issues_model.CountMergedPullRequestInRepo(ctx, repo.ID, poster.ID)
+	hasMergedPR, err := issues_model.HasMergedPullRequestInRepo(ctx, repo.ID, poster.ID)
 	if err != nil {
 		return roleDescriptor, err
-	} else if total > 0 {
+	} else if hasMergedPR {
 		roleDescriptor.RoleInRepo = issues_model.RoleRepoContributor
-	} else if total == 0 {
+	} else {
 		// only display first time contributor in the first opening pull request
 		roleDescriptor.RoleInRepo = issues_model.RoleRepoFirstTimeContributor
 	}