selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* Have FE query correct tz_offset data
This commit is contained in:
Steven Masley 2023-06-01 09:23:50 -04:00 committed by GitHub
parent 555ea64669
commit cf8d2bc096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coderd/database/dbfake/databasefake.go
View File

@ -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 {

4
coderd/metricscache/metricscache_test.go
View File

@ -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)),

7
site/src/api/api.ts
View File

@ -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
}

4
site/src/xServices/deploymentConfig/deploymentConfigMachine.ts
View File

@ -64,7 +64,9 @@ export const deploymentConfigMachine = createMachine(
{
services: {
getDeploymentValues: getDeploymentValues,
getDeploymentDAUs: getDeploymentDAUs,
getDeploymentDAUs: async () => {
return getDeploymentDAUs()
},
},
actions: {
assignDeploymentValues: assign({