STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address PR review comments

Browse source 
Address PR review comments: code consistency and DRY improvements

- Add botTypeName const for consistency with teamTypeName
- Create extractTeamSlugs helper using strings.SplitN to simplify
  team slug extraction logic
- Replace duplicate code in AddPullRequestReviews and
  RemovePullRequestReviews with extractTeamSlugs helper
- Fix ClientMutationId naming with explicit graphql tag for
  consistency with other mutations in the codebase
This commit is contained in:
Kynan Ware 2026-02-04 15:04:20 -07:00
parent 9904f7d1b9
commit 04bf86a72c
1 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
api/queries_pr.go
View file

@ -317,6 +317,9 @@ type RequestedReviewer struct {
} `json:"organization"`
}
const teamTypeName = "Team"
const botTypeName = "Bot"
func (r RequestedReviewer) LoginOrSlug() string {
if r.TypeName == teamTypeName {
return fmt.Sprintf("%s/%s", r.Organization.Login, r.Slug)
@ -331,7 +334,7 @@ func (r RequestedReviewer) DisplayName() string {
if r.TypeName == teamTypeName {
return fmt.Sprintf("%s/%s", r.Organization.Login, r.Slug)
}
if r.TypeName == "Bot" && r.Login == CopilotReviewerLogin {
if r.TypeName == botTypeName && r.Login == CopilotReviewerLogin {
return "Copilot (AI)"
}
if r.Name != "" {
@ -340,8 +343,6 @@ func (r RequestedReviewer) DisplayName() string {
return r.Login
}
const teamTypeName = "Team"
func (r ReviewRequests) Logins() []string {
logins := make([]string, len(r.Nodes))
for i, r := range r.Nodes {
@ -669,6 +670,20 @@ func CreatePullRequest(client *Client, repo *Repository, params map[string]inter
return pr, nil
}
// extractTeamSlugs extracts just the slug portion from team identifiers.
// Team identifiers can be in "org/slug" format; this returns just the slug.
func extractTeamSlugs(teams []string) []string {
slugs := make([]string, 0, len(teams))
for _, t := range teams {
if t == "" {
continue
}
s := strings.SplitN(t, "/", 2)
slugs = append(slugs, s[len(s)-1])
}
return slugs
}
// AddPullRequestReviews adds the given user and team reviewers to a pull request using the REST API.
// Team identifiers can be in "org/slug" format.
func AddPullRequestReviews(client *Client, repo ghrepo.Interface, prNumber int, users, teams []string) error {
@ -681,16 +696,6 @@ func AddPullRequestReviews(client *Client, repo ghrepo.Interface, prNumber int,
users = []string{}
}
// Extract just the slug from org/slug format
teamSlugs := make([]string, 0, len(teams))
for _, t := range teams {
if idx := strings.Index(t, "/"); idx >= 0 {
teamSlugs = append(teamSlugs, t[idx+1:])
} else if t != "" {
teamSlugs = append(teamSlugs, t)
}
}
path := fmt.Sprintf(
"repos/%s/%s/pulls/%d/requested_reviewers",
url.PathEscape(repo.RepoOwner()),
@ -702,7 +707,7 @@ func AddPullRequestReviews(client *Client, repo ghrepo.Interface, prNumber int,
TeamReviewers []string `json:"team_reviewers"`
}{
Reviewers: users,
TeamReviewers: teamSlugs,
TeamReviewers: extractTeamSlugs(teams),
}
buf := &bytes.Buffer{}
if err := json.NewEncoder(buf).Encode(body); err != nil {
@ -724,16 +729,6 @@ func RemovePullRequestReviews(client *Client, repo ghrepo.Interface, prNumber in
users = []string{}
}
// Extract just the slug from org/slug format
teamSlugs := make([]string, 0, len(teams))
for _, t := range teams {
if idx := strings.Index(t, "/"); idx >= 0 {
teamSlugs = append(teamSlugs, t[idx+1:])
} else if t != "" {
teamSlugs = append(teamSlugs, t)
}
}
path := fmt.Sprintf(
"repos/%s/%s/pulls/%d/requested_reviewers",
url.PathEscape(repo.RepoOwner()),
@ -745,7 +740,7 @@ func RemovePullRequestReviews(client *Client, repo ghrepo.Interface, prNumber in
TeamReviewers []string `json:"team_reviewers"`
}{
Reviewers: users,
TeamReviewers: teamSlugs,
TeamReviewers: extractTeamSlugs(teams),
}
buf := &bytes.Buffer{}
if err := json.NewEncoder(buf).Encode(body); err != nil {
@ -770,7 +765,7 @@ func RequestReviewsByLogin(client *Client, repo ghrepo.Interface, prID string, u
var mutation struct {
RequestReviewsByLogin struct {
ClientMutationID string
ClientMutationId string `graphql:"clientMutationId"`
} `graphql:"requestReviewsByLogin(input: $input)"`
}