Skip to content

Commit 1ceff06

Browse files
SasSwartSasSwart
committed
rename and document sql function
1 parent 8bff303 commit 1ceff06

File tree

18 files changed

+165
-73
lines changed

18 files changed

+165
-73
lines changed

‎coderd/apidoc/docs.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2413,11 +2413,11 @@ func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uui
24132413
return q.db.GetUserNotificationPreferences(ctx, userID)
24142414
}
24152415

2416-
func (q *querier) GetUserStatusChanges(ctx context.Context, arg database.GetUserStatusChangesParams) ([]database.GetUserStatusChangesRow, error) {
2416+
func (q *querier) GetUserStatusCountsOverTime(ctx context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
24172417
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUser); err != nil {
24182418
return nil, err
24192419
}
2420-
return q.db.GetUserStatusChanges(ctx, arg)
2420+
return q.db.GetUserStatusCountsOverTime(ctx, arg)
24212421
}
24222422

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

‎coderd/database/dbauthz/dbauthz_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1490,8 +1490,8 @@ func (s *MethodTestSuite) TestUser() {
14901490
rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
14911491
)
14921492
}))
1493-
s.Run("GetUserStatusChanges", s.Subtest(func(db database.Store, check *expects) {
1494-
check.Args(database.GetUserStatusChangesParams{
1493+
s.Run("GetUserStatusCountsOverTime", s.Subtest(func(db database.Store, check *expects) {
1494+
check.Args(database.GetUserStatusCountsOverTimeParams{
14951495
StartTime: time.Now().Add(-time.Hour * 24 * 30),
14961496
EndTime: time.Now(),
14971497
}).Asserts(rbac.ResourceUser, policy.ActionRead)

‎coderd/database/dbmem/dbmem.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5666,7 +5666,7 @@ func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID u
56665666
return out, nil
56675667
}
56685668

5669-
func (q *FakeQuerier) GetUserStatusChanges(_ context.Context, arg database.GetUserStatusChangesParams) ([]database.GetUserStatusChangesRow, error) {
5669+
func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
56705670
q.mutex.RLock()
56715671
defer q.mutex.RUnlock()
56725672

@@ -5675,16 +5675,16 @@ func (q *FakeQuerier) GetUserStatusChanges(_ context.Context, arg database.GetUs
56755675
return nil, err
56765676
}
56775677

5678-
result := make([]database.GetUserStatusChangesRow, 0)
5678+
result := make([]database.GetUserStatusCountsOverTimeRow, 0)
56795679
for _, change := range q.userStatusChanges {
56805680
if change.ChangedAt.Before(arg.StartTime) || change.ChangedAt.After(arg.EndTime) {
56815681
continue
56825682
}
56835683
date := time.Date(change.ChangedAt.Year(), change.ChangedAt.Month(), change.ChangedAt.Day(), 0, 0, 0, 0, time.UTC)
5684-
if !slices.ContainsFunc(result, func(r database.GetUserStatusChangesRow) bool {
5684+
if !slices.ContainsFunc(result, func(r database.GetUserStatusCountsOverTimeRow) bool {
56855685
return r.Status == change.NewStatus && r.Date.Equal(date)
56865686
}) {
5687-
result = append(result, database.GetUserStatusChangesRow{
5687+
result = append(result, database.GetUserStatusCountsOverTimeRow{
56885688
Status: change.NewStatus,
56895689
Date: date,
56905690
Count: 1,

‎coderd/database/dbmetrics/querymetrics.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

+29-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier_test.go

+8-8
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 TestGetUserStatusChanges(t *testing.T) {
2259+
func TestGetUserStatusCountsOverTime(t *testing.T) {
22602260
t.Parallel()
22612261

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

2297-
counts, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2297+
counts, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
22982298
StartTime: start,
22992299
EndTime: end,
23002300
})
@@ -2342,7 +2342,7 @@ func TestGetUserStatusChanges(t *testing.T) {
23422342
})
23432343

23442344
// Query for the last 30 days
2345-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2345+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
23462346
StartTime: createdAt,
23472347
EndTime: today,
23482348
})
@@ -2510,7 +2510,7 @@ func TestGetUserStatusChanges(t *testing.T) {
25102510
require.NoError(t, err)
25112511

25122512
// Query for the last 5 days
2513-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2513+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
25142514
StartTime: createdAt,
25152515
EndTime: today,
25162516
})
@@ -2639,7 +2639,7 @@ func TestGetUserStatusChanges(t *testing.T) {
26392639
})
26402640
require.NoError(t, err)
26412641

2642-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2642+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
26432643
StartTime: createdAt,
26442644
EndTime: today,
26452645
})
@@ -2715,7 +2715,7 @@ func TestGetUserStatusChanges(t *testing.T) {
27152715
UpdatedAt: createdAt,
27162716
})
27172717

2718-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2718+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
27192719
StartTime: createdAt.Add(time.Hour * 24),
27202720
EndTime: today,
27212721
})
@@ -2742,7 +2742,7 @@ func TestGetUserStatusChanges(t *testing.T) {
27422742
err = db.UpdateUserDeletedByID(ctx, user.ID)
27432743
require.NoError(t, err)
27442744

2745-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2745+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
27462746
StartTime: today.Add(time.Hour * 24),
27472747
EndTime: today.Add(time.Hour * 48),
27482748
})
@@ -2764,7 +2764,7 @@ func TestGetUserStatusChanges(t *testing.T) {
27642764
err := db.UpdateUserDeletedByID(ctx, user.ID)
27652765
require.NoError(t, err)
27662766

2767-
userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
2767+
userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
27682768
StartTime: createdAt,
27692769
EndTime: today.Add(time.Hour * 24),
27702770
})

‎coderd/database/queries.sql.go

+47-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)