From 887f041db018fa2259494c1240d6fc795560bcbe Mon Sep 17 00:00:00 2001
From: Daichi Kudo <45157831+kudoas@users.noreply.github.com>
Date: Sat, 24 Aug 2024 11:46:38 +0900
Subject: [PATCH] fix: unwrap error  (#61)

* refactor: error scope

* feat: add error unwrap func
---
 config/env.go        | 20 ++++++++++++--------
 infra/github/repo.go | 13 +++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/config/env.go b/config/env.go
index 14b18ea..717f55a 100644
--- a/config/env.go
+++ b/config/env.go
@@ -20,14 +20,6 @@ var (
 	issue      = os.Getenv("INPUT_ISSUE")
 )
 
-type EnvInvalidError struct {
-	message string
-}
-
-func (e *EnvInvalidError) Error() string {
-	return fmt.Sprintf("environment variable invalid error: %v", e.message)
-}
-
 func ProvideEnv() (*Env, error) {
 	r := strings.Split(repository, "/")
 	var (
@@ -73,3 +65,15 @@ func (e *Env) RepoName() string {
 func (e *Env) IssueNumber() int {
 	return e.issueNumber
 }
+
+type EnvInvalidError struct {
+	message string
+}
+
+func (e *EnvInvalidError) Error() string {
+	return fmt.Sprintf("environment variable invalid error: %v", e.message)
+}
+
+func (e *EnvInvalidError) Unwrap() error {
+	return e
+}
diff --git a/infra/github/repo.go b/infra/github/repo.go
index 6764cae..0b4f6c6 100644
--- a/infra/github/repo.go
+++ b/infra/github/repo.go
@@ -17,15 +17,12 @@ func (g *githubClient) GetTrackedIssueNodeIDs(q *QueryRequest) ([]githubv4.ID, e
 			} `graphql:"issue(number: $issueNumber)"`
 		} `graphql:"repository(owner: $repositoryOwner, name: $repositoryName)"`
 	}
-
 	variables := map[string]interface{}{
 		"repositoryOwner": githubv4.String(q.RepositoryOwner),
 		"repositoryName":  githubv4.String(q.RepositoryName),
 		"issueNumber":     githubv4.Int(q.IssueNumber),
 	}
-
-	err := g.client.Query(g.context, &query, variables)
-	if err != nil {
+	if err := g.client.Query(g.context, &query, variables); err != nil {
 		return nil, err
 	}
 
@@ -44,15 +41,12 @@ func (g *githubClient) GetIssueNodeID(q *QueryRequest) (githubv4.ID, error) {
 			} `graphql:"issue(number: $issueNumber)"`
 		} `graphql:"repository(owner: $repositoryOwner, name: $repositoryName)"`
 	}
-
 	variables := map[string]interface{}{
 		"repositoryOwner": githubv4.String(q.RepositoryOwner),
 		"repositoryName":  githubv4.String(q.RepositoryName),
 		"issueNumber":     githubv4.Int(q.IssueNumber),
 	}
-
-	err := g.client.Query(g.context, &query, variables)
-	if err != nil {
+	if err := g.client.Query(g.context, &query, variables); err != nil {
 		return nil, err
 	}
 
@@ -136,8 +130,7 @@ func (g *githubClient) MutateIssue(input githubv4.UpdateIssueInput) error {
 		} `graphql:"updateIssue(input: $input)"`
 	}
 
-	err := g.client.Mutate(g.context, &mutation, input, nil)
-	if err != nil {
+	if err := g.client.Mutate(g.context, &mutation, input, nil); err != nil {
 		return err
 	}