fix github pullrequest creation error

Author: kromiii

cmd/unleash-checker-ai/main.go

@@ -37,20 +37,34 @@ func main() {
 	}
 
 	targetFolder := os.Args[1]
-	removedFlags, err := finder.FindAndReplaceFlags(targetFolder, staleFlags, cfg.OpenAIAPIKey)
+	changedFiles, removedFlags, err := finder.FindAndReplaceFlags(targetFolder, staleFlags, cfg.OpenAIAPIKey)
 	if err != nil {
 		fmt.Printf("Error finding affected files: %v\n", err)
 		os.Exit(1)
 	}
 
 	summary := report.CreateSummary(staleFlags, removedFlags)
 
+	// chanedFilesに変更がない場合は終了
+	if len(changedFiles) == 0 {
+		fmt.Println("No changes required")
+		return
+	}
+
 	// Create GitHub client
 	githubClient := github.NewClient(cfg.GitHubToken, cfg.GitHubOwner, cfg.GitHubRepo)
 
-	// Create pull request
+	// Commit changes
 	ctx := context.Background()
-	pr, err := githubClient.CreatePullRequest(ctx, "Update stale Unleash flags", summary, "unleash-checker-updates", "main")
+	branchName := "unleash-checker-updates"
+	err = githubClient.CommitChanges(ctx, branchName, "Update stale Unleash flags", changedFiles)
+	if err != nil {
+		fmt.Printf("Error committing changes: %v\n", err)
+		os.Exit(1)
+	}
+
+	// Create pull request
+	pr, err := githubClient.CreatePullRequest(ctx, "Update stale Unleash flags", summary, branchName, "main")
 	if err != nil {
 		fmt.Printf("Error creating pull request: %v\n", err)
 		os.Exit(1)

internal/finder/finder.go

@@ -8,26 +8,33 @@ import (
 	"github.com/kromiii/unleash-checker-ai/internal/modifier"
 )
 
-func FindAndReplaceFlags(root string, flags []string, apiKey string) ([]string, error) {
+func FindAndReplaceFlags(root string, flags []string, apiKey string) ([]string, []string, error) {
 	removedFlags := []string{}
+	changedFiles := []string{}
 
 	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
+			if err != nil {
+					return err
+			}
+			if info.IsDir() {
+					return nil
+			}
+			if isFlagUsedInFile(path, flags) {
+					modifier := modifier.NewModifier(apiKey)
+					currentRemovedFlags, err := modifier.ModifyFile(path, flags) // 新しい変数で削除されたフラグを受け取る
+					if err != nil {
+							return err
+					}
+					for _, flag := range currentRemovedFlags {
+						if !contains(removedFlags, flag) {
+								removedFlags = append(removedFlags, flag)
+						}
+					}
+					changedFiles = append(changedFiles, path)
+			}
 			return nil
-		}
-		if isFlagUsedInFile(path, flags) {
-			modifier := modifier.NewModifier(apiKey)
-			removedFlags, err = modifier.ModifyFile(path, flags)
-            if err != nil {
-                return err
-            }
-		}
-		return nil
 	})
-	return removedFlags, err
+	return changedFiles, removedFlags, err
 }
 
 func isFlagUsedInFile(path string, flags []string) bool {
@@ -52,3 +59,12 @@ func isFlagUsedInFile(path string, flags []string) bool {
 
 	return false
 }
+
+func contains(slice []string, str string) bool {
+	for _, v := range slice {
+			if v == str {
+					return true
+			}
+	}
+	return false
+}

internal/github/github.go

@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/google/go-github/v38/github"
 	"golang.org/x/oauth2"
@@ -29,18 +30,113 @@ func NewClient(token, owner, repo string) *Client {
 	}
 }
 
