sort

mtojek · mtojek · commit 6582a484ad96 · 2024-09-16T13:54:08.000+02:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5963,6 +5963,10 @@ func (q *FakeQuerier) GetWorkspaceBuildStatsByTemplates(ctx context.Context, sin
 	for _, ts := range templateStats {
 		rows = append(rows, ts)
 	}
+
+	sort.Slice(rows, func(i, j int) bool {
+		return rows[i].TemplateName < rows[j].TemplateName
+	})
 	return rows, nil
 }
 
diff --git a/coderd/database/queries/workspacebuilds.sql b/coderd/database/queries/workspacebuilds.sql
@@ -204,6 +204,8 @@ WHERE
     AND pj.completed_at IS NOT NULL
 GROUP BY
     w.template_id, template_name, template_display_name, template_organization_id;
+ORDER BY
+    template_name ASC;
 
 -- name: GetFailedWorkspaceBuildsByTemplateID :many
 SELECT
diff --git a/coderd/notifications/reports/generator.go b/coderd/notifications/reports/generator.go
@@ -110,9 +110,6 @@ func reportFailedWorkspaceBuilds(ctx context.Context, logger slog.Logger, db dat
 	if err != nil {
 		return xerrors.Errorf("unable to fetch failed workspace builds: %w", err)
 	}
-	sort.Slice(statsRows, func(i, j int) bool {
-		return statsRows[i].TemplateName < statsRows[j].TemplateName
-	})
 
 	reportGeneratedNow := map[uuid.UUID]bool{}
 	for _, stats := range statsRows {

Original file line number	Diff line number	Diff line change
`@@ -5963,6 +5963,10 @@ func (q *FakeQuerier) GetWorkspaceBuildStatsByTemplates(ctx context.Context, sin`
`5963`	`5963`	`for _, ts := range templateStats {`
`5964`	`5964`	`rows = append(rows, ts)`
`5965`	`5965`	`}`
	`5966`	`+`
	`5967`	`+ sort.Slice(rows, func(i, j int) bool {`
	`5968`	`+ return rows[i].TemplateName < rows[j].TemplateName`
	`5969`	`+ })`
`5966`	`5970`	`return rows, nil`
`5967`	`5971`	`}`
`5968`	`5972`
Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,6 @@ func reportFailedWorkspaceBuilds(ctx context.Context, logger slog.Logger, db dat`
`110`	`110`	`if err != nil {`
`111`	`111`	`return xerrors.Errorf("unable to fetch failed workspace builds: %w", err)`
`112`	`112`	`}`
`113`		`- sort.Slice(statsRows, func(i, j int) bool {`
`114`		`- return statsRows[i].TemplateName < statsRows[j].TemplateName`
`115`		`- })`
`116`	`113`
`117`	`114`	`reportGeneratedNow := map[uuid.UUID]bool{}`
`118`	`115`	`for _, stats := range statsRows {`