From 9950c0e157bab00887117f8ba4eeebff54ab3fa9 Mon Sep 17 00:00:00 2001 From: Robert Elwell Date: Fri, 22 Dec 2023 13:33:37 -0500 Subject: [PATCH] Fix full fetch logic (resolves #955) (#1004) Co-authored-by: Bob Elwell --- server/client_cloud.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/client_cloud.go b/server/client_cloud.go index cc25e8516..4e734be0d 100644 --- a/server/client_cloud.go +++ b/server/client_cloud.go @@ -107,11 +107,12 @@ func (client jiraCloudClient) ListProjects(query string, limit int, expandIssueT result.Values = result.Values[:remaining] } out = append(out, result.Values...) - remaining -= len(result.Values) - - if !fetchAll && remaining == 0 { - // Got enough. - return out, nil + if !fetchAll { + remaining -= len(result.Values) + if remaining == 0 { + // Got enough. + return out, nil + } } if len(result.Values) == 0 || result.IsLast { // Ran out of results.