Complete tests

ammario · ammario · commit 0f5f07bbc7c4 · 2022-10-14T20:15:19.000Z
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -118,7 +118,7 @@ JOIN provisioner_jobs pj ON
 	workspace_builds.job_id = pj.id
 WHERE
 	template_versions.template_id = @template_id AND
-		(workspace_builds.transition = "start") AND
+		(workspace_builds.transition = 'start') AND
 		(pj.completed_at IS NOT NULL) AND (pj.started_at IS NOT NULL) AND
 		(pj.started_at > @start_time) AND
 		(pj.canceled_at IS NULL) AND
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -772,7 +772,15 @@ func (api *API) convertTemplate(
 	template database.Template, workspaceOwnerCount uint32, createdByName string,
 ) codersdk.Template {
 	activeCount, _ := api.metricsCache.TemplateUniqueUsers(template.ID)
-	averageBuildTime, _ := api.metricsCache.TemplateAverageBuildTimeSec(template.ID)
+
+	var averageBuildTimeMillis int64
+	averageBuildTime, ok := api.metricsCache.TemplateAverageBuildTime(template.ID)
+	if !ok {
+		averageBuildTimeMillis = -1
+	} else {
+		averageBuildTimeMillis = int64(averageBuildTime / time.Millisecond)
+	}
+
 	return codersdk.Template{
 		ID:                         template.ID,
 		CreatedAt:                  template.CreatedAt,
@@ -783,7 +791,7 @@ func (api *API) convertTemplate(
 		ActiveVersionID:            template.ActiveVersionID,
 		WorkspaceOwnerCount:        workspaceOwnerCount,
 		ActiveUserCount:            activeCount,
-		AverageBuildTimeMillis:     int64(averageBuildTime / time.Millisecond),
+		AverageBuildTimeMillis:     averageBuildTimeMillis,
 		Description:                template.Description,
 		Icon:                       template.Icon,
 		MaxTTLMillis:               time.Duration(template.MaxTtl).Milliseconds(),
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -561,7 +561,7 @@ func TestDeleteTemplate(t *testing.T) {
 	})
 }
 
-func TestTemplateDAUs(t *testing.T) {
+func TestTemplateMetrics(t *testing.T) {
 	t.Parallel()
 
 	client := coderdtest.New(t, &coderdtest.Options{
@@ -594,6 +594,7 @@ func TestTemplateDAUs(t *testing.T) {
 	})
 	template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 	require.Equal(t, -1, template.ActiveUserCount)
+	require.EqualValues(t, -1, template.AverageBuildTimeMillis)
 
 	coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
 	workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
@@ -660,6 +661,7 @@ func TestTemplateDAUs(t *testing.T) {
 	template, err = client.Template(ctx, template.ID)
 	require.NoError(t, err)
 	require.Equal(t, 1, template.ActiveUserCount)
+	require.Greater(t, template.AverageBuildTimeMillis, int64(1))
 
 	workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
 	require.NoError(t, err)
