refactor: Refactor code to include debug flag in List struct

masutaka · Nov 2, 2023 · 914b967 · 914b967
1 parent 55eb652
commit 914b967
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -18,13 +18,13 @@ var RootCmd = &cobra.Command{
 	Use:   "github-nippou",
 	Short: "Print today's your GitHub activity for issues and pull requests",
 	Run: func(cmd *cobra.Command, args []string) {
-		list, err := lib.NewListFromCLI(sinceDate, untilDate)
+		list, err := lib.NewListFromCLI(sinceDate, untilDate, debug)
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
 
-		lines, err := list.Collect(debug)
+		lines, err := list.Collect()
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)

diff --git a/lib/list.go b/lib/list.go
@@ -15,21 +15,23 @@ type List struct {
 	user           string
 	accessToken    string
 	settingsGistID string
+	debug          bool
 }
 
 // NewList returns a new List.
-func NewList(sinceDate, untilDate, user, accessToken, settingsGistID string) *List {
+func NewList(sinceDate, untilDate, user, accessToken, settingsGistID string, debug bool) *List {
 	return &List{
 		sinceDate:      sinceDate,
 		untilDate:      untilDate,
 		user:           user,
 		accessToken:    accessToken,
 		settingsGistID: settingsGistID,
+		debug:          debug,
 	}
 }
 
 // NewListFromCLI returns a new List from environment variables or git config.
-func NewListFromCLI(sinceDate, untilDate string) (*List, error) {
+func NewListFromCLI(sinceDate, untilDate string, debug bool) (*List, error) {
 	user, err := getUser()
 	if err != nil {
 		return nil, err
@@ -46,11 +48,12 @@ func NewListFromCLI(sinceDate, untilDate string) (*List, error) {
 		user:           user,
 		accessToken:    accessToken,
 		settingsGistID: settingsGistID,
+		debug:          debug,
 	}, nil
 }
 
 // Collect collects GitHub activities.
-func (l *List) Collect(debug bool) (string, error) {
+func (l *List) Collect() (string, error) {
 	sinceTime, err := getSinceTime(l.sinceDate)
 	if err != nil {
 		return "", err
@@ -64,15 +67,15 @@ func (l *List) Collect(debug bool) (string, error) {
 	ctx := context.Background()
 	client := getClient(ctx, l.accessToken)
 
-	events, err := NewEvents(ctx, client, l.user, sinceTime, untilTime, debug).Collect()
+	events, err := NewEvents(ctx, client, l.user, sinceTime, untilTime, l.debug).Collect()
 	if err != nil {
 		return "", err
 	}
 	var settings Settings
 	if err = settings.Init(l.settingsGistID, l.accessToken); err != nil {
 		return "", err
 	}
-	format := NewFormat(ctx, client, settings, debug)
+	format := NewFormat(ctx, client, settings, l.debug)
 
 	parallelNum, err := getParallelNum()
 	if err != nil {