diff --git a/coderd/insights_test.go b/coderd/insights_test.go index be50083e0c..916d3e6870 100644 --- a/coderd/insights_test.go +++ b/coderd/insights_test.go @@ -956,15 +956,12 @@ func TestTemplateInsights_Golden(t *testing.T) { }, }, appUsage: []appUsage{ - // TODO(mafredri): This doesn't behave correctly right now - // and will add more usage to the app. This could be - // considered both correct and incorrect behavior. - // { // One hour of usage, but same user and same template app, only count once. - // app: users[0].workspaces[1].apps[0], - // startedAt: frozenWeekAgo, - // endedAt: frozenWeekAgo.Add(time.Hour), - // requests: 1, - // }, + { // One hour of usage, but same user and same template app, only count once. + app: users[0].workspaces[1].apps[0], + startedAt: frozenWeekAgo, + endedAt: frozenWeekAgo.Add(time.Hour), + requests: 1, + }, { // Different templates but identical apps, apps will be // combined and usage will be summed. @@ -1811,15 +1808,12 @@ func TestUserActivityInsights_Golden(t *testing.T) { }, }, appUsage: []appUsage{ - // TODO(mafredri): This doesn't behave correctly right now - // and will add more usage to the app. This could be - // considered both correct and incorrect behavior. - // { // One hour of usage, but same user and same template app, only count once. - // app: users[0].workspaces[1].apps[0], - // startedAt: frozenWeekAgo, - // endedAt: frozenWeekAgo.Add(time.Hour), - // requests: 1, - // }, + { // One hour of usage, but same user and same template app, only count once. + app: users[0].workspaces[1].apps[0], + startedAt: frozenWeekAgo, + endedAt: frozenWeekAgo.Add(time.Hour), + requests: 1, + }, { // Different templates but identical apps, apps will be // combined and usage will be summed. diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden index e9a7e1a8cc..c37694aae6 100644 --- a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden +++ b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden @@ -53,7 +53,7 @@ "display_name": "app1", "slug": "app1", "icon": "/icon1.png", - "seconds": 21600 + "seconds": 25200 } ], "parameters_usage": [] diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden index 3107db7593..2e487c498f 100644 --- a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden +++ b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden @@ -53,7 +53,7 @@ "display_name": "app1", "slug": "app1", "icon": "/icon1.png", - "seconds": 21600 + "seconds": 25200 } ], "parameters_usage": [] diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden index ab5ac93555..f4a4560213 100644 --- a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden +++ b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden @@ -51,7 +51,7 @@ "display_name": "app1", "slug": "app1", "icon": "/icon1.png", - "seconds": 21600 + "seconds": 25200 } ], "parameters_usage": []