[incubator-devlake] branch main updated: fix(bamboo): use skip to replace (#4466)

[mappjzc]

This is an automated email from the ASF dual-hosted git repository.

mappjzc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 890a70c8e fix(bamboo): use skip to replace (#4466)
890a70c8e is described below

commit 890a70c8e955181550526ba0e43729265f836061
Author: Warren Chen <yingchu.c...@merico.dev>
AuthorDate: Tue Feb 21 10:01:52 2023 +0800

    fix(bamboo): use skip to replace (#4466)
---
 backend/plugins/bamboo/tasks/job_build_collector.go  | 2 +-
 backend/plugins/bamboo/tasks/job_collector.go        | 2 +-
 backend/plugins/bamboo/tasks/plan_build_collector.go | 2 +-
 backend/plugins/bamboo/tasks/plan_collector.go       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/plugins/bamboo/tasks/job_build_collector.go 
b/backend/plugins/bamboo/tasks/job_build_collector.go
index 81674986d..3917e6c3e 100644
--- a/backend/plugins/bamboo/tasks/job_build_collector.go
+++ b/backend/plugins/bamboo/tasks/job_build_collector.go
@@ -73,7 +73,7 @@ func CollectJobBuild(taskCtx plugin.SubTaskContext) 
errors.Error {
                        query.Set("showEmpty", fmt.Sprintf("%v", true))
                        query.Set("expand", "results.result.vcsRevisions")
                        query.Set("max-result", fmt.Sprintf("%v", 
reqData.Pager.Size))
-                       query.Set("start-index", fmt.Sprintf("%v", 
(reqData.Pager.Page-1)*reqData.Pager.Size))
+                       query.Set("start-index", fmt.Sprintf("%v", 
reqData.Pager.Skip))
                        return query, nil
                },
                GetTotalPages: func(res *http.Response, args 
*helper.ApiCollectorArgs) (int, errors.Error) {
diff --git a/backend/plugins/bamboo/tasks/job_collector.go 
b/backend/plugins/bamboo/tasks/job_collector.go
index ebecb7254..b33a74d4b 100644
--- a/backend/plugins/bamboo/tasks/job_collector.go
+++ b/backend/plugins/bamboo/tasks/job_collector.go
@@ -71,7 +71,7 @@ func CollectJob(taskCtx plugin.SubTaskContext) errors.Error {
                        query.Set("showEmpty", fmt.Sprintf("%v", true))
                        query.Set("expand", "jobs.job")
                        query.Set("max-result", fmt.Sprintf("%v", 
reqData.Pager.Size))
-                       query.Set("start-index", fmt.Sprintf("%v", 
(reqData.Pager.Page-1)*reqData.Pager.Size))
+                       query.Set("start-index", fmt.Sprintf("%v", 
reqData.Pager.Skip))
                        return query, nil
                },
                GetTotalPages: func(res *http.Response, args 
*helper.ApiCollectorArgs) (int, errors.Error) {
diff --git a/backend/plugins/bamboo/tasks/plan_build_collector.go 
b/backend/plugins/bamboo/tasks/plan_build_collector.go
index a7f2edf90..de2c22d37 100644
--- a/backend/plugins/bamboo/tasks/plan_build_collector.go
+++ b/backend/plugins/bamboo/tasks/plan_build_collector.go
@@ -67,7 +67,7 @@ func CollectPlanBuild(taskCtx plugin.SubTaskContext) 
errors.Error {
                        query.Set("showEmpty", fmt.Sprintf("%v", true))
                        query.Set("expand", "results.result.vcsRevisions")
                        query.Set("max-result", fmt.Sprintf("%v", 
reqData.Pager.Size))
-                       query.Set("start-index", fmt.Sprintf("%v", 
(reqData.Pager.Page-1)*reqData.Pager.Size))
+                       query.Set("start-index", fmt.Sprintf("%v", 
reqData.Pager.Skip))
                        return query, nil
                },
                GetTotalPages: func(res *http.Response, args 
*helper.ApiCollectorArgs) (int, errors.Error) {
diff --git a/backend/plugins/bamboo/tasks/plan_collector.go 
b/backend/plugins/bamboo/tasks/plan_collector.go
index 1c06d43d5..cc59ce8db 100644
--- a/backend/plugins/bamboo/tasks/plan_collector.go
+++ b/backend/plugins/bamboo/tasks/plan_collector.go
@@ -49,7 +49,7 @@ func CollectPlan(taskCtx plugin.SubTaskContext) errors.Error {
                        query.Set("showEmpty", fmt.Sprintf("%v", true))
                        query.Set("expand", "plans.plan")
                        query.Set("max-result", fmt.Sprintf("%v", 
reqData.Pager.Size))
-                       query.Set("start-index", fmt.Sprintf("%v", 
(reqData.Pager.Page-1)*reqData.Pager.Size))
+                       query.Set("start-index", fmt.Sprintf("%v", 
reqData.Pager.Skip))
                        return query, nil
                },
                GetTotalPages: func(res *http.Response, args 
*helper.ApiCollectorArgs) (int, errors.Error) {