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

Emyrk · web-flow · commit cf8d2bc09656 · 2023-06-01T09:23:50.000-04:00
* Have FE query correct tz_offset data
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -453,7 +453,7 @@ func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, arg database.GetTemplat
 			continue
 		}
 
-		date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour).Truncate(time.Hour * 24)
+		date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour * -1).Truncate(time.Hour * 24)
 
 		dateEntry := seens[date]
 		if dateEntry == nil {
@@ -492,7 +492,7 @@ func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]da
 		if as.ConnectionCount == 0 {
 			continue
 		}
-		date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * time.Hour).Truncate(time.Hour * 24)
+		date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * -1 * time.Hour).Truncate(time.Hour * 24)
 
 		dateEntry := seens[date]
 		if dateEntry == nil {
diff --git a/coderd/metricscache/metricscache_test.go b/coderd/metricscache/metricscache_test.go
@@ -151,7 +151,7 @@ func TestCache_TemplateUsers(t *testing.T) {
 		},
 		{
 			name:     "tzOffset",
-			tzOffset: -1,
+			tzOffset: 1,
 			args: args{
 				rows: []database.InsertWorkspaceAgentStatParams{
 					statRow(zebra, dateH(2022, 1, 2, 1)),
@@ -180,7 +180,7 @@ func TestCache_TemplateUsers(t *testing.T) {
 		},
 		{
 			name:     "tzOffsetPreviousDay",
-			tzOffset: -6,
+			tzOffset: 6,
 			args: args{
 				rows: []database.InsertWorkspaceAgentStatParams{
 					statRow(zebra, dateH(2022, 1, 2, 1)),
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -831,8 +831,11 @@ export const getTemplateDAUs = async (
   return response.data
 }
 
-export const getDeploymentDAUs = async (): Promise<TypesGen.DAUsResponse> => {
-  const response = await axios.get(`/api/v2/insights/daus`)
+export const getDeploymentDAUs = async (
+  // Default to user's local timezone
+  offset = new Date().getTimezoneOffset() / 60,
+): Promise<TypesGen.DAUsResponse> => {
+  const response = await axios.get(`/api/v2/insights/daus?tz_offset=${offset}`)
   return response.data
 }
 
diff --git a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts
@@ -64,7 +64,9 @@ export const deploymentConfigMachine = createMachine(
   {
     services: {
       getDeploymentValues: getDeploymentValues,
-      getDeploymentDAUs: getDeploymentDAUs,
+      getDeploymentDAUs: async () => {
+        return getDeploymentDAUs()
+      },
     },
     actions: {
       assignDeploymentValues: assign({

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.Hour * 24)`
	`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`	`if dateEntry == nil {`
`@@ -492,7 +492,7 @@ func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]da`
`492`	`492`	`if as.ConnectionCount == 0 {`
`493`	`493`	`continue`
`494`	`494`	`}`
`495`		`- date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * time.Hour).Truncate(time.Hour * 24)`
	`495`	`+ date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * -1 * time.Hour).Truncate(time.Hour * 24)`
`496`	`496`
`497`	`497`	`dateEntry := seens[date]`
`498`	`498`	`if dateEntry == nil {`
Original file line number	Diff line number	Diff line change
`@@ -831,8 +831,11 @@ export const getTemplateDAUs = async (`
`831`	`831`	`return response.data`
`832`	`832`	`}`
`833`	`833`
`834`		`-export const getDeploymentDAUs = async (): Promise<TypesGen.DAUsResponse> => {`
`835`		- const response = await axios.get(`/api/v2/insights/daus`)
	`834`	`+export const getDeploymentDAUs = async (`
	`835`	`+ // Default to user's local timezone`
	`836`	`+ offset = new Date().getTimezoneOffset() / 60,`
	`837`	`+): Promise<TypesGen.DAUsResponse> => {`
	`838`	+ const response = await axios.get(`/api/v2/insights/daus?tz_offset=${offset}`)
`836`	`839`	`return response.data`
`837`	`840`	`}`
`838`	`841`