add 15 min of app usage -> active user on last day

mafredri · mafredri · commit 3d4392650a71 · 2023-08-22T15:01:49.000Z
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -1061,24 +1061,27 @@ func TestTemplateInsights_Golden(t *testing.T) {
 						endedAt:   weekAgo.Add(time.Hour),
 						requests:  1,
 					},
-					// { // used an app on the last day, counts as active user.
-					// 	app:       users[0].workspaces[0].apps[2],
-					// 	startedAt: weekAgo.AddDate(0, 0, 6),
-					// 	endedAt:   weekAgo.AddDate(0, 0, 6).Add(12 * time.Minute),
+					{ // used an app on the last day, counts as active user, 12m -> 15m rounded.
+						app:       users[0].workspaces[0].apps[2],
+						startedAt: weekAgo.AddDate(0, 0, 6),
+						endedAt:   weekAgo.AddDate(0, 0, 6).Add(12 * time.Minute),
+						requests:  1,
+					},
+				},
+			},
+			users[0].workspaces[1]: {
+				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: weekAgo,
+					// 	endedAt:   weekAgo.Add(time.Hour),
 					// 	requests:  1,
 					// },
 				},
 			},
-			// users[0].workspaces[1]: {
-			// 	appUsage: []appUsage{
-			// 		{ // One hour of usage, but same user and same template app, only count once.
-			// 			app:       users[0].workspaces[1].apps[0],
-			// 			startedAt: weekAgo,
-			// 			endedAt:   weekAgo.Add(time.Hour),
-			// 			requests:  1,
-			// 		},
-			// 	},
-			// },
 		}
 	}
 	type testRequest struct {
diff --git a/coderd/testdata/insights/multiple_users_and_workspaces_week_all_templates.json.golden b/coderd/testdata/insights/multiple_users_and_workspaces_week_all_templates.json.golden
@@ -56,6 +56,16 @@
         "slug": "app1",
         "icon": "/icon1.png",
         "seconds": 3600
+      },
+      {
+        "template_ids": [
+          "00000000-0000-0000-0000-000000000001"
+        ],
+        "type": "app",
+        "display_name": "app3",
+        "slug": "app3",
+        "icon": "/icon2.png",
+        "seconds": 900
       }
     ],
     "parameters_usage": []
@@ -112,9 +122,11 @@
     {
       "start_time": "2023-08-21T00:00:00Z",
       "end_time": "2023-08-22T00:00:00Z",
-      "template_ids": [],
+      "template_ids": [
+        "00000000-0000-0000-0000-000000000001"
+      ],
       "interval": "day",
-      "active_users": 0
+      "active_users": 1
     }
   ]
 }
diff --git a/coderd/testdata/insights/multiple_users_and_workspaces_week_deployment_wide.json.golden b/coderd/testdata/insights/multiple_users_and_workspaces_week_deployment_wide.json.golden
@@ -56,6 +56,16 @@
         "slug": "app1",
         "icon": "/icon1.png",
         "seconds": 3600
+      },
+      {
+        "template_ids": [
+          "00000000-0000-0000-0000-000000000001"
+        ],
+        "type": "app",
+        "display_name": "app3",
+        "slug": "app3",
+        "icon": "/icon2.png",
+        "seconds": 900
       }
     ],
     "parameters_usage": []
@@ -112,9 +122,11 @@
     {
       "start_time": "2023-08-21T00:00:00Z",
       "end_time": "2023-08-22T00:00:00Z",
-      "template_ids": [],
+      "template_ids": [
+        "00000000-0000-0000-0000-000000000001"
+      ],
       "interval": "day",
-      "active_users": 0
+      "active_users": 1
     }
   ]
 }
diff --git a/coderd/testdata/insights/multiple_users_and_workspaces_week_first_template.json.golden b/coderd/testdata/insights/multiple_users_and_workspaces_week_first_template.json.golden
@@ -56,6 +56,16 @@
         "slug": "app1",
         "icon": "/icon1.png",
         "seconds": 3600
+      },
+      {
+        "template_ids": [
+          "00000000-0000-0000-0000-000000000001"
+        ],
+        "type": "app",
+        "display_name": "app3",
+        "slug": "app3",
+        "icon": "/icon2.png",
+        "seconds": 900
       }
     ],
     "parameters_usage": []
@@ -112,9 +122,11 @@
     {
       "start_time": "2023-08-21T00:00:00Z",
       "end_time": "2023-08-22T00:00:00Z",
-      "template_ids": [],
+      "template_ids": [
+        "00000000-0000-0000-0000-000000000001"
+      ],
       "interval": "day",
-      "active_users": 0
+      "active_users": 1
     }
   ]
 }
