rename and document sql function

coder · SasSwart · Dec 14, 2024 · Dec 14, 2024 · Dec 14, 2024 · Dec 17, 2024
commit 1ceff066c211facfccaba8fce2c0d09771c93b51
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2413,11 +2413,11 @@ func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uui
 	return q.db.GetUserNotificationPreferences(ctx, userID)
 }
 
-func (q *querier) GetUserStatusChanges(ctx context.Context, arg database.GetUserStatusChangesParams) ([]database.GetUserStatusChangesRow, error) {
+func (q *querier) GetUserStatusCountsOverTime(ctx context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUser); err != nil {
 		return nil, err
 	}
-	return q.db.GetUserStatusChanges(ctx, arg)
+	return q.db.GetUserStatusCountsOverTime(ctx, arg)
 }
 
 func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -1490,8 +1490,8 @@ func (s *MethodTestSuite) TestUser() {
 			rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
 		)
 	}))
-	s.Run("GetUserStatusChanges", s.Subtest(func(db database.Store, check *expects) {
-		check.Args(database.GetUserStatusChangesParams{
+	s.Run("GetUserStatusCountsOverTime", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.GetUserStatusCountsOverTimeParams{
 			StartTime: time.Now().Add(-time.Hour * 24 * 30),
 			EndTime:   time.Now(),
 		}).Asserts(rbac.ResourceUser, policy.ActionRead)

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5666,7 +5666,7 @@ func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID u
 	return out, nil
 }
 
-func (q *FakeQuerier) GetUserStatusChanges(_ context.Context, arg database.GetUserStatusChangesParams) ([]database.GetUserStatusChangesRow, error) {
+func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
@@ -5675,16 +5675,16 @@ func (q *FakeQuerier) GetUserStatusChanges(_ context.Context, arg database.GetUs
 		return nil, err
 	}
 
-	result := make([]database.GetUserStatusChangesRow, 0)
+	result := make([]database.GetUserStatusCountsOverTimeRow, 0)
 	for _, change := range q.userStatusChanges {
 		if change.ChangedAt.Before(arg.StartTime) || change.ChangedAt.After(arg.EndTime) {
 			continue
 		}
 		date := time.Date(change.ChangedAt.Year(), change.ChangedAt.Month(), change.ChangedAt.Day(), 0, 0, 0, 0, time.UTC)
-		if !slices.ContainsFunc(result, func(r database.GetUserStatusChangesRow) bool {
+		if !slices.ContainsFunc(result, func(r database.GetUserStatusCountsOverTimeRow) bool {
 			return r.Status == change.NewStatus && r.Date.Equal(date)
 		}) {
-			result = append(result, database.GetUserStatusChangesRow{
+			result = append(result, database.GetUserStatusCountsOverTimeRow{
 				Status: change.NewStatus,
 				Date:   date,
 				Count:  1,

diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -2256,7 +2256,7 @@ func TestGroupRemovalTrigger(t *testing.T) {
 	}, db2sdk.List(extraUserGroups, onlyGroupIDs))
 }
 
-func TestGetUserStatusChanges(t *testing.T) {
+func TestGetUserStatusCountsOverTime(t *testing.T) {
 	t.Parallel()
 
 	if !dbtestutil.WillUsePostgres() {
@@ -2294,7 +2294,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 				end := dbtime.Now()
 				start := end.Add(-30 * 24 * time.Hour)
 
-				counts, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+				counts, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 					StartTime: start,
 					EndTime:   end,
 				})
@@ -2342,7 +2342,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 						})
 
 						// Query for the last 30 days
-						userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2510,7 +2510,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 						require.NoError(t, err)
 
 						// Query for the last 5 days
-						userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2639,7 +2639,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 						})
 						require.NoError(t, err)
 
-						userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2715,7 +2715,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 					UpdatedAt: createdAt,
 				})
 
-				userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 					StartTime: createdAt.Add(time.Hour * 24),
 					EndTime:   today,
 				})
@@ -2742,7 +2742,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 				err = db.UpdateUserDeletedByID(ctx, user.ID)
 				require.NoError(t, err)
 
-				userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 					StartTime: today.Add(time.Hour * 24),
 					EndTime:   today.Add(time.Hour * 48),
 				})
@@ -2764,7 +2764,7 @@ func TestGetUserStatusChanges(t *testing.T) {
 				err := db.UpdateUserDeletedByID(ctx, user.ID)
 				require.NoError(t, err)
 
-				userStatusChanges, err := db.GetUserStatusChanges(ctx, database.GetUserStatusChangesParams{
+				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
 					StartTime: createdAt,
 					EndTime:   today.Add(time.Hour * 24),
 				})

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go