Skip to content

Bugfix - single reviewer could approve multiple times to overcome minimum #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BakerNet merged 1 commit into from
Mar 7, 2025
Merged

Bugfix - single reviewer could approve multiple times to overcome minimum #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Code Ownership & Review Assignment Tool - GitHub CODEOWNERS but better

[![Go Report Card](https://goreportcard.com/badge/github.com/multimediallc/codeowners-plus)](https://goreportcard.com/report/github.com/multimediallc/codeowners-plus?kill_cache=1)
[![Tests](https://github.com/multimediallc/codeowners-plus/actions/workflows/go.yml/badge.svg)](https://github.com/multimediallc/codeowners-plus/actions/workflows/go.yml)
![Coverage](https://img.shields.io/badge/Coverage-59.9%25-yellow)
![Coverage](https://img.shields.io/badge/Coverage-60.1%25-yellow)
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)

Expand Down
19 changes: 16 additions & 3 deletions internal/github/gh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"io"
"maps"
"slices"
"strings"
"time"
Expand Down Expand Up @@ -120,12 +121,22 @@ func (gh *Client) InitReviews() error {
allReviews = f.Filtered(allReviews, func(review *github.PullRequestReview) bool {
return review.User.GetLogin() != gh.PR.User.GetLogin()
})
// use descending chronological order (default ascending)
slices.Reverse(allReviews)
gh.reviews = allReviews
return nil
}

func (gh *Client) approvals() []*github.PullRequestReview {
seen := make(map[string]bool, 0)
approvals := f.Filtered(gh.reviews, func(approval *github.PullRequestReview) bool {
userName := approval.GetUser().GetLogin()
if _, ok := seen[userName]; ok {
// we only care about the most recent reviews for each user
return false
} else {
seen[userName] = true
}
return approval.GetState() == "APPROVED"
})
return approvals
Expand Down Expand Up @@ -206,15 +217,17 @@ func (gh *Client) GetAlreadyReviewed() ([]string, error) {
}

func reviewerAlreadyReviewed(reviews []*github.PullRequestReview, userReviewerMap ghUserReviewerMap) []string {
reviewsReviewers := make([]string, 0, len(reviews))
reviewsReviewers := make(map[string]bool, len(reviews))
for _, review := range reviews {
reviewingUser := review.GetUser().GetLogin()
if reviewers, ok := userReviewerMap[reviewingUser]; ok {
reviewsReviewers = append(reviewsReviewers, reviewers...)
for _, reviewer := range reviewers {
reviewsReviewers[reviewer] = true
}
}
}

return reviewsReviewers
return slices.Collect(maps.Keys(reviewsReviewers))
}

func (gh *Client) GetCurrentlyRequested() ([]string, error) {
Expand Down