Skip to content

Commit 213b288

Browse files
SasSwartSasSwart
committed
rename GetUserStatusCountsOverTime to GetUserStatusCounts
1 parent b06179c commit 213b288

File tree

17 files changed

+82
-66
lines changed

17 files changed

+82
-66
lines changed

‎coderd/apidoc/docs.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ func New(options *Options) *API {
12811281
r.Use(apiKeyMiddleware)
12821282
r.Get("/daus", api.deploymentDAUs)
12831283
r.Get("/user-activity", api.insightsUserActivity)
1284-
r.Get("/user-status-counts-over-time", api.insightsUserStatusCountsOverTime)
1284+
r.Get("/user-status-counts", api.insightsUserStatusCounts)
12851285
r.Get("/user-latency", api.insightsUserLatency)
12861286
r.Get("/templates", api.insightsTemplates)
12871287
})

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,11 +2421,11 @@ func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uui
24212421
return q.db.GetUserNotificationPreferences(ctx, userID)
24222422
}
24232423

2424-
func (q *querier) GetUserStatusCountsOverTime(ctx context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
2424+
func (q *querier) GetUserStatusCounts(ctx context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
24252425
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUser); err != nil {
24262426
return nil, err
24272427
}
2428-
return q.db.GetUserStatusCountsOverTime(ctx, arg)
2428+
return q.db.GetUserStatusCounts(ctx, arg)
24292429
}
24302430

24312431
func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,8 +1708,8 @@ func (s *MethodTestSuite) TestUser() {
17081708
rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
17091709
)
17101710
}))
1711-
s.Run("GetUserStatusCountsOverTime", s.Subtest(func(db database.Store, check *expects) {
1712-
check.Args(database.GetUserStatusCountsOverTimeParams{
1711+
s.Run("GetUserStatusCounts", s.Subtest(func(db database.Store, check *expects) {
1712+
check.Args(database.GetUserStatusCountsParams{
17131713
StartTime: time.Now().Add(-time.Hour * 24 * 30),
17141714
EndTime: time.Now(),
17151715
}).Asserts(rbac.ResourceUser, policy.ActionRead)

‎coderd/database/dbmem/dbmem.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5671,7 +5671,7 @@ func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID u
56715671
return out, nil
56725672
}
56735673

5674-
func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
5674+
func (q *FakeQuerier) GetUserStatusCounts(_ context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
56755675
q.mutex.RLock()
56765676
defer q.mutex.RUnlock()
56775677

@@ -5680,16 +5680,16 @@ func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg databas
56805680
return nil, err
56815681
}
56825682

5683-
result := make([]database.GetUserStatusCountsOverTimeRow, 0)
5683+
result := make([]database.GetUserStatusCountsRow, 0)
56845684
for _, change := range q.userStatusChanges {
56855685
if change.ChangedAt.Before(arg.StartTime) || change.ChangedAt.After(arg.EndTime) {
56865686
continue
56875687
}
56885688
date := time.Date(change.ChangedAt.Year(), change.ChangedAt.Month(), change.ChangedAt.Day(), 0, 0, 0, 0, time.UTC)
5689-
if !slices.ContainsFunc(result, func(r database.GetUserStatusCountsOverTimeRow) bool {
5689+
if !slices.ContainsFunc(result, func(r database.GetUserStatusCountsRow) bool {
56905690
return r.Status == change.NewStatus && r.Date.Equal(date)
56915691
}) {
5692-
result = append(result, database.GetUserStatusCountsOverTimeRow{
5692+
result = append(result, database.GetUserStatusCountsRow{
56935693
Status: change.NewStatus,
56945694
Date: date,
56955695
Count: 1,

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2256,7 +2256,7 @@ func TestGroupRemovalTrigger(t *testing.T) {
22562256
}, db2sdk.List(extraUserGroups, onlyGroupIDs))
22572257
}
22582258

2259-
func TestGetUserStatusCountsOverTime(t *testing.T) {
2259+
func TestGetUserStatusCounts(t *testing.T) {
22602260
t.Parallel()
22612261

22622262
if !dbtestutil.WillUsePostgres() {
@@ -2294,7 +2294,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
22942294
end := dbtime.Now()
22952295
start := end.Add(-30 * 24 * time.Hour)
22962296

2297-
counts, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2297+
counts, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
22982298
StartTime: start,
22992299
EndTime: end,
23002300
})
@@ -2338,7 +2338,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
23382338
})
23392339

23402340
// Query for the last 30 days
2341-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2341+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
23422342
StartTime: createdAt,
23432343
EndTime: today,
23442344
})
@@ -2506,7 +2506,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
25062506
require.NoError(t, err)
25072507

25082508
// Query for the last 5 days
2509-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2509+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
25102510
StartTime: createdAt,
25112511
EndTime: today,
25122512
})
@@ -2635,7 +2635,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
26352635
})
26362636
require.NoError(t, err)
26372637

2638-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2638+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
26392639
StartTime: createdAt,
26402640
EndTime: today,
26412641
})
@@ -2711,7 +2711,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
27112711
UpdatedAt: createdAt,
27122712
})
27132713

2714-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2714+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
27152715
StartTime: createdAt.Add(time.Hour * 24),
27162716
EndTime: today,
27172717
})
@@ -2738,7 +2738,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
27382738
err = db.UpdateUserDeletedByID(ctx, user.ID)
27392739
require.NoError(t, err)
27402740

2741-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2741+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
27422742
StartTime: today.Add(time.Hour * 24),
27432743
EndTime: today.Add(time.Hour * 48),
27442744
})
@@ -2760,7 +2760,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
27602760
err := db.UpdateUserDeletedByID(ctx, user.ID)
27612761
require.NoError(t, err)
27622762

2763-
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
2763+
userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
27642764
StartTime: createdAt,
27652765
EndTime: today.Add(time.Hour * 24),
27662766
})

0 commit comments

Comments
 (0)