cleanup on formatJSON func

fantasticrabbit · Nov 14, 2021 · df079a5 · df079a5
1 parent 9e8ec07
commit df079a5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/cmd/getlist.go b/cmd/getlist.go
@@ -30,7 +30,7 @@ var listCmd = &cobra.Command{
 			ListID:   string(args[0]),
 			Subtasks: viper.GetBool("subtasks"),
 		}
-		fmt.Println(string(l.GetJSON(l.BuildPath())))
+		fmt.Println(internal.FormatJSON(l.GetJSON(l.BuildPath())))
 	},
 }
 

diff --git a/cmd/gettask.go b/cmd/gettask.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"log"
 	"strings"
 
 	"github.com/fantasticrabbit/ClickupCLI/internal"
@@ -34,11 +33,8 @@ var taskCmd = &cobra.Command{
 			TeamID:     viper.GetString("team"),
 			Subtasks:   viper.GetBool("subtasks"),
 		}
-		x, err := internal.FormatJSON(string(t.GetJSON(t.BuildPath())))
-		if err != nil {
-			log.Fatalln(err)
-		}
-		fmt.Println(x, err)
+
+		fmt.Println(internal.FormatJSON(t.GetJSON(t.BuildPath())))
 	},
 }
 

diff --git a/internal/getlist.go b/internal/getlist.go
@@ -69,6 +69,6 @@ func (l ListRequest) BuildPath() string {
 }
 
 //GetJSON accepts an API path and returns byte payload of JSON data
-func (t ListRequest) GetJSON(apiPath string) []byte {
+func (t ListRequest) GetJSON(apiPath string) string {
 	return getJSON(apiPath)
 }
diff --git a/internal/gettask.go b/internal/gettask.go
@@ -23,6 +23,6 @@ func (t TaskRequest) BuildPath() string {
 }
 
 //GetJSON accepts an API path and returns byte payload of JSON data
-func (t TaskRequest) GetJSON(apiPath string) []byte {
+func (t TaskRequest) GetJSON(apiPath string) string {
 	return getJSON(apiPath)
 }
diff --git a/internal/requester.go b/internal/requester.go
@@ -30,7 +30,7 @@ func init() {
 }
 
 //Gets JSON data for any struct that implements Requester interface
-func getJSON(apiPath string) []byte {
+func getJSON(apiPath string) string {
 	req, _ := http.NewRequest(http.MethodGet, apiPath, nil)
 	req.Header.Add("Authorization", viper.GetString("token"))
 	req.Header.Add("Content-Type", "application/json")
@@ -40,13 +40,13 @@ func getJSON(apiPath string) []byte {
 	}
 	defer resp.Body.Close()
 	resp_body, _ := ioutil.ReadAll(resp.Body)
-	return resp_body
+	return string(resp_body)
 }
 
-func FormatJSON(str string) (string, error) {
+func FormatJSON(str string) string {
 	var formattedJSON bytes.Buffer
 	if err := json.Indent(&formattedJSON, []byte(str), "", "    "); err != nil {
-		return "", err
+		log.Fatalln(err)
 	}
-	return formattedJSON.String(), nil
+	return formattedJSON.String()
 }