Updating GetProjects, GetResults, GetResultsForCase, GetRuns, GetSect…

…ions to support pagination
educlos · Sep 10, 2021 · 8cb37b9 · 8cb37b9
1 parent 2287ca0
commit 8cb37b9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/client.go b/client.go
@@ -114,8 +114,8 @@ func (c *Client) sendRequest(method, uri string, data, v interface{}) error {
 }
 
 type Links struct {
-	Next string `json:"next"`
-	Prev string `json:"prev"`
+	Next *string `json:"next"`
+	Prev *string `json:"prev"`
 }
 
 func (c *Client) sendRequestBeta(method, uri string, data, v interface{}, itemsKeyName string) error {
@@ -134,8 +134,8 @@ func (c *Client) sendRequestBeta(method, uri string, data, v interface{}, itemsK
 
 	returnItems = tempItems
 
-	for err == nil && links.Next != "" && len(tempItems) == 250 {
-		nextUri := strings.TrimPrefix(links.Next, "/api/v2/")
+	for err == nil && links.Next != nil {
+		nextUri := strings.TrimPrefix(*links.Next, "/api/v2/")
 		err = c.sendRequest("GET", nextUri, nil, &wraperMap)
 		if err == nil {
 			json.Unmarshal(wraperMap[itemsKeyName], &tempItems)

diff --git a/project.go b/project.go
@@ -41,7 +41,12 @@ func (c *Client) GetProjects(isCompleted ...bool) ([]Project, error) {
 	}
 
 	returnProjects := []Project{}
-	err := c.sendRequest("GET", uri, nil, &returnProjects)
+	var err error
+	if c.useBetaApi {
+		err = c.sendRequestBeta("GET", uri, nil, &returnProjects, "projects")
+	} else {
+		err = c.sendRequest("GET", uri, nil, &returnProjects)
+	}
 	return returnProjects, err
 }
 

diff --git a/result.go b/result.go
@@ -94,7 +94,12 @@ func (c *Client) GetResults(testID int, filters ...RequestFilterForCaseResults)
 	if len(filters) > 0 {
 		uri = applyFiltersForCaseResults(uri, filters[0])
 	}
-	err := c.sendRequest("GET", uri, nil, &returnResults)
+	var err error
+	if c.useBetaApi {
+		err = c.sendRequestBeta("GET", uri, nil, &returnResults, "results")
+	} else {
+		err = c.sendRequest("GET", uri, nil, &returnResults)
+	}
 	return returnResults, err
 }
 
@@ -107,7 +112,12 @@ func (c *Client) GetResultsForCase(runID, caseID int, filters ...RequestFilterFo
 	if len(filters) > 0 {
 		uri = applyFiltersForCaseResults(uri, filters[0])
 	}
-	err := c.sendRequest("GET", uri, nil, &returnResults)
+	var err error
+	if c.useBetaApi {
+		err = c.sendRequestBeta("GET", uri, nil, &returnResults, "results")
+	} else {
+		err = c.sendRequest("GET", uri, nil, &returnResults)
+	}
 	return returnResults, err
 }
 

diff --git a/run.go b/run.go
@@ -87,7 +87,12 @@ func (c *Client) GetRuns(projectID int, filters ...RequestFilterForRun) ([]Run,
 	}
 
 	returnRun := []Run{}
-	err := c.sendRequest("GET", uri, nil, &returnRun)
+	var err error
+	if c.useBetaApi {
+		err = c.sendRequestBeta("GET", uri, nil, &returnRun, "runs")
+	} else {
+		err = c.sendRequest("GET", uri, nil, &returnRun)
+	}
 	return returnRun, err
 }
 

diff --git a/section.go b/section.go
@@ -45,7 +45,12 @@ func (c *Client) GetSections(projectID int, suiteID ...int) ([]Section, error) {
 	if len(suiteID) > 0 {
 		uri = uri + "&suite_id=" + strconv.Itoa(suiteID[0])
 	}
-	err := c.sendRequest("GET", uri, nil, &returnSection)
+	var err error
+	if c.useBetaApi {
+		err = c.sendRequestBeta("GET", uri, nil, &returnSection, "sections")
+	} else {
+		err = c.sendRequest("GET", uri, nil, &returnSection)
+	}
 	return returnSection, err
 }