fix: Order database queries for templates (#3249)

mafredri · web-flow · commit cef622d77cb4 · 2022-07-27T15:04:29.000Z
* fix: Order database queries for templates

Fixes a race in a test where the order of templates varies.

* fix: Add sorting to databasefake as well
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -626,7 +626,8 @@ func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context,
 }
 
 func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context,
-	params database.GetWorkspaceBuildByWorkspaceIDParams) ([]database.WorkspaceBuild, error) {
+	params database.GetWorkspaceBuildByWorkspaceIDParams,
+) ([]database.WorkspaceBuild, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
@@ -893,6 +894,12 @@ func (q *fakeQuerier) GetTemplatesWithFilter(_ context.Context, arg database.Get
 		templates = append(templates, template)
 	}
 	if len(templates) > 0 {
+		slices.SortFunc(templates, func(i, j database.Template) bool {
+			if !i.CreatedAt.Before(j.CreatedAt) {
+				return false
+			}
+			return i.ID.String() < j.ID.String()
+		})
 		return templates, nil
 	}
 
@@ -1069,7 +1076,15 @@ func (q *fakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
-	return q.templates[:], nil
+	templates := slices.Clone(q.templates)
+	slices.SortFunc(templates, func(i, j database.Template) bool {
+		if !i.CreatedAt.Before(j.CreatedAt) {
+			return false
+		}
+		return i.ID.String() < j.ID.String()
+	})
+
+	return templates, nil
 }
 
 func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) {
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,6 +34,7 @@ WHERE
 			id = ANY(@ids)
 		ELSE true
 	END
+ORDER BY (created_at, id) ASC
 ;
 
 -- name: GetTemplateByOrganizationAndName :one
@@ -49,7 +50,9 @@ LIMIT
 	1;
 
 -- name: GetTemplates :many
-SELECT * FROM templates;
+SELECT * FROM templates
+ORDER BY (created_at, id) ASC
+;
 
 -- name: InsertTemplate :one
 INSERT INTO