+func (c *Client) CommitChanges(ctx context.Context, branch, message string, files []string) error {
+	// Get the current commit SHA
+	ref, _, err := c.client.Git.GetRef(ctx, c.owner, c.repo, "refs/heads/"+branch)
+	if err != nil {
+		return fmt.Errorf("error getting ref: %v", err)
+	}
+
+	// Create a tree with the updated files
+	var entries []*github.TreeEntry
+	for _, file := range files {
+		content, err := os.ReadFile(file)
+		if err != nil {
+			return fmt.Errorf("error reading file %s: %v", file, err)
+		}
+
+		entries = append(entries, &github.TreeEntry{
+			Path:    github.String(file),
+			Mode:    github.String("100644"),
+			Type:    github.String("blob"),
+			Content: github.String(string(content)),
+		})
+	}
+
+	tree, _, err := c.client.Git.CreateTree(ctx, c.owner, c.repo, *ref.Object.SHA, entries)
+	if err != nil {
+		return fmt.Errorf("error creating tree: %v", err)
+	}
+
+	// Create a new commit
+	parent, _, err := c.client.Repositories.GetCommit(ctx, c.owner, c.repo, *ref.Object.SHA, nil)
+	if err != nil {
+		return fmt.Errorf("error getting parent commit: %v", err)
+	}
+
+	commit, _, err := c.client.Git.CreateCommit(ctx, c.owner, c.repo, &github.Commit{
+		Message: github.String(message),
+		Tree:    tree,
+		Parents: []*github.Commit{{SHA: parent.SHA}},
+	})
+	if err != nil {
+		return fmt.Errorf("error creating commit: %v", err)
+	}
+
+	// Update the reference
+	_, _, err = c.client.Git.UpdateRef(ctx, c.owner, c.repo, &github.Reference{
+		Ref:    github.String("refs/heads/" + branch),
+		Object: &github.GitObject{SHA: commit.SHA},
+	}, false)
+	if err != nil {
+		return fmt.Errorf("error updating ref: %v", err)
+	}
+
+	return nil
+}
+
 func (c *Client) CreatePullRequest(ctx context.Context, title, body, head, base string) (*github.PullRequest, error) {
-	newPR := &github.NewPullRequest{
-		Title: github.String(title),
-		Body:  github.String(body),
-		Head:  github.String(head),
-		Base:  github.String(base),
+	// Check if the branch exists
+	_, _, err := c.client.Repositories.GetBranch(ctx, c.owner, c.repo, head, false)
+	if err != nil {
+		// Branch doesn't exist, create it
+		ref, _, err := c.client.Git.GetRef(ctx, c.owner, c.repo, "refs/heads/"+base)
+		if err != nil {
+			return nil, fmt.Errorf("error getting base branch ref: %v", err)
+		}
+
+		newRef := &github.Reference{
+			Ref:    github.String("refs/heads/" + head),
+			Object: &github.GitObject{SHA: ref.Object.SHA},
+		}
+
+		_, _, err = c.client.Git.CreateRef(ctx, c.owner, c.repo, newRef)
+		if err != nil {
+			return nil, fmt.Errorf("error creating new branch: %v", err)
+		}
 	}
 
-	pr, _, err := c.client.PullRequests.Create(ctx, c.owner, c.repo, newPR)
+	// 既存のプルリクエストを検索
+	opts := &github.PullRequestListOptions{
+		State: "open",
+		Head:  fmt.Sprintf("%s:%s", c.owner, head),
+		Base:  base,
+	}
+	prs, _, err := c.client.PullRequests.List(ctx, c.owner, c.repo, opts)
 	if err != nil {
-		return nil, fmt.Errorf("error creating pull request: %v", err)
+		return nil, fmt.Errorf("error listing pull requests: %v", err)
 	}
 
-	return pr, nil
+	// 該当するプルリクエストが見つかった場合、更新を行う
+	if len(prs) > 0 {
+		pr := prs[0] // 最初のプルリクエストを対象とする
+		pr.Title = github.String(title)
+		pr.Body = github.String(body)
+		return pr, nil
+	} else {
+		// 該当するプルリクエストがない場合、新しいプルリクエストを作成
+		newPR := &github.NewPullRequest{
+				Title: github.String(title),
+				Body:  github.String(body),
+				Head:  github.String(head),
+				Base:  github.String(base),
+		}
+
+		pr, _, err := c.client.PullRequests.Create(ctx, c.owner, c.repo, newPR)
+		if err != nil {
+				return nil, fmt.Errorf("error creating pull request: %v", err)
+		}
+
+		return pr, nil
+	}
 }