Remove named returns

This commit is contained in:
Ian Gulliver
2021-09-24 05:15:25 +00:00
parent f8e358f0f4
commit 7e41573bb1
4 changed files with 29 additions and 19 deletions

View File

@@ -17,15 +17,17 @@ type projectsResponse struct {
NextPage *nextPage `json:"next_page"` 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) path := fmt.Sprintf("workspaces/%s/projects", wc.workspace.GID)
values := &url.Values{} values := &url.Values{}
for { for {
resp := &projectsResponse{} resp := &projectsResponse{}
err = wc.client.get(path, values, resp) err := wc.client.get(path, values, resp)
if err != nil { if err != nil {
return return nil, err
} }
ret = append(ret, resp.Data...) ret = append(ret, resp.Data...)
@@ -37,7 +39,7 @@ func (wc *WorkspaceClient) GetProjects() (ret []*Project, err error) {
values.Set("offset", resp.NextPage.Offset) values.Set("offset", resp.NextPage.Offset)
} }
return return ret, nil
} }
func (p *Project) String() string { func (p *Project) String() string {

View File

@@ -21,15 +21,17 @@ type sectionAddTaskRequest struct {
Data *sectionAddTaskData `json:"data"` 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) path := fmt.Sprintf("projects/%s/sections", project.GID)
values := &url.Values{} values := &url.Values{}
for { for {
resp := &sectionsResponse{} resp := &sectionsResponse{}
err = wc.client.get(path, values, resp) err := wc.client.get(path, values, resp)
if err != nil { if err != nil {
return return nil, err
} }
ret = append(ret, resp.Data...) 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) values.Set("offset", resp.NextPage.Offset)
} }
return return ret, nil
} }
func (wc *WorkspaceClient) GetSectionsByName(project *Project) (map[string]*Section, error) { 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 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) path := fmt.Sprintf("sections/%s/tasks", section.GID)
values := &url.Values{} values := &url.Values{}
for { for {
resp := &tasksResponse{} resp := &tasksResponse{}
err = wc.client.get(path, values, resp) err := wc.client.get(path, values, resp)
if err != nil { if err != nil {
return return nil, err
} }
ret = append(ret, resp.Data...) ret = append(ret, resp.Data...)
@@ -110,7 +114,7 @@ func (wc *WorkspaceClient) GetTasksFromSection(section *Section) (ret []*Task, e
values.Set("offset", resp.NextPage.Offset) values.Set("offset", resp.NextPage.Offset)
} }
return return ret, nil
} }
func (s *Section) String() string { func (s *Section) String() string {

View File

@@ -13,7 +13,9 @@ type tagsResponse struct {
NextPage *nextPage `json:"next_page"` 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) path := fmt.Sprintf("workspaces/%s/tags", wc.workspace.GID)
values := &url.Values{} values := &url.Values{}
@@ -21,7 +23,7 @@ func (wc *WorkspaceClient) GetTags() (ret []*Tag, err error) {
resp := &tagsResponse{} resp := &tagsResponse{}
err := wc.client.get(path, values, resp) err := wc.client.get(path, values, resp)
if err != nil { if err != nil {
return return nil, err
} }
ret = append(ret, resp.Data...) ret = append(ret, resp.Data...)
@@ -33,7 +35,7 @@ func (wc *WorkspaceClient) GetTags() (ret []*Tag, err error) {
values.Set("offset", resp.NextPage.Offset) values.Set("offset", resp.NextPage.Offset)
} }
return return ret, nil
} }
func (wc *WorkspaceClient) GetTagsByName() (map[string]*Tag, error) { func (wc *WorkspaceClient) GetTagsByName() (map[string]*Tag, error) {

View File

@@ -25,14 +25,16 @@ func (c *Client) InWorkspace(name string) (*WorkspaceClient, error) {
}, nil }, nil
} }
func (c *Client) GetWorkspaces() (ret []*Workspace, err error) { func (c *Client) GetWorkspaces() ([]*Workspace, error) {
ret := []*Workspace{}
values := &url.Values{} values := &url.Values{}
for { for {
resp := &workspacesResponse{} resp := &workspacesResponse{}
err = c.get("workspaces", values, resp) err := c.get("workspaces", values, resp)
if err != nil { if err != nil {
return return nil, err
} }
ret = append(ret, resp.Data...) ret = append(ret, resp.Data...)
@@ -44,7 +46,7 @@ func (c *Client) GetWorkspaces() (ret []*Workspace, err error) {
values.Set("offset", resp.NextPage.Offset) values.Set("offset", resp.NextPage.Offset)
} }
return return ret, nil
} }
func (c *Client) GetWorkspaceByName(name string) (*Workspace, error) { func (c *Client) GetWorkspaceByName(name string) (*Workspace, error) {