feat: upgrade go version

.github/workflows/golangci-lint.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.17
+          go-version: 1.19
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - name: go-setup
         uses: actions/setup-go@v5
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: install snapcraft
         run: |
           sudo apt-get update

.github/workflows/test-unit.yaml

@@ -10,7 +10,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.17
+          go-version: 1.19
 
       - name: Get dependencies
         run: |

.goreleaser.yml

@@ -54,7 +54,7 @@ brews:
   - repository:
       owner: lucassabreu
       name: homebrew-tap
-    folder: Formula
+    directory: Formula
     homepage: https://github.com/lucassabreu/clockify-cli
     description: Helps to interact with Clockfy's API
     test: |

CHANGELOG.md

@@ -11,10 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- more unit tests
+
 ### Changed
 
 - using throttle/ticket providing system to limit requests per second to the clockify's api to prevent the
     error message: `Too Many Requests (code: 429)`
+- upgrade go version to 1.19
 
 ## [v0.49.0] - 2024-03-29
 

CONTRIBUTING.md

@@ -24,7 +24,7 @@ size/complexity of it.
 ## Building the project
 
 Prerequisites:
-- Go 1.17+
+- Go 1.19+
 
 Run `make deps-install` to install the packages used by the project.
 

api/client.go

@@ -6,7 +6,6 @@
 	"fmt"
 	"net/http"
 	"net/url"
-	"reflect"
 	"regexp"
 	"strings"
 	"time"
@@ -347,27 +346,18 @@
 		return users, err
 	}
 
-	err = c.paginate(
+	users, err = paginate[dto.User](
+		c,
 		"GET",
 		fmt.Sprintf("v1/workspaces/%s/users", p.Workspace),
 		p.PaginationParam,
 		dto.WorkspaceUsersRequest{
 			Email: p.Email,
 		},
-		&users,
-		func(res interface{}) (int, error) {
-			if res == nil {
-				return 0, nil
-			}
-			ls := *res.(*[]dto.User)
-
-			users = append(users, ls...)
-			return len(ls), nil
-		},
 		"WorkspaceUsers",
 	)
 
-	return users, err
+	return
 }
 
 // PaginationParam parameters about pagination
