Skip to content

Commit b2fb346

Browse files
SasSwartSasSwart
committed
do the plumbing to get sql, api and frontend talking to one another
1 parent c6b50af commit b2fb346

File tree

26 files changed

+740
-395
lines changed

26 files changed

+740
-395
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/coderd.go

+1
Original file line numberDiff line numberDiff line change
@@ -1281,6 +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)
12841285
r.Get("/user-latency", api.insightsUserLatency)
12851286
r.Get("/templates", api.insightsTemplates)
12861287
})

‎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) GetUserStatusCountsByDay(ctx context.Context, arg database.GetUserStatusCountsByDayParams) ([]database.GetUserStatusCountsByDayRow, error) {
2416+
func (q *querier) GetUserStatusChanges(ctx context.Context, arg database.GetUserStatusChangesParams) ([]database.UserStatusChange, error) {
24172417
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceUser); err != nil {
24182418
return nil, err
24192419
}
2420-
return q.db.GetUserStatusCountsByDay(ctx, arg)
2420+
return q.db.GetUserStatusChanges(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("GetUserStatusCountsByDay", s.Subtest(func(db database.Store, check *expects) {
1494-
check.Args(database.GetUserStatusCountsByDayParams{
1493+
s.Run("GetUserStatusChanges", s.Subtest(func(db database.Store, check *expects) {
1494+
check.Args(database.GetUserStatusChangesParams{
14951495
StartTime: time.Now().Add(-time.Hour * 24 * 30),
14961496
EndTime: time.Now(),
14971497
}).Asserts(rbac.ResourceUser, policy.ActionRead)

‎coderd/database/dbmem/dbmem.go

+3-9
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) GetUserStatusCountsByDay(_ context.Context, arg database.GetUserStatusCountsByDayParams) ([]database.GetUserStatusCountsByDayRow, error) {
5669+
func (q *FakeQuerier) GetUserStatusChanges(_ context.Context, arg database.GetUserStatusChangesParams) ([]database.UserStatusChange, error) {
56705670
q.mutex.RLock()
56715671
defer q.mutex.RUnlock()
56725672

@@ -5675,18 +5675,12 @@ func (q *FakeQuerier) GetUserStatusCountsByDay(_ context.Context, arg database.G
56755675
return nil, err
56765676
}
56775677

5678-
result := make([]database.GetUserStatusCountsByDayRow, 0)
5678+
result := make([]database.UserStatusChange, 0)
56795679
for _, change := range q.userStatusChanges {
56805680
if change.ChangedAt.Before(arg.StartTime) || change.ChangedAt.After(arg.EndTime) {
56815681
continue
56825682
}
5683-
result = append(result, database.GetUserStatusCountsByDayRow{
5684-
Status: database.NullUserStatus{
5685-
UserStatus: change.NewStatus,
5686-
Valid: true,
5687-
},
5688-
Count: 1,
5689-
})
5683+
result = append(result, change)
56905684
}
56915685

56925686
return result, nil

‎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

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

0 commit comments

Comments
 (0)