refactor(github): extract inlined-struct into the github package

This will make the code easier to understand and will give opportunity
for further refactoring.

Author: nobe4

internal/cmd/combine_prs.go

@@ -9,16 +9,10 @@ import (
 	"strings"
 
 	"github.com/cli/go-gh/v2/pkg/api"
+	"github.com/github/gh-combine/internal/github"
 )
 
-func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClient *api.RESTClient, owner, repo string, matchedPRs []struct {
-	Number  int
-	Title   string
-	Branch  string
-	Base    string
-	BaseSHA string
-},
-) error {
+func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClient *api.RESTClient, owner, repo string, matchedPRs github.Pulls) error {
 	// Define the combined branch name
 	workingBranchName := combineBranchName + workingBranchSuffix
 
@@ -61,19 +55,19 @@ func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClien
 	var combinedPRs []string
 	var mergeFailedPRs []string
 	for _, pr := range matchedPRs {
-		err := mergeBranch(ctx, restClient, owner, repo, workingBranchName, pr.Branch)
+		err := mergeBranch(ctx, restClient, owner, repo, workingBranchName, pr.Head.Ref)
 		if err != nil {
 			// Check if the error is a 409 merge conflict
 			if isMergeConflictError(err) {
 				// Log merge conflicts at DEBUG level
-				Logger.Debug("Merge conflict", "branch", pr.Branch, "error", err)
+				Logger.Debug("Merge conflict", "branch", pr.Head.Ref, "error", err)
 			} else {
 				// Log other errors at WARN level
-				Logger.Warn("Failed to merge branch", "branch", pr.Branch, "error", err)
+				Logger.Warn("Failed to merge branch", "branch", pr.Head.Ref, "error", err)
 			}
 			mergeFailedPRs = append(mergeFailedPRs, fmt.Sprintf("#%d", pr.Number))
 		} else {
-			Logger.Debug("Merged branch", "branch", pr.Branch)
+			Logger.Debug("Merged branch", "branch", pr.Head.Ref)
 			combinedPRs = append(combinedPRs, fmt.Sprintf("#%d - %s", pr.Number, pr.Title))
 		}
 	}

internal/cmd/root.go

@@ -9,6 +9,7 @@ import (
 	"github.com/cli/go-gh/v2/pkg/api"
 	"github.com/spf13/cobra"
 
+	"github.com/github/gh-combine/internal/github"
 	"github.com/github/gh-combine/internal/version"
 )
 
@@ -233,20 +234,7 @@ func processRepository(ctx context.Context, client *api.RESTClient, graphQlClien
 	}
 
 	// Get open PRs for the repository
-	var pulls []struct {
-		Number int
-		Title  string
-		Head   struct {
-			Ref string
-		}
-		Base struct {
-			Ref string
-			SHA string
-		}
-		Labels []struct {
-			Name string
-		}
-	}
+	var pulls github.Pulls
 
 	endpoint := fmt.Sprintf("repos/%s/%s/pulls?state=open", owner, repoName)
 	if err := client.Get(endpoint, &pulls); err != nil {
@@ -262,17 +250,8 @@ func processRepository(ctx context.Context, client *api.RESTClient, graphQlClien
 	}
 
 	// Filter PRs based on criteria
-	var matchedPRs []struct {
-		Number  int
-		Title   string
-		Branch  string
-		Base    string
-		BaseSHA string
-	}
-
+	var matchedPRs github.Pulls
 	for _, pull := range pulls {
-		branch := pull.Head.Ref
-
 		// Temporary workaround because passing structures is useless in this
 		// context.
 		// Eventually the []Labels should have better support.
@@ -282,7 +261,7 @@ func processRepository(ctx context.Context, client *api.RESTClient, graphQlClien
 		}
 
 		// Check if PR matches all filtering criteria
-		if !PrMatchesCriteria(branch, labels) {
+		if !PrMatchesCriteria(pull.Head.Ref, labels) {
 			continue
 		}
 
@@ -298,19 +277,7 @@ func processRepository(ctx context.Context, client *api.RESTClient, graphQlClien
 			continue
 		}
 
-		matchedPRs = append(matchedPRs, struct {
-			Number  int
-			Title   string
-			Branch  string
-			Base    string
-			BaseSHA string
-		}{
-			Number:  pull.Number,
-			Title:   pull.Title,
-			Branch:  branch,
-			Base:    pull.Base.Ref,
-			BaseSHA: pull.Base.SHA,
-		})
+		matchedPRs = append(matchedPRs, pull)
 	}
 
 	// Check if we have enough PRs to combine

internal/github/github.go

@@ -0,0 +1,22 @@
+package github
+
+type Ref struct {
+	Ref string `json:"ref"`
+	SHA string `json:"sha"`
+}
+
+type Label struct {
+	Name string `json:"name"`
+}
+
+type Labels []Label
+
+type Pull struct {
+	Number int    `json:"number"`
+	Title  string `json:"title"`
+	Head   Ref    `json:"head"`
+	Base   Ref    `json:"base"`
+	Labels Labels `json:"labels"`
+}
+
+type Pulls []Pull