@@ -449,36 +439,13 @@
 
 // GetUserTimeEntries will list the time entries of a user on a workspace, can be paginated
 func (c *client) GetUserTimeEntries(p GetUserTimeEntriesParam) ([]dto.TimeEntryImpl, error) {
-	var timeEntries []dto.TimeEntryImpl
-	var tes []dto.TimeEntryImpl
+	return getUserTimeEntriesImpl[dto.TimeEntryImpl](c, p, false)
 
-	err := c.getUserTimeEntriesImpl(p, false, &tes, func(res interface{}) (int, error) {
-		if res == nil {
-			return 0, nil
-		}
-
-		tes := res.(*[]dto.TimeEntryImpl)
-		timeEntries = append(timeEntries, *tes...)
-		return len(*tes), nil
-	})
-
-	return timeEntries, err
 }
 
 // GetUsersHydratedTimeEntries will list hydrated time entries of a user on a workspace, can be paginated
 func (c *client) GetUsersHydratedTimeEntries(p GetUserTimeEntriesParam) ([]dto.TimeEntry, error) {
-	var timeEntries []dto.TimeEntry
-	var tes []dto.TimeEntry
-
-	err := c.getUserTimeEntriesImpl(p, true, &tes, func(res interface{}) (int, error) {
-		if res == nil {
-			return 0, nil
-		}
-
-		tes := res.(*[]dto.TimeEntry)
-		timeEntries = append(timeEntries, *tes...)
-		return len(*tes), nil
-	})
+	timeEntries, err := getUserTimeEntriesImpl[dto.TimeEntry](c, p, true)
 
 	if err != nil {
 		return timeEntries, err
@@ -496,12 +463,11 @@
 	return timeEntries, err
 }
 
-func (c *client) getUserTimeEntriesImpl(
+func getUserTimeEntriesImpl[K dto.TimeEntry | dto.TimeEntryImpl](
+	c *client,
 	p GetUserTimeEntriesParam,
 	hydrated bool,
-	tmpl interface{},
-	reducer func(interface{}) (int, error),
-) (err error) {
+) (tes []K, err error) {
 	defer wrapError(&err, "get time entries from user \"%s\"", p.UserID)
 
 	ids := map[field]string{
@@ -510,11 +476,11 @@
 	}
 
 	if err := required(ids); err != nil {
-		return err
+		return tes, err
 	}
 
 	if err := checkIDs(ids); err != nil {
-		return err
+		return tes, err
 	}
 
 	inProgressFilter := "nil"
@@ -552,7 +518,8 @@
 		r.End = &dto.DateTime{Time: *p.End}
 	}
 
-	err = c.paginate(
+	tes, err = paginate[K](
+		c,
 		"GET",
 		fmt.Sprintf(
 			"v1/workspaces/%s/user/%s/time-entries",
@@ -561,22 +528,19 @@
 		),
 		p.PaginationParam,
 		r,
-		tmpl,
-		reducer,
 		"GetUserTimeEntries",
 	)
 
-	return err
+	return
 }
 
-func (c *client) paginate(
+func paginate[K any](
+	c *client,
 	method, uri string,
 	p PaginationParam,
 	request dto.PaginatedRequest,
-	bodyTempl interface{},
-	reducer func(interface{}) (int, error),
 	name string,
-) error {
+) ([]K, error) {
 	page := p.Page
 	if p.AllPages {
 		page = 1
@@ -586,6 +550,7 @@
 		p.PageSize = 50
 	}
 
+	var ls []K
 	stop := false
 	for !stop {
 		r, err := c.NewRequest(
@@ -594,24 +559,24 @@
 			request.WithPagination(page, p.PageSize),
 		)
 		if err != nil {
-			return err
+			return ls, err
 		}
 
-		response := reflect.New(reflect.TypeOf(bodyTempl).Elem()).Interface()
+		var response []K
 		_, err = c.Do(r, &response, name)
 		if err != nil {
-			return err
+			return ls, err
 		}
 
-		count, err := reducer(response)
-		if err != nil {
-			return err
+		count := len(response)
+		if count > 0 {
+			ls = append(ls, response...)
 		}
 
 		stop = count < p.PageSize || !p.AllPages
 		page++
 	}
-	return nil
+	return ls, nil
 }
 
 // GetTimeEntryInProgressParam params to query entries
@@ -878,8 +843,6 @@
 
 // GetTasks get tasks of a project
 func (c *client) GetTasks(p GetTasksParam) (ps []dto.Task, err error) {
-	var tmpl []dto.Task
-
 	defer wrapError(&err, "get tasks from project \"%s\"", p.ProjectID)
 
 	ids := map[field]string{
@@ -895,7 +858,8 @@
 		return ps, err
 	}
 
-	err = c.paginate(
+	ps, err = paginate[dto.Task](
+		c,
 		"GET",
 		fmt.Sprintf(
 			"v1/workspaces/%s/projects/%s/tasks",
@@ -907,16 +871,6 @@
 			Name:   p.Name,
 			Active: p.Active,
 		},
-		&tmpl,
-		func(res interface{}) (int, error) {
-			if res == nil {
-				return 0, nil
-			}
-			ls := *res.(*[]dto.Task)
-
-			ps = append(ps, ls...)
-			return len(ls), nil
-		},
 		"GetTasks",
 	)
 	return ps, err
@@ -1210,12 +1164,12 @@
 // GetTags get all tags of a workspace
 func (c *client) GetTags(p GetTagsParam) (ps []dto.Tag, err error) {
 	defer wrapError(&err, "get tags")
-	var tmpl []dto.Tag
 	if err = checkWorkspace(p.Workspace); err != nil {
 		return ps, err
 	}
 
-	err = c.paginate(
+	ps, err = paginate[dto.Tag](
+		c,
 		"GET",
 		fmt.Sprintf(
 			"v1/workspaces/%s/tags",
@@ -1226,16 +1180,6 @@
 			Name:     p.Name,
 			Archived: p.Archived,
 		},
-		&tmpl,
-		func(res interface{}) (int, error) {
-			if res == nil {
-				return 0, nil
-			}
-			ls := *res.(*[]dto.Tag)
-
-			ps = append(ps, ls...)
-			return len(ls), nil
-		},
 		"GetTags",
 	)
 	return ps, err
@@ -1255,12 +1199,12 @@
 	clients []dto.Client, err error) {
 	defer wrapError(&err, "get clients")
 
-	var tmpl []dto.Client
 	if err = checkWorkspace(p.Workspace); err != nil {
 		return clients, err
 	}
 
-	err = c.paginate(
+	clients, err = paginate[dto.Client](
+		c,
 		"GET",
 		fmt.Sprintf(
 			"v1/workspaces/%s/clients",
@@ -1271,19 +1215,11 @@
 			Name:     p.Name,
 			Archived: p.Archived,
 		},
-		&tmpl,
-		func(res interface{}) (int, error) {
-			if res == nil {
-				return 0, nil
-			}
-			ls := *res.(*[]dto.Client)
 
-			clients = append(clients, ls...)
-			return len(ls), nil
-		},
 		"GetClients",
 	)
-	return clients, err
+
+	return
 }
 
 type AddClientParam struct {
@@ -1342,12 +1278,12 @@
 func (c *client) GetProjects(p GetProjectsParam) (ps []dto.Project, err error) {
 	defer wrapError(&err, "get projects")
 
-	var tmpl []dto.Project
 	if err = checkWorkspace(p.Workspace); err != nil {
 		return ps, err
 	}
 
-	err = c.paginate(
+	ps, err = paginate[dto.Project](
+		c,
 		"GET",
 		fmt.Sprintf(
 			"v1/workspaces/%s/projects",
@@ -1360,16 +1296,6 @@
 			Clients:  p.Clients,
 			Hydrated: p.Hydrate,
 		},
-		&tmpl,
-		func(res interface{}) (int, error) {
-			if res == nil {
-				return 0, nil
-			}
-			ls := *res.(*[]dto.Project)
-
-			ps = append(ps, ls...)
-			return len(ls), nil
-		},
 		"GetProjects",
 	)
 

api/dto/request.go

@@ -406,7 +406,10 @@ func (r GetTagsRequest) AppendToQuery(u *url.URL) *url.URL {
 	u = r.pagination.AppendToQuery(u)
 
 	v := u.Query()
-	v.Add("name", r.Name)
+	if r.Name != "" {
+		v.Add("name", r.Name)
+	}
+
 	if r.Archived != nil {
 		v.Add("archived", boolString[*r.Archived])
 	}