Skip to content

add better filtering for reviews and review comments #6

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
katbyte merged 3 commits into from
Sep 9, 2025
Merged

add better filtering for reviews and review comments #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec7d124
add better filtering for reviews and review comments
sreallymatt Sep 8, 2025
3267146
gofmt
sreallymatt Sep 8, 2025
220c38b
add new fields to projectItemField slice
sreallymatt Sep 8, 2025
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
4 changes: 3 additions & 1 deletion cli/cmds_prs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,14 @@ func CmdPRs(_ *cobra.Command, _ []string) error {
{Name: "user", FieldID: p.FieldIDs["User"], Type: gh.ItemValueTypeText, Value: pr.Author},
{Name: "daysOpen", FieldID: p.FieldIDs["Open Days"], Type: gh.ItemValueTypeNumber, Value: daysOpen},
{Name: "daysWait", FieldID: p.FieldIDs["Waiting Days"], Type: gh.ItemValueTypeNumber, Value: daysWaiting},
{Name: "commentCount", FieldID: p.FieldIDs["Comment Count"], Type: gh.ItemValueTypeNumber, Value: pr.TotalCommentsCount},
{Name: "commentCount", FieldID: p.FieldIDs["Comment Count"], Type: gh.ItemValueTypeNumber, Value: pr.TotalCommentCount},
{Name: "reviewCount", FieldID: p.FieldIDs["Review Count"], Type: gh.ItemValueTypeNumber, Value: pr.TotalReviewCount},
{Name: "reviewCommentCount", FieldID: p.FieldIDs["Review Comment Count"], Type: gh.ItemValueTypeNumber, Value: pr.ReviewCommentCount},
}

if pr.FilteredReviewCount > 0 {
fields = append(fields, gh.ProjectItemField{Name: "filteredReviewCount", FieldID: p.FieldIDs["Filtered Review Count"], Type: gh.ItemValueTypeNumber, Value: pr.FilteredReviewCount})
fields = append(fields, gh.ProjectItemField{Name: "filteredReviewCommentCount", FieldID: p.FieldIDs["Filtered Review Comment Count"], Type: gh.ItemValueTypeNumber, Value: pr.FilteredReviewCommentCount})
}

err = p.UpdateItem(*iid, fields)
Expand Down
42 changes: 27 additions & 15 deletions lib/gh/pr_gql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ import (
)

type PullRequest struct {
NodeID string
Author string
Number int
Title string
State string
ReviewDecision string
CreatedAt time.Time
UpdatedAt time.Time
ClosedAt time.Time
Draft bool
Milestone string
TotalCommentsCount int
TotalReviewCount int
FilteredReviewCount int
NodeID string
Author string
Number int
Title string
State string
ReviewDecision string
CreatedAt time.Time
UpdatedAt time.Time
ClosedAt time.Time
Draft bool
Milestone string
TotalCommentCount int
TotalReviewCount int
ReviewCommentCount int
FilteredReviewCount int
FilteredReviewCommentCount int

Assignees []string
AssociatedLabels map[string]bool
Expand Down Expand Up @@ -68,6 +70,10 @@ type pullRequestsQuery struct {
Author struct {
Login string
}
Comments struct {
TotalCount int
}
State string
}
} `graphql:"reviews(first: 100)"`

Expand Down Expand Up @@ -143,7 +149,7 @@ func (q pullRequestsQuery) flatten(reviewers map[string]struct{}) []PullRequest
ClosedAt: pullRequest.ClosedAt,
Draft: pullRequest.IsDraft,
Milestone: pullRequest.Milestone.Title,
TotalCommentsCount: pullRequest.TotalCommentsCount,
TotalCommentCount: pullRequest.TotalCommentsCount,
AssociatedLabels: make(map[string]bool),
AssociatedProjectNumbers: make(map[int]bool),
}
Expand All @@ -161,11 +167,17 @@ func (q pullRequestsQuery) flatten(reviewers map[string]struct{}) []PullRequest
}

for _, review := range pullRequest.Reviews.Nodes {
// We're only interested in `APPROVED`, `CHANGES_REQUESTED`, and `DISMISSED` states.
if review.State == string(githubv4.PullRequestReviewStateCommented) || review.State == string(githubv4.PullRequestReviewStatePending) {
continue
}
pr.TotalReviewCount++
pr.ReviewCommentCount += review.Comments.TotalCount

// Only add filtered review count if `reviewers` filter was provided
if _, ok := reviewers[review.Author.Login]; ok {
pr.FilteredReviewCount++
pr.FilteredReviewCommentCount += review.Comments.TotalCount
}
}

Expand Down