refactor(fetch): return a list of entries instead of a pointer to a l…

…ist of entries
gabor-boros · Oct 8, 2021 · 000a6b7 · 000a6b7
1 parent 1a24535
commit 000a6b7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -182,7 +182,7 @@ func runRootCmd(_ *cobra.Command, _ []string) {
 	})
 	cobra.CheckErr(err)
 
-	wl := worklog.NewWorklog(*entries)
+	wl := worklog.NewWorklog(entries)
 	completeEntries := wl.CompleteEntries()
 	incompleteEntries := wl.IncompleteEntries()
 

diff --git a/internal/pkg/client/client.go b/internal/pkg/client/client.go
@@ -73,7 +73,7 @@ type Fetcher interface {
 	// FetchEntries from a given source and return the list of worklog items
 	// If the fetching resulted in an error, the list of worklog items will be
 	// nil and an error will return.
-	FetchEntries(ctx context.Context, opts *FetchOpts) (*[]worklog.Entry, error)
+	FetchEntries(ctx context.Context, opts *FetchOpts) ([]worklog.Entry, error)
 }
 
 // UploadOpts specifies the only options for the Uploader. In contrast to the

diff --git a/internal/pkg/client/clockify/clockify.go b/internal/pkg/client/clockify/clockify.go
@@ -83,7 +83,7 @@ type clockifyClient struct {
 	opts *ClientOpts
 }
 
-func (c clockifyClient) getSearchURL(user string, params *WorklogSearchParams) (string, error) {
+func (c *clockifyClient) getSearchURL(user string, params *WorklogSearchParams) (string, error) {
 	searchPath := fmt.Sprintf(PathWorklog, c.opts.Workspace, user)
 	worklogURL, err := url.Parse(c.opts.BaseURL + searchPath)
 	if err != nil {
@@ -102,7 +102,7 @@ func (c clockifyClient) getSearchURL(user string, params *WorklogSearchParams) (
 	return fmt.Sprintf("%s?%s", worklogURL.Path, worklogURL.Query().Encode()), nil
 }
 
-func (c clockifyClient) splitEntry(entry FetchEntry, bd time.Duration, ubd time.Duration) (*[]worklog.Entry, error) {
+func (c *clockifyClient) splitEntry(entry FetchEntry, bd time.Duration, ubd time.Duration) (*[]worklog.Entry, error) {
 	r, err := regexp.Compile(c.opts.TasksAsTagsRegex)
 	if err != nil {
 		return nil, err
@@ -146,7 +146,7 @@ func (c clockifyClient) splitEntry(entry FetchEntry, bd time.Duration, ubd time.
 	return &items, nil
 }
 
-func (c clockifyClient) FetchEntries(ctx context.Context, opts *client.FetchOpts) (*[]worklog.Entry, error) {
+func (c *clockifyClient) FetchEntries(ctx context.Context, opts *client.FetchOpts) ([]worklog.Entry, error) {
 	var items []worklog.Entry
 	currentPage := 1
 	pageSize := 100
@@ -224,7 +224,7 @@ func (c clockifyClient) FetchEntries(ctx context.Context, opts *client.FetchOpts
 		currentPage++
 	}
 
-	return &items, nil
+	return items, nil
 }
 
 // NewClient returns a new Clockify client.

diff --git a/internal/pkg/client/clockify/clockify_test.go b/internal/pkg/client/clockify/clockify_test.go
@@ -62,7 +62,7 @@ func TestClockifyClient_FetchEntries(t *testing.T) {
 	end := time.Date(2021, 10, 2, 23, 59, 59, 0, time.Local)
 	remainingCalls := 1
 
-	expectedEntries := &[]worklog.Entry{
+	expectedEntries := []worklog.Entry{
 		{
 			Client: worklog.IDNameField{
 				ID:   "456",
@@ -212,7 +212,7 @@ func TestClockifyClient_FetchEntries_TasksAsTags(t *testing.T) {
 	end := time.Date(2021, 10, 2, 23, 59, 59, 0, time.Local)
 	remainingCalls := 1
 
-	expectedEntries := &[]worklog.Entry{
+	expectedEntries := []worklog.Entry{
 		{
 			Client: worklog.IDNameField{
 				ID:   "456",

diff --git a/internal/pkg/client/tempo/tempo.go b/internal/pkg/client/tempo/tempo.go
@@ -71,7 +71,7 @@ type tempoClient struct {
 	opts *ClientOpts
 }
 
-func (c *tempoClient) FetchEntries(ctx context.Context, opts *client.FetchOpts) (*[]worklog.Entry, error) {
+func (c *tempoClient) FetchEntries(ctx context.Context, opts *client.FetchOpts) ([]worklog.Entry, error) {
 	searchParams := &SearchParams{
 		From:   opts.Start.Local().Format("2006-01-02"),
 		To:     opts.End.Local().Format("2006-01-02"),
@@ -111,7 +111,7 @@ func (c *tempoClient) FetchEntries(ctx context.Context, opts *client.FetchOpts)
 		})
 	}
 
-	return &items, nil
+	return items, nil
 }
 
 func (c *tempoClient) uploadEntry(ctx context.Context, item worklog.Entry, opts *client.UploadOpts, errChan chan error) {

diff --git a/internal/pkg/client/tempo/tempo_test.go b/internal/pkg/client/tempo/tempo_test.go
@@ -109,7 +109,7 @@ func TestTempoClient_FetchEntries(t *testing.T) {
 	clientUsername := "Thor"
 	clientPassword := "The strongest Avenger"
 
-	expectedEntries := &[]worklog.Entry{
+	expectedEntries := []worklog.Entry{
 		{
 			Client: worklog.IDNameField{
 				ID:   "My Awesome Company",