chore: alphabetize template list (#3363)

bpmct · web-flow · commit f14efd1a2b5e · 2022-08-05T13:03:22.000-05:00
diff --git a/cli/templatelist_test.go b/cli/templatelist_test.go
@@ -1,6 +1,7 @@
 package cli_test
 
 import (
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -36,10 +37,15 @@ func TestTemplateList(t *testing.T) {
 			errC <- cmd.Execute()
 		}()
 
+		// expect that templates are listed alphebetically
+		var templatesList = []string{firstTemplate.Name, secondTemplate.Name}
+		sort.Strings(templatesList)
+
 		require.NoError(t, <-errC)
 
-		pty.ExpectMatch(firstTemplate.Name)
-		pty.ExpectMatch(secondTemplate.Name)
+		for _, name := range templatesList {
+			pty.ExpectMatch(name)
+		}
 	})
 	t.Run("NoTemplates", func(t *testing.T) {
 		t.Parallel()
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -897,8 +897,8 @@ func (q *fakeQuerier) GetTemplatesWithFilter(_ context.Context, arg database.Get
 	}
 	if len(templates) > 0 {
 		slices.SortFunc(templates, func(i, j database.Template) bool {
-			if !i.CreatedAt.Before(j.CreatedAt) {
-				return false
+			if i.Name != j.Name {
+				return i.Name < j.Name
 			}
 			return i.ID.String() < j.ID.String()
 		})
@@ -1080,8 +1080,8 @@ func (q *fakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
 
 	templates := slices.Clone(q.templates)
 	slices.SortFunc(templates, func(i, j database.Template) bool {
-		if !i.CreatedAt.Before(j.CreatedAt) {
-			return false
+		if i.Name != j.Name {
+			return i.Name < j.Name
 		}
 		return i.ID.String() < j.ID.String()
 	})
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
@@ -34,7 +34,7 @@ WHERE
 			id = ANY(@ids)
 		ELSE true
 	END
-ORDER BY (created_at, id) ASC
+ORDER BY (name, id) ASC
 ;
 
 -- name: GetTemplateByOrganizationAndName :one
@@ -51,7 +51,7 @@ LIMIT
 
 -- name: GetTemplates :many
 SELECT * FROM templates
-ORDER BY (created_at, id) ASC
+ORDER BY (name, id) ASC
 ;
 
 -- name: InsertTemplate :one

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ WHERE`
`34`	`34`	`id = ANY(@ids)`
`35`	`35`	`ELSE true`
`36`	`36`	`END`
`37`		`-ORDER BY (created_at, id) ASC`
	`37`	`+ORDER BY (name, id) ASC`
`38`	`38`	`;`
`39`	`39`
`40`	`40`	`-- name: GetTemplateByOrganizationAndName :one`
`@@ -51,7 +51,7 @@ LIMIT`
`51`	`51`
`52`	`52`	`-- name: GetTemplates :many`
`53`	`53`	`SELECT * FROM templates`
`54`		`-ORDER BY (created_at, id) ASC`
	`54`	`+ORDER BY (name, id) ASC`
`55`	`55`	`;`
`56`	`56`
`57`	`57`	`-- name: InsertTemplate :one`