refactor getParticipantIDsByIssue

Author: 6543

models/issue.go

@@ -1275,43 +1275,9 @@ func GetParticipantsIDsByIssueID(issueID int64) ([]int64, error) {
 		Find(&userIDs)
 }
 
-// GetParticipantsByIssueID returns all users who are participated in comments of an issue.
-func GetParticipantsByIssueID(issueID int64) ([]*User, error) {
-	issue, err := getIssueByID(x, issueID)
-	if err != nil {
-		return nil, err
-	}
-	userIDs, err := getParticipantsByIssueID(x, issue)
-	if err != nil {
-		return nil, err
-	}
-	if len(userIDs) == 0 {
-		return nil, nil
-	}
-	return GetUsersByIDs(userIDs)
-}
-
-func getParticipantsByIssueID(e Engine, issue *Issue) ([]int64, error) {
-	userIDs := make([]int64, 0, 5)
-	if err := e.Table("comment").Cols("poster_id").
-		Where("`comment`.issue_id = ?", issue.ID).
-		And("`comment`.type in (?,?,?)", CommentTypeComment, CommentTypeCode, CommentTypeReview).
-		And("`user`.is_active = ?", true).
-		And("`user`.prohibit_login = ?", false).
-		Join("INNER", "`user`", "`user`.id = `comment`.poster_id").
-		Distinct("poster_id").
-		Find(&userIDs); err != nil {
-		return nil, fmt.Errorf("get poster IDs: %v", err)
-	}
-	if !util.IsInt64InSlice(issue.PosterID, userIDs) {
-		return append(userIDs, issue.PosterID), nil
-	}
-	return userIDs, nil
-}
-
 // IsUserParticipantsOfIssue return true if user is participants of an issue
 func IsUserParticipantsOfIssue(user *User, issue *Issue) bool {
-	userIDs, err := getParticipantsByIssueID(x, issue)
+	userIDs, err := issue.getParticipantIDsByIssue(x)
 	if err != nil {
 		log.Error(err.Error())
 		return false
@@ -1710,6 +1676,28 @@ type DependencyInfo struct {
 	Repository `xorm:"extends"`
 }
 
+// getParticipantIDsByIssue returns all userIDs who are participated in comments of an issue and issue author
+func (issue *Issue) getParticipantIDsByIssue(e Engine) ([]int64, error) {
+	if issue == nil {
+		return nil, nil
+	}
+	userIDs := make([]int64, 0, 5)
+	if err := e.Table("comment").Cols("poster_id").
+		Where("`comment`.issue_id = ?", issue.ID).
+		And("`comment`.type in (?,?,?)", CommentTypeComment, CommentTypeCode, CommentTypeReview).
+		And("`user`.is_active = ?", true).
+		And("`user`.prohibit_login = ?", false).
+		Join("INNER", "`user`", "`user`.id = `comment`.poster_id").
+		Distinct("poster_id").
+		Find(&userIDs); err != nil {
+		return nil, fmt.Errorf("get poster IDs: %v", err)
+	}
+	if !util.IsInt64InSlice(issue.PosterID, userIDs) {
+		return append(userIDs, issue.PosterID), nil
+	}
+	return userIDs, nil
+}
+
 // Get Blocked By Dependencies, aka all issues this issue is blocked by.
 func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*DependencyInfo, err error) {
 	return issueDeps, e.

models/issue_test.go

@@ -61,15 +61,17 @@ func TestGetIssuesByIDs(t *testing.T) {
 	testSuccess([]int64{1, 2, 3}, []int64{NonexistentID})
 }
 
-func TestGetParticipantsByIssueID(t *testing.T) {
+func TestGetParticipantIDsByIssue(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 
 	checkParticipants := func(issueID int64, userIDs []int) {
-		participants, err := GetParticipantsByIssueID(issueID)
+		issue, err := GetIssueByID(issueID)
+		assert.NoError(t, err)
+		participants, err := issue.getParticipantIDsByIssue(x)
 		if assert.NoError(t, err) {
 			participantsIDs := make([]int, len(participants))
-			for i, u := range participants {
-				participantsIDs[i] = int(u.ID)
+			for i, uid := range participants {
+				participantsIDs[i] = int(uid)
 			}
 			sort.Ints(participantsIDs)
 			sort.Ints(userIDs)

models/notification.go

@@ -159,8 +159,7 @@ func createOrUpdateIssueNotifications(e Engine, issueID, commentID int64, notifi
 	for _, id := range repoWatches {
 		toNotify[id] = struct{}{}
 	}
-
-	issueParticipants, err := getParticipantsByIssueID(e, issue)
+	issueParticipants, err := issue.getParticipantIDsByIssue(e)
 	if err != nil {
 		return err
 	}