Commite6bb041

authored and

committed

feat: use tz_offset when doing deployment dau query (#7736)

* Have FE query correct tz_offset data

1 parent037e0aa commite6bb041Copy full SHA for e6bb041

File tree

+12

-7

lines changed

coderd
- database/dbfake
  - databasefake.go
- metricscache
  - metricscache_test.go
site/src
- api
  - api.ts
- xServices/deploymentConfig
  - deploymentConfigMachine.ts

+12

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, arg database.GetTemplat`
`453`	`453`	`continue`
`454`	`454`	`}`
`455`	`455`
`456`		`-date:=as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset)time.Hour).Truncate(time.Hour24)`
	`456`	`+date:=as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset)time.Hour-1).Truncate(time.Hour*24)`
`457`	`457`
`458`	`458`	`dateEntry:=seens[date]`
`459`	`459`	`ifdateEntry==nil {`
`@@ -492,7 +492,7 @@ func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]da`
`492`	`492`	`ifas.ConnectionCount==0 {`
`493`	`493`	`continue`
`494`	`494`	`}`
`495`		`-date:=as.CreatedAt.UTC().Add(time.Duration(tzOffset)time.Hour).Truncate(time.Hour24)`
	`495`	`+date:=as.CreatedAt.UTC().Add(time.Duration(tzOffset)-1time.Hour).Truncate(time.Hour*24)`
`496`	`496`
`497`	`497`	`dateEntry:=seens[date]`
`498`	`498`	`ifdateEntry==nil {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func TestCache_TemplateUsers(t *testing.T) {`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`name:"tzOffset",`
`154`		`-tzOffset:-1,`
	`154`	`+tzOffset:1,`
`155`	`155`	`args:args{`
`156`	`156`	`rows: []database.InsertWorkspaceAgentStatParams{`
`157`	`157`	`statRow(zebra,dateH(2022,1,2,1)),`
`@@ -180,7 +180,7 @@ func TestCache_TemplateUsers(t *testing.T) {`
`180`	`180`	`},`
`181`	`181`	`{`
`182`	`182`	`name:"tzOffsetPreviousDay",`
`183`		`-tzOffset:-6,`
	`183`	`+tzOffset:6,`
`184`	`184`	`args:args{`
`185`	`185`	`rows: []database.InsertWorkspaceAgentStatParams{`
`186`	`186`	`statRow(zebra,dateH(2022,1,2,1)),`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -831,8 +831,11 @@ export const getTemplateDAUs = async (`
`831`	`831`	`returnresponse.data`
`832`	`832`	`}`
`833`	`833`
`834`		`-exportconstgetDeploymentDAUs=async():Promise<TypesGen.DAUsResponse>=>{`
`835`		-constresponse=awaitaxios.get(`/api/v2/insights/daus`)
	`834`	`+exportconstgetDeploymentDAUs=async(`
	`835`	`+// Default to user's local timezone`
	`836`	`+offset=newDate().getTimezoneOffset()/60,`
	`837`	`+):Promise<TypesGen.DAUsResponse>=>{`
	`838`	+constresponse=awaitaxios.get(`/api/v2/insights/daus?tz_offset=${offset}`)
`836`	`839`	`returnresponse.data`
`837`	`840`	`}`
`838`	`841`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ export const deploymentConfigMachine = createMachine(`
`64`	`64`	`{`
`65`	`65`	`services:{`
`66`	`66`	`getDeploymentValues:getDeploymentValues,`
`67`		`-getDeploymentDAUs:getDeploymentDAUs,`
	`67`	`+getDeploymentDAUs:async()=>{`
	`68`	`+returngetDeploymentDAUs()`
	`69`	`+},`
`68`	`70`	`},`
`69`	`71`	`actions:{`
`70`	`72`	`assignDeploymentValues:assign({`

Comments

(0)