Jan 13, 2025 · Dec 14, 2024 · Dec 14, 2024 · Dec 14, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/Makefile b/Makefile
 # All files generated by the database should be added here, and this can be used
 # as a target for jobs that need to run after the database is generated.
 DB_GEN_FILES := \
 coderd/database/dump.sql \
 coderd/database/querier.go \
 coderd/database/unique_constraint.go \
 coderd/database/dbmem/dbmem.go \
 provisionersdk/proto/provisioner.pb.go \
 provisionerd/proto/provisionerd.pb.go \
 vpn/vpn.pb.go \
 coderd/database/dump.sql \
 $(DB_GEN_FILES) \
 site/src/api/typesGenerated.ts \
 coderd/rbac/object_gen.go \
 codersdk/rbacresources_gen.go \
 coderd/database/pubsub/psmock/psmock.go

 # all gen targets should be added here and to gen/mark-fresh
 gen: $(GEN_FILES)
 gen:gen/db$(GEN_FILES)
 .PHONY: gen

 gen/db: $(DB_GEN_FILES)
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
 r.Use(apiKeyMiddleware)
 r.Get("/daus", api.deploymentDAUs)
 r.Get("/user-activity", api.insightsUserActivity)
 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
 return q.db.GetUserNotificationPreferences(ctx, userID)
 }

 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.GetUserStatusCounts(ctx, arg)
 }

 func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
 u, err := q.db.GetUserByID(ctx, params.OwnerID)
 if err != nil {
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
 )
 }))
 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)
 }))
 }

 func (s *MethodTestSuite) TestWorkspace() {
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 customRoles:               make([]database.CustomRole, 0),
 locks:                     map[int64]struct{}{},
 runtimeConfig:             map[string]string{},
 userStatusChanges:         make([]database.UserStatusChange, 0),
 },
 }
 // Always start with a default org. Matching migration 198.
 lastLicenseID                    int32
 defaultProxyDisplayName          string
 defaultProxyIconURL              string
 userStatusChanges                []database.UserStatusChange
 }

 func tryPercentile(fs []float64, p float64) float64 {
 return out, nil
 }

 func (q *FakeQuerier) GetUserStatusCounts(_ context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 err := validateDatabaseType(arg)
 if err != nil {
 return nil, err
 }

 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.GetUserStatusCountsRow) bool {
 return r.Status == change.NewStatus && r.Date.Equal(date)
 }) {
 result = append(result, database.GetUserStatusCountsRow{
 Status: change.NewStatus,
 Date:   date,
 Count:  1,
 })
 } else {
 for i, r := range result {
 if r.Status == change.NewStatus && r.Date.Equal(date) {
 result[i].Count++
 break
 }
 }
 }
 }

 return result, nil
 }

 func (q *FakeQuerier) GetUserWorkspaceBuildParameters(_ context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()
 sort.Slice(q.users, func(i, j int) bool {
 return q.users[i].CreatedAt.Before(q.users[j].CreatedAt)
 })

 q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
 UserID:    user.ID,
 NewStatus: user.Status,
 ChangedAt: user.UpdatedAt,
 })
 return user, nil
 }

 Username:   user.Username,
 LastSeenAt: user.LastSeenAt,
 })
 q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
 UserID:    user.ID,
 NewStatus: database.UserStatusDormant,
 ChangedAt: params.UpdatedAt,
 })
 }
 }

 if len(updated) == 0 {
 return nil, sql.ErrNoRows
 }

 return updated, nil
 }

 user.Status = arg.Status
 user.UpdatedAt = arg.UpdatedAt
 q.users[index] = user

 q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
 UserID:    user.ID,
 NewStatus: user.Status,
 ChangedAt: user.UpdatedAt,
 })
 return user, nil
 }
 return database.User{}, sql.ErrNoRows
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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -521,6 +521,7 @@ lint/markdown: node_modules/.installed
		# All files generated by the database should be added here, and this can be used
		# as a target for jobs that need to run after the database is generated.
		DB_GEN_FILES := \
		coderd/database/dump.sql \
		coderd/database/querier.go \
		coderd/database/unique_constraint.go \
		coderd/database/dbmem/dbmem.go \
