test app merging

mafredri · mafredri · commit 188b558447ec · 2023-08-22T15:14:06.000Z
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -1092,6 +1092,14 @@ func TestTemplateInsights_Golden(t *testing.T) {
 					// 	endedAt:   weekAgo.Add(time.Hour),
 					// 	requests:  1,
 					// },
+					{
+						// Different templates but identical apps, apps will be
+						// combined and usage will be summed.
+						app:       users[0].workspaces[1].apps[0],
+						startedAt: weekAgo.AddDate(0, 0, 2),
+						endedAt:   weekAgo.AddDate(0, 0, 2).Add(6 * time.Hour),
+						requests:  1,
+					},
 				},
 			},
 			users[0].workspaces[2]: {
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
@@ -54,17 +54,18 @@
       },
       {
         "template_ids": [
+          "00000000-0000-0000-0000-000000000001",
           "00000000-0000-0000-0000-000000000002"
         ],
         "type": "app",
         "display_name": "app1",
         "slug": "app1",
         "icon": "/icon1.png",
-        "seconds": 3600
+        "seconds": 25200
       },
       {
         "template_ids": [
-          "00000000-0000-0000-0000-000000000002"
+          "00000000-0000-0000-0000-000000000001"
         ],
         "type": "app",
         "display_name": "app3",
@@ -90,7 +91,7 @@
       "start_time": "2023-08-16T00:00:00Z",
       "end_time": "2023-08-17T00:00:00Z",
       "template_ids": [
-        "00000000-0000-0000-0000-000000000002"
+        "00000000-0000-0000-0000-000000000001"
       ],
       "interval": "day",
       "active_users": 1
@@ -99,6 +100,7 @@
       "start_time": "2023-08-17T00:00:00Z",
       "end_time": "2023-08-18T00:00:00Z",
       "template_ids": [
+        "00000000-0000-0000-0000-000000000001",
         "00000000-0000-0000-0000-000000000002"
       ],
       "interval": "day",
@@ -129,7 +131,7 @@
       "start_time": "2023-08-21T00:00:00Z",
       "end_time": "2023-08-22T00:00:00Z",
       "template_ids": [
-        "00000000-0000-0000-0000-000000000002"
+        "00000000-0000-0000-0000-000000000001"
       ],
       "interval": "day",
       "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
@@ -54,17 +54,18 @@
       },
       {
         "template_ids": [
+          "00000000-0000-0000-0000-000000000001",
           "00000000-0000-0000-0000-000000000002"
         ],
         "type": "app",
         "display_name": "app1",
         "slug": "app1",
         "icon": "/icon1.png",
-        "seconds": 3600
+        "seconds": 25200
       },
       {
         "template_ids": [
-          "00000000-0000-0000-0000-000000000002"
+          "00000000-0000-0000-0000-000000000001"
         ],
         "type": "app",
         "display_name": "app3",
@@ -90,7 +91,7 @@
       "start_time": "2023-08-16T00:00:00Z",
       "end_time": "2023-08-17T00:00:00Z",
       "template_ids": [
-        "00000000-0000-0000-0000-000000000002"
+        "00000000-0000-0000-0000-000000000001"
       ],
       "interval": "day",
       "active_users": 1
@@ -99,6 +100,7 @@
       "start_time": "2023-08-17T00:00:00Z",
       "end_time": "2023-08-18T00:00:00Z",
       "template_ids": [
+        "00000000-0000-0000-0000-000000000001",
         "00000000-0000-0000-0000-000000000002"
       ],
       "interval": "day",
@@ -129,7 +131,7 @@
       "start_time": "2023-08-21T00:00:00Z",
       "end_time": "2023-08-22T00:00:00Z",
       "template_ids": [
-        "00000000-0000-0000-0000-000000000002"
+        "00000000-0000-0000-0000-000000000001"
       ],
       "interval": "day",
       "active_users": 1
diff --git a/coderd/testdata/insights/multiple_users_and_workspaces_week_second_template.json.golden b/coderd/testdata/insights/multiple_users_and_workspaces_week_second_template.json.golden
@@ -46,6 +46,16 @@
         "slug": "ssh",
         "icon": "/icon/terminal.svg",
         "seconds": 3600
+      },
+      {
+        "template_ids": [
+          "00000000-0000-0000-0000-000000000001"
+        ],
+        "type": "app",
+        "display_name": "app1",
+        "slug": "app1",
+        "icon": "/icon1.png",
+        "seconds": 21600
       }
     ],
     "parameters_usage": []
@@ -70,9 +80,11 @@
     {
       "start_time": "2023-08-17T00:00:00Z",
       "end_time": "2023-08-18T00:00:00Z",
-      "template_ids": [],
+      "template_ids": [
+        "00000000-0000-0000-0000-000000000001"
+      ],
       "interval": "day",
-      "active_users": 0
+      "active_users": 1
     },
     {
       "start_time": "2023-08-18T00:00:00Z",
