Ordering of users in fetch

Emyrk · Emyrk · commit 8858fd3fc135 · 2023-02-03T14:25:50.000-06:00
diff --git a/coderd/authzquery/user.go b/coderd/authzquery/user.go
@@ -92,6 +92,7 @@ func (q *AuthzQuerier) GetUsersWithCount(ctx context.Context, arg database.GetUs
 	return users, rowUsers[0].Count, nil
 }
 
+// TODO: Remove this and use a filter on GetUsers
 func (q *AuthzQuerier) GetUsersByIDs(ctx context.Context, ids []uuid.UUID) ([]database.User, error) {
 	return fetchWithPostFilter(q.auth, q.db.GetUsersByIDs)(ctx, ids)
 }
diff --git a/coderd/authzquery/user_test.go b/coderd/authzquery/user_test.go
@@ -2,6 +2,7 @@ package authzquery_test
 
 import (
 	"testing"
+	"time"
 
 	"github.com/coder/coder/coderd/util/slice"
 
@@ -60,24 +61,24 @@ func (s *MethodTestSuite) TestUser() {
 	})
 	s.Run("GetUsers", func() {
 		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
-			a := dbgen.User(t, db, database.User{})
-			b := dbgen.User(t, db, database.User{})
+			a := dbgen.User(t, db, database.User{CreatedAt: database.Now().Add(-time.Hour)})
+			b := dbgen.User(t, db, database.User{CreatedAt: database.Now()})
 			return methodCase(values(database.GetUsersParams{}),
 				asserts(a, rbac.ActionRead, b, rbac.ActionRead),
 				nil)
 		})
 	})
 	s.Run("GetUsersWithCount", func() {
 		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
-			a := dbgen.User(t, db, database.User{})
-			b := dbgen.User(t, db, database.User{})
+			a := dbgen.User(t, db, database.User{CreatedAt: database.Now().Add(-time.Hour)})
+			b := dbgen.User(t, db, database.User{CreatedAt: database.Now()})
 			return methodCase(values(database.GetUsersParams{}), asserts(a, rbac.ActionRead, b, rbac.ActionRead), nil)
 		})
 	})
 	s.Run("GetUsersByIDs", func() {
 		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
-			a := dbgen.User(t, db, database.User{})
-			b := dbgen.User(t, db, database.User{})
+			a := dbgen.User(t, db, database.User{CreatedAt: database.Now().Add(-time.Hour)})
+			b := dbgen.User(t, db, database.User{CreatedAt: database.Now()})
 			return methodCase(values([]uuid.UUID{a.ID, b.ID}),
 				asserts(a, rbac.ActionRead, b, rbac.ActionRead),
 				values(slice.New(a, b)))

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ func (q *AuthzQuerier) GetUsersWithCount(ctx context.Context, arg database.GetUs`
`92`	`92`	`return users, rowUsers[0].Count, nil`
`93`	`93`	`}`
`94`	`94`
	`95`	`+// TODO: Remove this and use a filter on GetUsers`
`95`	`96`	`func (q *AuthzQuerier) GetUsersByIDs(ctx context.Context, ids []uuid.UUID) ([]database.User, error) {`
`96`	`97`	`return fetchWithPostFilter(q.auth, q.db.GetUsersByIDs)(ctx, ids)`
`97`	`98`	`}`