Expand All		@@ -540,8 +541,6 @@ GEN_FILES := \
		provisionersdk/proto/provisioner.pb.go \
		provisionerd/proto/provisionerd.pb.go \
		vpn/vpn.pb.go \
		coderd/database/dump.sql \
		$(DB_GEN_FILES) \
		site/src/api/typesGenerated.ts \
		coderd/rbac/object_gen.go \
		codersdk/rbacresources_gen.go \
Expand All		@@ -559,7 +558,7 @@ GEN_FILES := \
		coderd/database/pubsub/psmock/psmock.go

		# all gen targets should be added here and to gen/mark-fresh
		gen: $(GEN_FILES)
		gen:gen/db$(GEN_FILES)
		.PHONY: gen

		gen/db: $(DB_GEN_FILES)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1281,6 +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", api.insightsUserStatusCounts)
		r.Get("/user-latency", api.insightsUserLatency)
		r.Get("/templates", api.insightsTemplates)
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2421,6 +2421,13 @@ func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uui
		return q.db.GetUserNotificationPreferences(ctx, userID)
		}

		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.GetUserStatusCounts(ctx, arg)
		}

		func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
		u, err := q.db.GetUserByID(ctx, params.OwnerID)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1708,6 +1708,12 @@ func (s *MethodTestSuite) TestUser() {
		rbac.ResourceTemplate.InOrg(orgID), policy.ActionRead,
		)
		}))
		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)
		}))
		}

		func (s *MethodTestSuite) TestWorkspace() {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,6 +88,7 @@ func New() database.Store {
		customRoles: make([]database.CustomRole, 0),
		locks: map[int64]struct{}{},
		runtimeConfig: map[string]string{},
		userStatusChanges: make([]database.UserStatusChange, 0),
		},
		}
		// Always start with a default org. Matching migration 198.
Expand DownExpand Up		@@ -256,6 +257,7 @@ type data struct {
		lastLicenseID int32
		defaultProxyDisplayName string
		defaultProxyIconURL string
		userStatusChanges []database.UserStatusChange
		}

		func tryPercentile(fs []float64, p float64) float64 {
Expand DownExpand Up		@@ -5669,6 +5671,42 @@ func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID u
		return out, nil
		}

		func (q *FakeQuerier) GetUserStatusCounts(_ context.Context, arg database.GetUserStatusCountsParams) ([]database.GetUserStatusCountsRow, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		err := validateDatabaseType(arg)
		if err != nil {
		return nil, err
		}

		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.GetUserStatusCountsRow) bool {
		return r.Status == change.NewStatus && r.Date.Equal(date)
		}) {
		result = append(result, database.GetUserStatusCountsRow{
		Status: change.NewStatus,
		Date: date,
		Count: 1,
		})
		} else {
		for i, r := range result {
		if r.Status == change.NewStatus && r.Date.Equal(date) {
		result[i].Count++
		break
		}
		}
		}
		}

		return result, nil
		}

		func (q *FakeQuerier) GetUserWorkspaceBuildParameters(_ context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()
Expand DownExpand Up		@@ -8021,6 +8059,12 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
		sort.Slice(q.users, func(i, j int) bool {
		return q.users[i].CreatedAt.Before(q.users[j].CreatedAt)
		})

		q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
		UserID: user.ID,
		NewStatus: user.Status,
		ChangedAt: user.UpdatedAt,
		})
		return user, nil
		}

Expand DownExpand Up		@@ -9062,12 +9106,18 @@ func (q *FakeQuerier) UpdateInactiveUsersToDormant(_ context.Context, params dat
		Username: user.Username,
		LastSeenAt: user.LastSeenAt,
		})
		q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
		UserID: user.ID,
		NewStatus: database.UserStatusDormant,
		ChangedAt: params.UpdatedAt,
		})
		}
		}

		if len(updated) == 0 {
		return nil, sql.ErrNoRows
		}

		return updated, nil
		}

Expand DownExpand Up		@@ -9868,6 +9918,12 @@ func (q *FakeQuerier) UpdateUserStatus(_ context.Context, arg database.UpdateUse
		user.Status = arg.Status
		user.UpdatedAt = arg.UpdatedAt
		q.users[index] = user

		q.userStatusChanges = append(q.userStatusChanges, database.UserStatusChange{
		UserID: user.ID,
		NewStatus: user.Status,
		ChangedAt: user.UpdatedAt,
		})
		return user, nil
		}
		return database.User{}, sql.ErrNoRows
Expand Down