refactor(enterprise/coderd): use the offset-only page type for AI spend users

Follows the codersdk change: the handler and its tests use
OrganizationAISpendPage, which cannot carry an unsupported cursor.
This commit is contained in:
Michael Suchacz committed 2026-09-16 17:07:07 +00:00
1 parent 2309428458
commit 8cdc127dcb
2 files changed
+11 -11

No files matched your search

+1 -1
View File
@@ -1350,7 +1350,7 @@ func (api *API) organizationAISpendUsers(rw http.ResponseWriter, r *http.Request
query := r.URL.Query()
parser := httpapi.NewQueryParamParser()
page := codersdk.Pagination{
page := codersdk.OrganizationAISpendPage{
Limit: int(parser.PositiveInt32(query, defaultOrganizationAISpendLimit, "limit")),
Offset: int(parser.PositiveInt32(query, 0, "offset")),
}
+10 -10
View File
@@ -5094,7 +5094,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
t.Run("Default", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{})
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{})
require.NoError(t, err)
require.Equal(t, codersdk.OrganizationAISpendReport{
AISpendPeriodWindow: window,
@@ -5109,13 +5109,13 @@ func TestOrganizationAISpendUsers(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
// Count and totals describe the whole window on every page.
first, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{Limit: 1})
first, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{Limit: 1})
require.NoError(t, err)
require.Equal(t, []codersdk.OrganizationAISpendUser{other}, first.Users)
require.EqualValues(t, 2, first.Count)
require.EqualValues(t, 4500, first.Totals.CostMicros)
second, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{Limit: 1, Offset: 1})
second, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{Limit: 1, Offset: 1})
require.NoError(t, err)
require.Equal(t, []codersdk.OrganizationAISpendUser{target}, second.Users)
require.EqualValues(t, 2, second.Count)
@@ -5123,7 +5123,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
// Past the last user nothing is returned but the totals still
// describe the whole window.
empty, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{Limit: 1, Offset: 2})
empty, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{Limit: 1, Offset: 2})
require.NoError(t, err)
require.Equal(t, codersdk.OrganizationAISpendReport{
AISpendPeriodWindow: window,
@@ -5199,7 +5199,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, tc.filter, codersdk.Pagination{})
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, tc.filter, codersdk.OrganizationAISpendPage{})
require.NoError(t, err)
require.Equal(t, tc.want, report)
})
@@ -5210,7 +5210,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
t.Run("MatchesExport", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{})
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{})
require.NoError(t, err)
body, err := adminClient.ExportOrganizationAISpend(ctx, group.OrganizationID, codersdk.AISpendPeriodWindow{})
require.NoError(t, err)
@@ -5246,7 +5246,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitLong)
retentionStart := now.Add(-retention)
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{})
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{})
require.NoError(t, err)
require.Equal(t, codersdk.AISpendPeriodWindow{PeriodStart: retentionStart, PeriodEnd: monthEnd}, report.AISpendPeriodWindow)
require.NotNil(t, report.RetentionStart)
@@ -5255,7 +5255,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
// An explicit period before retention is rejected like the export.
_, err = adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{
PeriodStart: retentionStart.Add(-time.Hour), PeriodEnd: retentionStart.Add(time.Hour),
}, codersdk.Pagination{})
}, codersdk.OrganizationAISpendPage{})
var sdkErr *codersdk.Error
require.ErrorAs(t, err, &sdkErr)
require.Equal(t, http.StatusBadRequest, sdkErr.StatusCode())
@@ -5274,7 +5274,7 @@ func TestOrganizationAISpendUsers(t *testing.T) {
})
ctx := testutil.Context(t, testutil.WaitLong)
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{})
report, err := adminClient.OrganizationAISpendUsers(ctx, group.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{})
require.NoError(t, err)
require.Equal(t, codersdk.AISpendPeriodWindow{PeriodStart: monthStart, PeriodEnd: monthEnd}, report.AISpendPeriodWindow)
require.Nil(t, report.RetentionStart)
@@ -5357,7 +5357,7 @@ func TestOrganizationAISpendUsersRoleAccess(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
report, err := tc.client.OrganizationAISpendUsers(ctx, owner.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.Pagination{})
report, err := tc.client.OrganizationAISpendUsers(ctx, owner.OrganizationID, codersdk.OrganizationAISpendFilter{}, codersdk.OrganizationAISpendPage{})
if tc.wantStatus != 0 {
var sdkErr *codersdk.Error
require.ErrorAs(t, err, &sdkErr)