This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 656b8afda fix(cursor): page user spend by the top-level totalPages
(#9381)
656b8afda is described below
commit 656b8afdae3e01c852a1f1968a93e71a9a580221
Author: Shivam Sharma <[email protected]>
AuthorDate: Sat Nov 14 07:18:01 2026 +0530
fix(cursor): page user spend by the top-level totalPages (#9381)
CollectUserSpend used nextPostPage, which stops unless the response
has pagination.hasNextPage. POST /teams/spend has no pagination
object; it reports totalMembers and a top-level totalPages. So the
collector always stopped after the first page, and teams with more
than 100 members lost the spend of everyone past the first page.
Add nextSpendPage, which reads totalPages and stops when the current
page reaches it, and use it for the spend collector. Usage events and
daily usage keep nextPostPage.
Closes #9379
Generated-by: Claude Code (Claude Opus 5.5)
Signed-off-by: Shivam Sharma
<[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
.../plugins/cursor/tasks/user_spend_collector.go | 28 +++++++++-
.../cursor/tasks/user_spend_collector_test.go | 60 ++++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/backend/plugins/cursor/tasks/user_spend_collector.go
b/backend/plugins/cursor/tasks/user_spend_collector.go
index ea81e5c19..c0547c0c4 100644
--- a/backend/plugins/cursor/tasks/user_spend_collector.go
+++ b/backend/plugins/cursor/tasks/user_spend_collector.go
@@ -91,6 +91,32 @@ func spendPageBody(reqData *helper.RequestData)
map[string]interface{} {
}
}
+// nextSpendPage advances through POST /teams/spend pages. Unlike
+// filtered-usage-events, this endpoint has no pagination object; it reports
+// the page count as a top-level totalPages field.
+func nextSpendPage(prevReqData *helper.RequestData, prevPageResponse
*http.Response) (interface{}, errors.Error) {
+ body, err := readResponseBody(prevPageResponse)
+ if err != nil {
+ return nil, err
+ }
+ var response struct {
+ TotalPages int `json:"totalPages"`
+ }
+ if jsonErr := json.Unmarshal(body, &response); jsonErr != nil {
+ return nil, errors.Default.Wrap(errors.Convert(jsonErr),
"failed to decode spend pagination")
+ }
+ currentPage := 1
+ if state, ok := prevReqData.CustomData.(cursorPageState); ok &&
state.Page > 0 {
+ currentPage = state.Page
+ } else if prevReqData.Pager != nil && prevReqData.Pager.Page > 0 {
+ currentPage = prevReqData.Pager.Page
+ }
+ if currentPage >= response.TotalPages {
+ return nil, helper.ErrFinishCollect
+ }
+ return cursorPageState{Page: currentPage + 1}, nil
+}
+
// CollectUserSpend collects per-user billing cycle spend from POST
/teams/spend.
func CollectUserSpend(taskCtx plugin.SubTaskContext) errors.Error {
data, ok := taskCtx.TaskContext().GetData().(*CursorTaskData)
@@ -116,7 +142,7 @@ func CollectUserSpend(taskCtx plugin.SubTaskContext)
errors.Error {
UrlTemplate: "teams/spend",
PageSize: cursorApiPageSize,
RequestBody: spendPageBody,
- GetNextPageCustomData: nextPostPage,
+ GetNextPageCustomData: nextSpendPage,
ResponseParser: parseSpendPageResponse,
})
if err != nil {
diff --git a/backend/plugins/cursor/tasks/user_spend_collector_test.go
b/backend/plugins/cursor/tasks/user_spend_collector_test.go
new file mode 100644
index 000000000..21da3393f
--- /dev/null
+++ b/backend/plugins/cursor/tasks/user_spend_collector_test.go
@@ -0,0 +1,60 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tasks
+
+import (
+ "io"
+ "net/http"
+ "strings"
+ "testing"
+
+ helper "github.com/apache/devlake/helpers/pluginhelper/api"
+ "github.com/stretchr/testify/assert"
+)
+
+func spendResponse(body string) *http.Response {
+ return &http.Response{Body: io.NopCloser(strings.NewReader(body))}
+}
+
+func TestNextSpendPageFollowsTotalPages(t *testing.T) {
+ // POST /teams/spend reports pagination as top-level
totalPages/totalMembers,
+ // without the pagination.hasNextPage object used by
filtered-usage-events.
+ body :=
`{"teamMemberSpend":[{"userId":1}],"subscriptionCycleStart":1708992000000,"totalMembers":250,"totalPages":3}`
+
+ next, err := nextSpendPage(&helper.RequestData{Pager:
&helper.Pager{Page: 1, Size: 100}}, spendResponse(body))
+ assert.Nil(t, err)
+ assert.Equal(t, cursorPageState{Page: 2}, next)
+
+ next, err = nextSpendPage(&helper.RequestData{CustomData:
cursorPageState{Page: 2}, Pager: &helper.Pager{Page: 2, Size: 100}},
spendResponse(body))
+ assert.Nil(t, err)
+ assert.Equal(t, cursorPageState{Page: 3}, next)
+}
+
+func TestNextSpendPageStopsOnLastPage(t *testing.T) {
+ body :=
`{"teamMemberSpend":[{"userId":1}],"subscriptionCycleStart":1708992000000,"totalMembers":250,"totalPages":3}`
+ _, err := nextSpendPage(&helper.RequestData{CustomData:
cursorPageState{Page: 3}, Pager: &helper.Pager{Page: 3, Size: 100}},
spendResponse(body))
+ assert.Equal(t, helper.ErrFinishCollect, err)
+
+ single :=
`{"teamMemberSpend":[{"userId":1}],"subscriptionCycleStart":1708992000000,"totalMembers":15,"totalPages":1}`
+ _, err = nextSpendPage(&helper.RequestData{Pager: &helper.Pager{Page:
1, Size: 100}}, spendResponse(single))
+ assert.Equal(t, helper.ErrFinishCollect, err)
+
+ empty :=
`{"teamMemberSpend":[],"subscriptionCycleStart":1708992000000,"totalMembers":0,"totalPages":0}`
+ _, err = nextSpendPage(&helper.RequestData{Pager: &helper.Pager{Page:
1, Size: 100}}, spendResponse(empty))
+ assert.Equal(t, helper.ErrFinishCollect, err)
+}