From 7e41573bb1c86cd51f0cdae20a68644789abdb39 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Fri, 24 Sep 2021 05:15:25 +0000 Subject: [PATCH] Remove named returns --- client/project.go | 10 ++++++---- client/section.go | 20 ++++++++++++-------- client/tag.go | 8 +++++--- client/workspace.go | 10 ++++++---- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/client/project.go b/client/project.go index 453a7e6..09aec1c 100644 --- a/client/project.go +++ b/client/project.go @@ -17,15 +17,17 @@ type projectsResponse struct { NextPage *nextPage `json:"next_page"` } -func (wc *WorkspaceClient) GetProjects() (ret []*Project, err error) { +func (wc *WorkspaceClient) GetProjects() ([]*Project, error) { + ret := []*Project{} + path := fmt.Sprintf("workspaces/%s/projects", wc.workspace.GID) values := &url.Values{} for { resp := &projectsResponse{} - err = wc.client.get(path, values, resp) + err := wc.client.get(path, values, resp) if err != nil { - return + return nil, err } ret = append(ret, resp.Data...) @@ -37,7 +39,7 @@ func (wc *WorkspaceClient) GetProjects() (ret []*Project, err error) { values.Set("offset", resp.NextPage.Offset) } - return + return ret, nil } func (p *Project) String() string { diff --git a/client/section.go b/client/section.go index 7a1a449..c9d60c2 100644 --- a/client/section.go +++ b/client/section.go @@ -21,15 +21,17 @@ type sectionAddTaskRequest struct { Data *sectionAddTaskData `json:"data"` } -func (wc *WorkspaceClient) GetSections(project *Project) (ret []*Section, err error) { +func (wc *WorkspaceClient) GetSections(project *Project) ([]*Section, error) { + ret := []*Section{} + path := fmt.Sprintf("projects/%s/sections", project.GID) values := &url.Values{} for { resp := §ionsResponse{} - err = wc.client.get(path, values, resp) + err := wc.client.get(path, values, resp) if err != nil { - return + return nil, err } ret = append(ret, resp.Data...) @@ -41,7 +43,7 @@ func (wc *WorkspaceClient) GetSections(project *Project) (ret []*Section, err er values.Set("offset", resp.NextPage.Offset) } - return + return ret, nil } func (wc *WorkspaceClient) GetSectionsByName(project *Project) (map[string]*Section, error) { @@ -90,15 +92,17 @@ func (wc *WorkspaceClient) AddTaskToSection(task *Task, section *Section) error return nil } -func (wc *WorkspaceClient) GetTasksFromSection(section *Section) (ret []*Task, err error) { +func (wc *WorkspaceClient) GetTasksFromSection(section *Section) ([]*Task, error) { + ret := []*Task{} + path := fmt.Sprintf("sections/%s/tasks", section.GID) values := &url.Values{} for { resp := &tasksResponse{} - err = wc.client.get(path, values, resp) + err := wc.client.get(path, values, resp) if err != nil { - return + return nil, err } ret = append(ret, resp.Data...) @@ -110,7 +114,7 @@ func (wc *WorkspaceClient) GetTasksFromSection(section *Section) (ret []*Task, e values.Set("offset", resp.NextPage.Offset) } - return + return ret, nil } func (s *Section) String() string { diff --git a/client/tag.go b/client/tag.go index e44a013..f656d52 100644 --- a/client/tag.go +++ b/client/tag.go @@ -13,7 +13,9 @@ type tagsResponse struct { NextPage *nextPage `json:"next_page"` } -func (wc *WorkspaceClient) GetTags() (ret []*Tag, err error) { +func (wc *WorkspaceClient) GetTags() ([]*Tag, error) { + ret := []*Tag{} + path := fmt.Sprintf("workspaces/%s/tags", wc.workspace.GID) values := &url.Values{} @@ -21,7 +23,7 @@ func (wc *WorkspaceClient) GetTags() (ret []*Tag, err error) { resp := &tagsResponse{} err := wc.client.get(path, values, resp) if err != nil { - return + return nil, err } ret = append(ret, resp.Data...) @@ -33,7 +35,7 @@ func (wc *WorkspaceClient) GetTags() (ret []*Tag, err error) { values.Set("offset", resp.NextPage.Offset) } - return + return ret, nil } func (wc *WorkspaceClient) GetTagsByName() (map[string]*Tag, error) { diff --git a/client/workspace.go b/client/workspace.go index e9e3b6c..421b1a7 100644 --- a/client/workspace.go +++ b/client/workspace.go @@ -25,14 +25,16 @@ func (c *Client) InWorkspace(name string) (*WorkspaceClient, error) { }, nil } -func (c *Client) GetWorkspaces() (ret []*Workspace, err error) { +func (c *Client) GetWorkspaces() ([]*Workspace, error) { + ret := []*Workspace{} + values := &url.Values{} for { resp := &workspacesResponse{} - err = c.get("workspaces", values, resp) + err := c.get("workspaces", values, resp) if err != nil { - return + return nil, err } ret = append(ret, resp.Data...) @@ -44,7 +46,7 @@ func (c *Client) GetWorkspaces() (ret []*Workspace, err error) { values.Set("offset", resp.NextPage.Offset) } - return + return ret, nil } func (c *Client) GetWorkspaceByName(name string) (*Workspace, error) {