Add type = approval and group by reviewer_id to review

models/branches.go

@@ -99,17 +99,14 @@ func (protectBranch *ProtectedBranch) HasEnoughApprovals(pr *PullRequest) bool {
 
 // GetGrantedApprovalsCount returns the number of granted approvals for pr. A granted approval must be authored by a user in an approval whitelist.
 func (protectBranch *ProtectedBranch) GetGrantedApprovalsCount(pr *PullRequest) int64 {
-	reviews, err := GetReviewsByPullRequestID(pr.ID)
+	reviews, err := GetUniqueApprovalsByPullRequestID(pr.ID)
 	if err != nil {
-		log.Error(1, "GetReviewsByPullRequestID:", err)
+		log.Error(1, "GetUniqueApprovalsByPullRequestID:", err)
 		return 0
 	}
 	approvals := int64(0)
 	userIDs := make([]int64, 0)
 	for _, review := range reviews {
-		if review.Type != ReviewTypeApprove {
-			continue
-		}
 		if base.Int64sContains(protectBranch.ApprovalsWhitelistUserIDs, review.ReviewerID) {
 			approvals++
 			continue

models/review.go

@@ -160,17 +160,21 @@ func GetReviewByID(id int64) (*Review, error) {
 	return getReviewByID(x, id)
 }
 
-func getReviewsByPullRequestID(e Engine, prID int64) (reviews []*Review, err error) {
+func getUniqueApprovalsByPullRequestID(e Engine, prID int64) (reviews []*Review, err error) {
 	reviews = make([]*Review, 0)
-	if err := e.Where("issue_id = ?", prID).Find(&reviews); err != nil {
+	if err := e.
+		Where("issue_id = ? AND type = ?", prID, ReviewTypeApprove).
+		OrderBy("updated_unix").
+		GroupBy("reviewer_id").
+		Find(&reviews); err != nil {
 		return nil, err
 	}
 	return
 }
 
-// GetReviewsByPullRequestID returns all reviews submitted for a specific pull request
-func GetReviewsByPullRequestID(prID int64) ([]*Review, error) {
-	return getReviewsByPullRequestID(x, prID)
+// GetUniqueApprovalsByPullRequestID returns all reviews submitted for a specific pull request
+func GetUniqueApprovalsByPullRequestID(prID int64) ([]*Review, error) {
+	return getUniqueApprovalsByPullRequestID(x, prID)
 }
 
 // FindReviewOptions represent possible filters to find reviews

models/review_test.go

@@ -105,3 +105,13 @@ func TestUpdateReview(t *testing.T) {
 	assert.NoError(t, UpdateReview(review))
 	AssertExistsAndLoadBean(t, &Review{ID: 1, Content: "Updated Review"})
 }
+
+func TestGetUniqueApprovalsByPullRequestID(t *testing.T) {
+	assert.NoError(t, PrepareTestDatabase())
+	approvals, err := GetUniqueApprovalsByPullRequestID(2)
+	assert.NoError(t, err)
+	assert.Len(t, approvals, 1)
+	approvals, err = GetUniqueApprovalsByPullRequestID(354295349965036)
+	assert.NoError(t, err)
+	assert.Len(t, approvals, 0)
+}