refactor cmd package into seperate packages per-service (#49)

* refactor cmd package into seperate packages per-service

* update test names

Co-authored-by: Lee Spottiswood <lee.spottiswood@ukfast.co.uk>

.gitignore

@@ -5,3 +5,4 @@
 /ukfast
 cover.out
 dist/
+__debug_bin

cmd/account/account.go

@@ -0,0 +1,22 @@
+package account
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/ukfast/cli/internal/pkg/factory"
+)
+
+func AccountRootCmd(f factory.ClientFactory) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "account",
+		Short: "Commands relating to Account service",
+	}
+
+	// Child root commands
+	cmd.AddCommand(accountContactRootCmd(f))
+	cmd.AddCommand(accountDetailsRootCmd(f))
+	cmd.AddCommand(accountCreditRootCmd(f))
+	cmd.AddCommand(accountInvoiceRootCmd(f))
+	cmd.AddCommand(accountInvoiceQueryRootCmd(f))
+
+	return cmd
+}

cmd/account_contact.go → cmd/account/account_contact.go

@@ -1,37 +1,38 @@
-package cmd
+package account
 
 import (
 	"errors"
 	"fmt"
 	"strconv"
 
 	"github.com/spf13/cobra"
+	"github.com/ukfast/cli/internal/pkg/factory"
 	"github.com/ukfast/cli/internal/pkg/helper"
 	"github.com/ukfast/cli/internal/pkg/output"
 	"github.com/ukfast/sdk-go/pkg/service/account"
 )
 
-func accountContactRootCmd() *cobra.Command {
+func accountContactRootCmd(f factory.ClientFactory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "contact",
 		Short: "sub-commands relating to contacts",
 	}
 
 	// Child commands
-	cmd.AddCommand(accountContactListCmd())
-	cmd.AddCommand(accountContactShowCmd())
+	cmd.AddCommand(accountContactListCmd(f))
+	cmd.AddCommand(accountContactShowCmd(f))
 
 	return cmd
 }
 
-func accountContactListCmd() *cobra.Command {
+func accountContactListCmd(f factory.ClientFactory) *cobra.Command {
 	return &cobra.Command{
 		Use:     "list",
 		Short:   "Lists contacts",
 		Long:    "This command lists contacts",
 		Example: "ukfast account contact list",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return accountContactList(getClient().AccountService(), cmd, args)
+			return accountContactList(f.NewClient().AccountService(), cmd, args)
 		},
 	}
 }
@@ -47,11 +48,10 @@ func accountContactList(service account.AccountService, cmd *cobra.Command, args
 		return fmt.Errorf("Error retrieving contacts: %s", err)
 	}
 
-	outputAccountContacts(contacts)
-	return nil
+	return output.CommandOutput(cmd, OutputAccountContactsProvider(contacts))
 }
 
-func accountContactShowCmd() *cobra.Command {
+func accountContactShowCmd(f factory.ClientFactory) *cobra.Command {
 	return &cobra.Command{
 		Use:     "show <contact: id>...",
 		Short:   "Shows a contact",
@@ -64,13 +64,13 @@ func accountContactShowCmd() *cobra.Command {
 
 			return nil
 		},
-		Run: func(cmd *cobra.Command, args []string) {
-			accountContactShow(getClient().AccountService(), cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return accountContactShow(f.NewClient().AccountService(), cmd, args)
 		},
 	}
 }
 
-func accountContactShow(service account.AccountService, cmd *cobra.Command, args []string) {
+func accountContactShow(service account.AccountService, cmd *cobra.Command, args []string) error {
 	var contacts []account.Contact
 	for _, arg := range args {
 		contactID, err := strconv.Atoi(arg)
@@ -88,5 +88,5 @@ func accountContactShow(service account.AccountService, cmd *cobra.Command, args
 		contacts = append(contacts, contact)
 	}
 
-	outputAccountContacts(contacts)
+	return output.CommandOutput(cmd, OutputAccountContactsProvider(contacts))
 }

cmd/account_contact_test.go → cmd/account/account_contact_test.go

@@ -1,4 +1,4 @@
-package cmd
+package account
 
 import (
 	"errors"
@@ -7,6 +7,7 @@ import (
 	gomock "github.com/golang/mock/gomock"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+	"github.com/ukfast/cli/internal/pkg/clierrors"
 	"github.com/ukfast/cli/test/mocks"
 	"github.com/ukfast/cli/test/test_output"
 	"github.com/ukfast/sdk-go/pkg/service/account"
@@ -24,21 +25,21 @@ func Test_accountContactList(t *testing.T) {
 		accountContactList(service, &cobra.Command{}, []string{})
 	})
 
-	t.Run("MalformedFlag_OutputsFatal", func(t *testing.T) {
+	t.Run("MalformedFlag_ReturnsError", func(t *testing.T) {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
 
 		service := mocks.NewMockAccountService(mockCtrl)
-		cmd := accountContactListCmd()
+		cmd := accountContactListCmd(nil)
 		cmd.Flags().StringArray("filter", []string{"invalidfilter"}, "")
 
 		err := accountContactList(service, cmd, []string{})
 
 		assert.NotNil(t, err)
-		assert.Equal(t, "Missing value for filtering", err.Error())
+		assert.IsType(t, &clierrors.ErrInvalidFlagValue{}, err)
 	})
 
-	t.Run("GetContactsError_OutputsFatal", func(t *testing.T) {
+	t.Run("GetContactsError_ReturnsError", func(t *testing.T) {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
 
@@ -55,13 +56,13 @@ func Test_accountContactList(t *testing.T) {
 
 func Test_accountContactShowCmd_Args(t *testing.T) {
 	t.Run("ValidArgs_NoError", func(t *testing.T) {
-		err := accountContactShowCmd().Args(nil, []string{"123"})
+		err := accountContactShowCmd(nil).Args(nil, []string{"123"})
 
 		assert.Nil(t, err)
 	})
 
 	t.Run("InvalidArgs_Error", func(t *testing.T) {
-		err := accountContactShowCmd().Args(nil, []string{})
+		err := accountContactShowCmd(nil).Args(nil, []string{})
 
 		assert.NotNil(t, err)
 		assert.Equal(t, "Missing contact", err.Error())