added tests + refactor

Author: raf924

cmd/following.go

@@ -3,19 +3,11 @@ package cli
 import (
 	"fmt"
 	"github.com/spf13/cobra"
+	"github.com/thamaraiselvam/git-api-cli/cli/service"
 	"os"
 	"text/tabwriter"
 )
 
-//FollowingUser contains following user information
-type FollowingUser struct {
-	Name string `json:"login"`
-	URL  string `json:"html_url"`
-}
-
-//FollowingUserList stores a list of FollowingUser
-type FollowingUserList = []FollowingUser
-
 func followingCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "following <user name>",
@@ -28,15 +20,14 @@ func followingCmd() *cobra.Command {
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			config := createConfig()
-			getFollowingList(config, args[0])
+			getFollowingList(args[0])
 		},
 	}
 }
 
-func getFollowingList(httpConfig HTTPConfig, name string) {
-	httpConfig.URL = fmt.Sprintf("%s/users/%s/following", httpConfig.BaseURL, name)
-	userInfoList, err := httpConfig.GetFollowing()
+func getFollowingList(name string) {
+	client := service.CreateClient(fmt.Sprintf("/users/%s/following", name))
+	userInfoList, err := client.GetFollowing()
 	if err != nil {
 		_ = fmt.Errorf("%v", err)
 		os.Exit(1)

cmd/service/service.go

@@ -13,6 +13,7 @@ const githubURL = "https://api.github.com"
 //Client is interface of service
 type Client interface {
 	GetUser() (types.UserInfo, error)
+	GetFollowing() (types.FollowingUserList, error)
 	GetFollowers() (types.Followers, error)
 }
 
@@ -62,14 +63,14 @@ func (config config) GetUser() (types.UserInfo, error) {
 }
 
 //GetFollowing get following user information from github.com
-func (config HTTPConfig) GetFollowing() (FollowingUserList, error) {
+func (config config) GetFollowing() (types.FollowingUserList, error) {
 	resp, err := makeRequest(http.MethodGet, config.URL, nil)
 	if err != nil {
-		return FollowingUserList{}, err
+		return types.FollowingUserList{}, err
 	}
-	userInfoList := make(FollowingUserList, 0)
+	userInfoList := make(types.FollowingUserList, 0)
 	if err := json.NewDecoder(resp.Body).Decode(&userInfoList); err != nil {
-		return FollowingUserList{}, fmt.Errorf("error decoding response %v", err)
+		return types.FollowingUserList{}, fmt.Errorf("error decoding response %v", err)
 	}
 
 	return userInfoList, nil

cmd/service/service_test.go

@@ -177,3 +177,51 @@ func Test_makeRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestHTTPConfig_GetFollowing(t *testing.T) {
+	t.Run("should return FollowingUserList on valid request", func(t *testing.T) {
+		gock.New(githubHost).
+			Get("/users/username/following").
+			Reply(200).
+			BodyString(`[{"login": "following", "html_url": "https://github.com/following"}]`)
+
+		expectedUserInfo := types.FollowingUserList{{
+			Name: "following",
+			URL:  "https://github.com/following",
+		}}
+
+		client := CreateClient("/users/username/following")
+
+		actualFollowingUserList, err := client.GetFollowing()
+
+		assert.NoError(t, err)
+		assert.Equal(t, expectedUserInfo, actualFollowingUserList)
+	})
+
+	t.Run("should return not found on invalid username", func(t *testing.T) {
+		gock.New(githubHost).
+			Get("/users/username/following").
+			Reply(404).
+			BodyString(`{}`)
+
+		client := CreateClient("/users/username/following")
+		_, err := client.GetFollowing()
+
+		assert.Error(t, err)
+		assert.Equal(t, "user not found", err.Error())
+	})
+
+	t.Run("should return error if response is not a valid json", func(t *testing.T) {
+		gock.New(githubHost).
+			Get("/users/username/following").
+			Reply(200).
+			BodyString(`string`)
+
+		client := CreateClient("/users/username/following")
+		_, err := client.GetFollowing()
+
+		assert.Error(t, err)
+		assert.Equal(t, "error decoding response invalid character 's' looking for beginning of value", err.Error())
+	})
+
+}

cmd/types/types.go

@@ -15,3 +15,12 @@ type follower struct {
 
 //Followers represents list of followers
 type Followers []follower
+
+//FollowingUser contains following user information
+type FollowingUser struct {
+	Name string `json:"login"`
+	URL  string `json:"html_url"`
+}
+
+//FollowingUserList stores a list of FollowingUser
+type FollowingUserList = []FollowingUser

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/golang/mock v1.3.1
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/h2non/gock.v1 v1.0.15
 )

go.sum

@@ -45,8 +45,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=