Isolate method

Author: vanilevsky

cmd/description/main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"strings"
 	"syscall"
 
 	"github.com/google/go-github/v51/github"
@@ -30,13 +29,7 @@ var opts struct {
 	ShortcutBaseURL string `long:"shortcut-url" env:"SHORTCUT_URL" description:"Shortcut URL. Example: https://app.shortcut.com/foo"`
 }
 
-type prDataType struct {
-	completion   string
-	jiraInfo     string
-	shortcutInfo string
-}
-
-var prData prDataType
+var descriptionInfo description.Info
 
 func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
@@ -68,7 +61,7 @@ func run(ctx context.Context) error {
 		return fmt.Errorf("error getting commits: %w", err)
 	}
 
-	prData.completion, err = description.GenerateCompletion(ctx, openAIClient, diff, pr)
+	descriptionInfo.Completion, err = description.GenerateCompletion(ctx, openAIClient, diff, pr)
 	if err != nil {
 		return fmt.Errorf("error generating completion: %w", err)
 	}
@@ -79,12 +72,12 @@ func run(ctx context.Context) error {
 		if err != nil {
 			fmt.Printf("Error extracting Jira ticket ID: %v \n", err)
 		} else {
-			prData.jiraInfo = fmt.Sprintf("### JIRA ticket: [%s](%s)", id, jira.GenerateJiraTicketURL(opts.JiraURL, id))
+			descriptionInfo.JiraInfo = fmt.Sprintf("### JIRA ticket: [%s](%s)", id, jira.GenerateJiraTicketURL(opts.JiraURL, id))
 		}
 	}
 
 	if opts.ShortcutBaseURL != "" {
-		prData.shortcutInfo = buildShortcutContent(opts.ShortcutBaseURL, pr)
+		descriptionInfo.ShortcutInfo = buildShortcutContent(opts.ShortcutBaseURL, pr)
 	}
 
 	if opts.Test {
@@ -93,8 +86,8 @@ func run(ctx context.Context) error {
 
 	// Update the pull request description
 	fmt.Println("Updating pull request")
-	updatePr := buildUpdatedDescription(*pr.Body, prData)
-	if _, err = githubClient.UpdatePullRequest(ctx, opts.Owner, opts.Repo, opts.PRNumber, updatePr); err != nil {
+	updatedPr := description.BuildUpdatedPullRequest(*pr.Body, descriptionInfo)
+	if _, err = githubClient.UpdatePullRequest(ctx, opts.Owner, opts.Repo, opts.PRNumber, updatedPr); err != nil {
 		return fmt.Errorf("error updating pull request: %w", err)
 	}
 
@@ -118,32 +111,3 @@ func buildShortcutContent(shortcutBaseURL string, pr *github.PullRequest) string
 
 	return fmt.Sprintf("### Shortcut story: [%s](%s)", id, shortcut.GenerateShortcutStoryURL(shortcutBaseURL, id))
 }
-
-func buildUpdatedDescription(existingBody string, prData prDataType) *github.PullRequest {
-
-	desc := ""
-
-	if prData.jiraInfo != "" {
-		desc = prData.jiraInfo + "\n\n" + desc
-	}
-
-	if prData.shortcutInfo != "" {
-		desc = prData.shortcutInfo + "\n\n" + desc
-	}
-
-	if prData.completion != "" {
-		desc += prData.completion
-	}
-
-	if existingBody != "" && strings.Contains(existingBody, description.Placeholder) {
-		builtBody := strings.Replace(
-			existingBody,
-			description.Placeholder,
-			description.PlaceholderHidden+desc,
-			1,
-		)
-		return &github.PullRequest{Body: github.String(builtBody)}
-	}
-
-	return &github.PullRequest{Body: github.String(desc)}
-}

description/description.go

@@ -3,18 +3,21 @@ package description
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/google/go-github/v51/github"
 	"github.com/sashabaranov/go-openai"
 
 	oAIClient "github.com/ravilushqa/gpt-pullrequest-updater/openai"
 )
 
-const Placeholder = "gpt-updater:description"
-const PlaceholderHidden = `<!--
-gpt-updater:description
--->
-`
+const placeholder = "gpt-updater:description"
+
+type Info struct {
+	Completion   string
+	JiraInfo     string
+	ShortcutInfo string
+}
 
 func GenerateCompletion(ctx context.Context, client *oAIClient.Client, diff *github.CommitsComparison, pr *github.PullRequest) (string, error) {
 	sumDiffs := calculateSumDiffs(diff)
@@ -30,6 +33,35 @@ func GenerateCompletion(ctx context.Context, client *oAIClient.Client, diff *git
 	return completion, err
 }
 
+func BuildUpdatedPullRequest(existingDescription string, info Info) *github.PullRequest {
+
+	desc := ""
+
+	if info.JiraInfo != "" {
+		desc = info.JiraInfo + "\n\n" + desc
+	}
+
+	if info.ShortcutInfo != "" {
+		desc = info.ShortcutInfo + "\n\n" + desc
+	}
+
+	if info.Completion != "" {
+		desc += info.Completion
+	}
+
+	if existingDescription != "" && strings.Contains(existingDescription, placeholder) {
+		builtBody := strings.Replace(
+			existingDescription,
+			placeholder,
+			fmt.Sprintf("## 🤖 gpt-updater description\n<!--\n%s\n-->\n%s", placeholder, desc),
+			1,
+		)
+		return &github.PullRequest{Body: github.String(builtBody)}
+	}
+
+	return &github.PullRequest{Body: github.String(desc)}
+}
+
 func calculateSumDiffs(diff *github.CommitsComparison) int {
 	sumDiffs := 0
 	for _, file := range diff.Files {