fix(ghpr): Do not count reviewers/approvers multiple times

Signed-off-by: Cezar Craciunoiu <[email protected]>

internal/ghpr/ghpr_mergable.go

@@ -113,19 +113,33 @@ func (pr *PullRequest) SatisfiesMergeRequirements(ctx context.Context, opts ...P
 		return false, nil, fmt.Errorf("could not list pull request reviews: %w", err)
 	}
 
+	var existingReviewers []string
+	var existingApprovers []string
+
 	for _, r := range reviews {
 		if ok, matches := mopts.requestsApproverRegex(*r.Body); ok {
 			if mopts.requestsApproverTeam(ctx, *pull, *r.User.Login) {
 				if !mopts.requestsApproveState(*r.State) {
 					continue
 				}
 
-				for k, v := range matches {
-					if _, ok := res[k]; !ok {
-						res[k] = make([]string, 0)
+				var alreadyApproved bool
+				for _, approver := range existingApprovers {
+					if strings.Contains(approver, *r.User.Login) {
+						alreadyApproved = true
+						break
+					}
+				}
+
+				if !alreadyApproved {
+					for k, v := range matches {
+						if _, ok := res[k]; !ok {
+							res[k] = make([]string, 0)
+						}
+						res[k] = append(res[k], v)
+						prApprovals++
+						existingApprovers = append(existingApprovers, *r.User.Login)
 					}
-					res[k] = append(res[k], v)
-					prApprovals++
 				}
 			}
 		}
@@ -136,12 +150,23 @@ func (pr *PullRequest) SatisfiesMergeRequirements(ctx context.Context, opts ...P
 					continue
 				}
 
-				for k, v := range matches {
-					if _, ok := res[k]; !ok {
-						res[k] = make([]string, 0)
+				var alreadyReviewed bool
+				for _, reviewer := range existingReviewers {
+					if strings.Contains(reviewer, *r.User.Login) {
+						alreadyReviewed = true
+						break
+					}
+				}
+
+				if !alreadyReviewed {
+					for k, v := range matches {
+						if _, ok := res[k]; !ok {
+							res[k] = make([]string, 0)
+						}
+						res[k] = append(res[k], v)
+						prReviews++
+						existingReviewers = append(existingReviewers, *r.User.Login)
 					}
-					res[k] = append(res[k], v)
-					prReviews++
 				}
 			}
 		}