Skip to content

trim GraphQL queries #78

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

Open
skarim wants to merge 1 commit into from
+26 −99
Open

trim GraphQL queries #78

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
1 change: 0 additions & 1 deletion internal/github/client_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package github
// Tests can substitute a MockClient.
type ClientOps interface {
FindPRForBranch(branch string) (*PullRequest, error)
FindAnyPRForBranch(branch string) (*PullRequest, error)
FindPRByNumber(number int) (*PullRequest, error)
FindPRDetailsForBranch(branch string) (*PRDetails, error)
CreatePR(base, head, title, body string, draft bool) (*PullRequest, error)
Expand Down
113 changes: 26 additions & 87 deletions internal/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ type MergeQueueEntry struct {
type PullRequest struct {
ID string `graphql:"id"`
Number int `graphql:"number"`
Title string `graphql:"title"`
State string `graphql:"state"`
URL string `graphql:"url"`
HeadRefName string `graphql:"headRefName"`
Expand Down Expand Up @@ -85,7 +84,14 @@ func (c *Client) FindPRForBranch(branch string) (*PullRequest, error) {
var query struct {
Repository struct {
PullRequests struct {
Nodes []PullRequest
Nodes []struct {
ID string `graphql:"id"`
Number int `graphql:"number"`
URL string `graphql:"url"`
BaseRefName string `graphql:"baseRefName"`
IsDraft bool `graphql:"isDraft"`
MergeQueueEntry *MergeQueueEntry `graphql:"mergeQueueEntry"`
}
} `graphql:"pullRequests(headRefName: $head, states: [OPEN], first: 1)"`
} `graphql:"repository(owner: $owner, name: $name)"`
}
Expand All @@ -109,53 +115,9 @@ func (c *Client) FindPRForBranch(branch string) (*PullRequest, error) {
return &PullRequest{
ID: n.ID,
Number: n.Number,
Title: n.Title,
State: n.State,
URL: n.URL,
HeadRefName: n.HeadRefName,
BaseRefName: n.BaseRefName,
IsDraft: n.IsDraft,
Merged: n.Merged,
MergeQueueEntry: n.MergeQueueEntry,
}, nil
}

// FindAnyPRForBranch finds the most recent PR by head branch name regardless of state.
func (c *Client) FindAnyPRForBranch(branch string) (*PullRequest, error) {
var query struct {
Repository struct {
PullRequests struct {
Nodes []PullRequest
} `graphql:"pullRequests(headRefName: $head, last: 1)"`
} `graphql:"repository(owner: $owner, name: $name)"`
}

variables := map[string]interface{}{
"owner": graphql.String(c.owner),
"name": graphql.String(c.repo),
"head": graphql.String(branch),
}

if err := c.gql.Query("FindAnyPRForBranch", &query, variables); err != nil {
return nil, fmt.Errorf("querying PRs: %w", err)
}

nodes := query.Repository.PullRequests.Nodes
if len(nodes) == 0 {
return nil, nil
}

n := nodes[0]
return &PullRequest{
ID: n.ID,
Number: n.Number,
Title: n.Title,
State: n.State,
URL: n.URL,
HeadRefName: n.HeadRefName,
BaseRefName: n.BaseRefName,
IsDraft: n.IsDraft,
Merged: n.Merged,
MergeQueueEntry: n.MergeQueueEntry,
}, nil
}
Expand All @@ -165,14 +127,9 @@ func (c *Client) CreatePR(base, head, title, body string, draft bool) (*PullRequ
var mutation struct {
CreatePullRequest struct {
PullRequest struct {
ID string
Number int
Title string
State string
URL string `graphql:"url"`
HeadRefName string
BaseRefName string
IsDraft bool
ID string
Number int
URL string `graphql:"url"`
}
} `graphql:"createPullRequest(input: $input)"`
}
Expand Down Expand Up @@ -208,14 +165,9 @@ func (c *Client) CreatePR(base, head, title, body string, draft bool) (*PullRequ

pr := mutation.CreatePullRequest.PullRequest
return &PullRequest{
ID: pr.ID,
Number: pr.Number,
Title: pr.Title,
State: pr.State,
URL: pr.URL,
HeadRefName: pr.HeadRefName,
BaseRefName: pr.BaseRefName,
IsDraft: pr.IsDraft,
ID: pr.ID,
Number: pr.Number,
URL: pr.URL,
}, nil
}

Expand Down Expand Up @@ -282,14 +234,12 @@ func (c *Client) repositoryID() (string, error) {

// PRDetails holds enriched pull request data for display in the TUI.
type PRDetails struct {
Number int
Title string
State string // OPEN, CLOSED, MERGED
URL string
IsDraft bool
Merged bool
IsQueued bool
CommentsCount int
Number int
State string // OPEN, CLOSED, MERGED
URL string
IsDraft bool
Merged bool
IsQueued bool
}

// FindPRDetailsForBranch fetches enriched PR data for display purposes.
Expand All @@ -299,19 +249,12 @@ func (c *Client) FindPRDetailsForBranch(branch string) (*PRDetails, error) {
Repository struct {
PullRequests struct {
Nodes []struct {
ID string `graphql:"id"`
Number int `graphql:"number"`
Title string `graphql:"title"`
State string `graphql:"state"`
URL string `graphql:"url"`
HeadRefName string `graphql:"headRefName"`
BaseRefName string `graphql:"baseRefName"`
IsDraft bool `graphql:"isDraft"`
Merged bool `graphql:"merged"`
MergeQueueEntry *MergeQueueEntry `graphql:"mergeQueueEntry"`
Comments struct {
TotalCount int `graphql:"totalCount"`
} `graphql:"comments"`
}
} `graphql:"pullRequests(headRefName: $head, last: 1)"`
} `graphql:"repository(owner: $owner, name: $name)"`
Expand All @@ -334,14 +277,12 @@ func (c *Client) FindPRDetailsForBranch(branch string) (*PRDetails, error) {

n := nodes[0]
return &PRDetails{
Number: n.Number,
Title: n.Title,
State: n.State,
URL: n.URL,
IsDraft: n.IsDraft,
Merged: n.Merged,
IsQueued: n.MergeQueueEntry != nil && n.MergeQueueEntry.ID != "",
CommentsCount: n.Comments.TotalCount,
Number: n.Number,
State: n.State,
URL: n.URL,
IsDraft: n.IsDraft,
Merged: n.Merged,
IsQueued: n.MergeQueueEntry != nil && n.MergeQueueEntry.ID != "",
}, nil
}

Expand All @@ -357,7 +298,6 @@ func (c *Client) FindPRByNumber(number int) (*PullRequest, error) {
PullRequest struct {
ID string `graphql:"id"`
Number int `graphql:"number"`
Title string `graphql:"title"`
State string `graphql:"state"`
URL string `graphql:"url"`
HeadRefName string `graphql:"headRefName"`
Expand Down Expand Up @@ -386,7 +326,6 @@ func (c *Client) FindPRByNumber(number int) (*PullRequest, error) {
return &PullRequest{
ID: n.ID,
Number: n.Number,
Title: n.Title,
State: n.State,
URL: n.URL,
HeadRefName: n.HeadRefName,
Expand Down
8 changes: 0 additions & 8 deletions internal/github/mock_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package github
// ClientOps method call. When nil, a reasonable default is returned.
type MockClient struct {
FindPRForBranchFn func(string) (*PullRequest, error)
FindAnyPRForBranchFn func(string) (*PullRequest, error)
FindPRByNumberFn func(int) (*PullRequest, error)
FindPRDetailsForBranchFn func(string) (*PRDetails, error)
CreatePRFn func(string, string, string, string, bool) (*PullRequest, error)
Expand All @@ -27,13 +26,6 @@ func (m *MockClient) FindPRForBranch(branch string) (*PullRequest, error) {
return nil, nil
}

func (m *MockClient) FindAnyPRForBranch(branch string) (*PullRequest, error) {
if m.FindAnyPRForBranchFn != nil {
return m.FindAnyPRForBranchFn(branch)
}
return nil, nil
}

func (m *MockClient) FindPRByNumber(number int) (*PullRequest, error) {
if m.FindPRByNumberFn != nil {
return m.FindPRByNumberFn(number)
Expand Down
3 changes: 0 additions & 3 deletions internal/tui/stackview/data_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ func TestLoadBranchNodes_IgnoresStaleMergedPRDetails(t *testing.T) {
FindPRDetailsForBranchFn: func(branch string) (*ghapi.PRDetails, error) {
return &ghapi.PRDetails{
Number: 20,
Title: "Old merged PR",
State: "MERGED",
Merged: true,
}, nil
Expand Down Expand Up @@ -174,7 +173,6 @@ func TestLoadBranchNodes_ShowsTrackedMergedPRDetails(t *testing.T) {
FindPRDetailsForBranchFn: func(branch string) (*ghapi.PRDetails, error) {
return &ghapi.PRDetails{
Number: 20,
Title: "Legitimately merged PR",
State: "MERGED",
Merged: true,
}, nil
Expand Down Expand Up @@ -214,7 +212,6 @@ func TestLoadBranchNodes_ShowsOpenPRDetails(t *testing.T) {
FindPRDetailsForBranchFn: func(branch string) (*ghapi.PRDetails, error) {
return &ghapi.PRDetails{
Number: 50,
Title: "Active PR",
State: "OPEN",
}, nil
},
Expand Down