Commit6f7dc7b

committed

fix user-activity response on no rows

1 parent4e36a62 commit6f7dc7bCopy full SHA for 6f7dc7b

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package coderd`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+"database/sql"`
`5`	`6`	`"fmt"`
`6`	`7`	`"net/http"`
`7`	`8`	`"strings"`
`@@ -102,6 +103,19 @@ func (api API) insightsUserActivity(rw http.ResponseWriter, r http.Request) {`
`102`	`103`	`TemplateIDs:templateIDs,`
`103`	`104`	`})`
`104`	`105`	`iferr!=nil {`
	`106`	`+// No data is not an error.`
	`107`	`+ifxerrors.Is(err,sql.ErrNoRows) {`
	`108`	`+httpapi.Write(ctx,rw,http.StatusOK, codersdk.UserActivityInsightsResponse{`
	`109`	`+Report: codersdk.UserActivityInsightsReport{`
	`110`	`+StartTime:startTime,`
	`111`	`+EndTime:endTime,`
	`112`	`+TemplateIDs: []uuid.UUID{},`
	`113`	`+Users: []codersdk.UserActivity{},`
	`114`	`+},`
	`115`	`+})`
	`116`	`+return`
	`117`	`+}`
	`118`	`+// Check authorization.`
`105`	`119`	`ifhttpapi.Is404Error(err) {`
`106`	`120`	`httpapi.ResourceNotFound(rw)`
`107`	`121`	`return`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) {`
`136`	`136`	`Pubsub:ps,`
`137`	`137`	`Logger:&logger,`
`138`	`138`	`IncludeProvisionerDaemon:true,`
`139`		`-AgentStatsRefreshInterval:time.Millisecond*50,`
	`139`	`+AgentStatsRefreshInterval:time.Millisecond*100,`
`140`	`140`	`DatabaseRolluper:dbrollup.New(`
`141`	`141`	`logger.Named("dbrollup"),`
`142`	`142`	`db,`
`@@ -170,7 +170,7 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) {`
`170`	`170`	`y,m,d:=time.Now().UTC().Date()`
`171`	`171`	`today:=time.Date(y,m,d,0,0,0,0,time.UTC)`
`172`	`172`
`173`		`-ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)`
	`173`	`+ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitSuperLong)`
`174`	`174`	`defercancel()`
`175`	`175`
`176`	`176`	`// Connect to the agent to generate usage/latency stats.`
`@@ -212,7 +212,7 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) {`
`212`	`212`	`returnfalse`
`213`	`213`	`}`
`214`	`214`	`returnlen(userActivities.Report.Users)>0&&userActivities.Report.Users[0].Seconds>0`
`215`		`-},testutil.WaitMedium,testutil.IntervalFast,"user activity is missing")`
	`215`	`+},testutil.WaitSuperLong,testutil.IntervalMedium,"user activity is missing")`
`216`	`216`
`217`	`217`	`// We got our latency data, close the connection.`
`218`	`218`	`_=sess.Close()`

Comments

(0)