From a419991bdcf35a23929dce9a2eafa7afdccfe5c2 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 10:53:32 -0400 Subject: [PATCH 1/7] Have FE query correct tz_offset data --- site/src/api/api.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 1fc8ed56f9b50..606344e450f24 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -831,8 +831,10 @@ export const getTemplateDAUs = async ( return response.data } -export const getDeploymentDAUs = async (): Promise => { - const response = await axios.get(`/api/v2/insights/daus`) +export const getDeploymentDAUs = async ( + offset = new Date().getTimezoneOffset() / 60, +): Promise => { + const response = await axios.get(`/api/v2/insights/daus?tz_offset${offset}`) return response.data } From 9b008b6a580b8ea11584e32d404036a94a1f8bd5 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 11:05:54 -0400 Subject: [PATCH 2/7] Comment --- site/src/api/api.ts | 1 + .../src/xServices/deploymentConfig/deploymentConfigMachine.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 606344e450f24..7d79b47b52131 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -832,6 +832,7 @@ export const getTemplateDAUs = async ( } export const getDeploymentDAUs = async ( + // Default to user's local timezone offset = new Date().getTimezoneOffset() / 60, ): Promise => { const response = await axios.get(`/api/v2/insights/daus?tz_offset${offset}`) diff --git a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts index 7c4fc4c074720..33e99ee3c4843 100644 --- 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({ From a241d0747c1ea651440e264e2dd0a347ad983fa9 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 11:08:21 -0400 Subject: [PATCH 3/7] facepalm, assign the int --- site/src/api/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index 7d79b47b52131..897d474ebe2bb 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -835,7 +835,7 @@ export const getDeploymentDAUs = async ( // Default to user's local timezone offset = new Date().getTimezoneOffset() / 60, ): Promise => { - const response = await axios.get(`/api/v2/insights/daus?tz_offset${offset}`) + const response = await axios.get(`/api/v2/insights/daus?tz_offset=${offset}`) return response.data } From c28ddb144a4de58fffece78fd8cf310969f2fbb9 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 22:20:10 +0700 Subject: [PATCH 4/7] Fix the fake --- coderd/database/dbfake/databasefake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go index 31754186eb076..529a45781a9cc 100644 --- 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 { From 3b00cd37767ece66767d4be02b6a26d4343a34ff Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 15:24:02 +0000 Subject: [PATCH 5/7] yarn fmt --- site/src/xServices/deploymentConfig/deploymentConfigMachine.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts index 33e99ee3c4843..52ecc37223db9 100644 --- a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts +++ b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts @@ -64,7 +64,7 @@ export const deploymentConfigMachine = createMachine( { services: { getDeploymentValues: getDeploymentValues, - getDeploymentDAUs: async() => { + getDeploymentDAUs: async () => { return getDeploymentDAUs() }, }, From 70f099b2e2789173db891645437e739ae4317ebc Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 31 May 2023 14:52:57 -0400 Subject: [PATCH 6/7] fix dbfake deployment DAU --- coderd/database/dbfake/databasefake.go | 2 +- coderd/metricscache/metricscache_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go index 529a45781a9cc..841e2e082c204 100644 --- a/coderd/database/dbfake/databasefake.go +++ b/coderd/database/dbfake/databasefake.go @@ -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 index 4bc6c445e7174..abf806d9bb5f9 100644 --- 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)), From 594de68a0dfc214298b22ab2b9f1e6f3a914955b Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 1 Jun 2023 08:26:47 -0400 Subject: [PATCH 7/7] Correct timezone --- coderd/metricscache/metricscache_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/metricscache/metricscache_test.go b/coderd/metricscache/metricscache_test.go index abf806d9bb5f9..b7d3aa9eaf957 100644 --- a/coderd/metricscache/metricscache_test.go +++ b/coderd/metricscache/metricscache_test.go @@ -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)),