rename GetUserStatusCountsOverTime to GetUserStatusCounts

coder · SasSwart · Jan 13, 2025 · Dec 14, 2024 · Dec 14, 2024 · Dec 14, 2024
commit 213b288d0e9c41202e7342e2ecc9e30453caa07a
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/coderd.go b/coderd/coderd.go
@@ -1281,7 +1281,7 @@ func New(options *Options) *API {
 			r.Use(apiKeyMiddleware)
 			r.Get("/daus", api.deploymentDAUs)
 			r.Get("/user-activity", api.insightsUserActivity)
-			r.Get("/user-status-counts-over-time", api.insightsUserStatusCountsOverTime)
+			r.Get("/user-status-counts", api.insightsUserStatusCounts)
 			r.Get("/user-latency", api.insightsUserLatency)
 			r.Get("/templates", api.insightsTemplates)
 		})

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2421,11 +2421,11 @@ func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uui
 	return q.db.GetUserNotificationPreferences(ctx, userID)
 }
 
-func (q *querier) GetUserStatusCountsOverTime(ctx context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
+func (q *querier) GetUserStatusCounts(ctx context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUser); err != nil {
 		return nil, err
 	}
-	return q.db.GetUserStatusCountsOverTime(ctx, arg)
+	return q.db.GetUserStatusCounts(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
@@ -1708,8 +1708,8 @@ func (s *MethodTestSuite) TestUser() {
 			rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
 		)
 	}))
-	s.Run("GetUserStatusCountsOverTime", s.Subtest(func(db database.Store, check *expects) {
-		check.Args(database.GetUserStatusCountsOverTimeParams{
+	s.Run("GetUserStatusCounts", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.GetUserStatusCountsParams{
 			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
@@ -5671,7 +5671,7 @@ func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID u
 	return out, nil
 }
 
-func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg database.GetUserStatusCountsOverTimeParams) ([]database.GetUserStatusCountsOverTimeRow, error) {
+func (q *FakeQuerier) GetUserStatusCounts(_ context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
@@ -5680,16 +5680,16 @@ func (q *FakeQuerier) GetUserStatusCountsOverTime(_ context.Context, arg databas
 		return nil, err
 	}
 
-	result := make([]database.GetUserStatusCountsOverTimeRow, 0)
+	result := make([]database.GetUserStatusCountsRow, 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.GetUserStatusCountsOverTimeRow) bool {
+		if !slices.ContainsFunc(result, func(r database.GetUserStatusCountsRow) bool {
 			return r.Status == change.NewStatus && r.Date.Equal(date)
 		}) {
-			result = append(result, database.GetUserStatusCountsOverTimeRow{
+			result = append(result, database.GetUserStatusCountsRow{
 				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 TestGetUserStatusCountsOverTime(t *testing.T) {
+func TestGetUserStatusCounts(t *testing.T) {
 	t.Parallel()
 
 	if !dbtestutil.WillUsePostgres() {
@@ -2294,7 +2294,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 				end := dbtime.Now()
 				start := end.Add(-30 * 24 * time.Hour)
 
-				counts, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+				counts, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 					StartTime: start,
 					EndTime:   end,
 				})
@@ -2338,7 +2338,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 						})
 
 						// Query for the last 30 days
-						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+						userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2506,7 +2506,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 						require.NoError(t, err)
 
 						// Query for the last 5 days
-						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+						userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2635,7 +2635,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 						})
 						require.NoError(t, err)
 
-						userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+						userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 							StartTime: createdAt,
 							EndTime:   today,
 						})
@@ -2711,7 +2711,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 					UpdatedAt: createdAt,
 				})
 
-				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+				userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 					StartTime: createdAt.Add(time.Hour * 24),
 					EndTime:   today,
 				})
@@ -2738,7 +2738,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 				err = db.UpdateUserDeletedByID(ctx, user.ID)
 				require.NoError(t, err)
 
-				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+				userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 					StartTime: today.Add(time.Hour * 24),
 					EndTime:   today.Add(time.Hour * 48),
 				})
@@ -2760,7 +2760,7 @@ func TestGetUserStatusCountsOverTime(t *testing.T) {
 				err := db.UpdateUserDeletedByID(ctx, user.ID)
 				require.NoError(t, err)
 
-				userStatusChanges, err := db.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+				userStatusChanges, err := db.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 					StartTime: createdAt,
 					EndTime:   today.Add(time.Hour * 24),
 				})

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/insights.sql b/coderd/database/queries/insights.sql
@@ -772,8 +772,8 @@ FROM unique_template_params utp
 JOIN workspace_build_parameters wbp ON (utp.workspace_build_ids @> ARRAY[wbp.workspace_build_id] AND utp.name = wbp.name)
 GROUP BY utp.num, utp.template_ids, utp.name, utp.type, utp.display_name, utp.description, utp.options, wbp.value;
 
--- name: GetUserStatusCountsOverTime :many
--- GetUserStatusCountsOverTime returns the count of users in each status over time.
+-- name: GetUserStatusCounts :many
+-- GetUserStatusCounts returns the count of users in each status over time.
 -- The time range is inclusively defined by the start_time and end_time parameters.
 --
 -- Bucketing:

diff --git a/coderd/insights.go b/coderd/insights.go
@@ -293,14 +293,14 @@ func (api *API) insightsUserLatency(rw http.ResponseWriter, r *http.Request) {
 }
 
 // @Summary Get insights about user status counts over time
-// @ID get-insights-about-user-status-counts-over-time
+// @ID get-insights-about-user-status-counts
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Insights
 // @Param tz_offset query int true "Time-zone offset (e.g. -2)"
-// @Success 200 {object} codersdk.GetUserStatusCountsOverTimeResponse
-// @Router /insights/user-status-counts-over-time [get]
-func (api *API) insightsUserStatusCountsOverTime(rw http.ResponseWriter, r *http.Request) {
+// @Success 200 {object} codersdk.GetUserStatusCountsResponse
+// @Router /insights/user-status-counts [get]
+func (api *API) insightsUserStatusCounts(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	p := httpapi.NewQueryParamParser()
@@ -324,7 +324,7 @@ func (api *API) insightsUserStatusCountsOverTime(rw http.ResponseWriter, r *http
 	// Always return 60 days of data (2 months).
 	sixtyDaysAgo := nextHourInLoc.In(loc).Truncate(24*time.Hour).AddDate(0, 0, -60)
 
-	rows, err := api.Database.GetUserStatusCountsOverTime(ctx, database.GetUserStatusCountsOverTimeParams{
+	rows, err := api.Database.GetUserStatusCounts(ctx, database.GetUserStatusCountsParams{
 		StartTime: sixtyDaysAgo,
 		EndTime:   nextHourInLoc,
 	})
@@ -340,7 +340,7 @@ func (api *API) insightsUserStatusCountsOverTime(rw http.ResponseWriter, r *http
 		return
 	}
 
-	resp := codersdk.GetUserStatusCountsOverTimeResponse{
+	resp := codersdk.GetUserStatusCountsResponse{
 		StatusCounts: make(map[codersdk.UserStatus][]codersdk.UserStatusChangeCount),
 	}