synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: sort users by username (#7838)

Browse Source
This commit is contained in:
Marcin Tojek
2023-06-06 08:47:59 +02:00
committed by GitHub
parent 2ad1308450
commit 93378daeb3
6 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coderd/users_test.go
View File

@ -1579,10 +1579,7 @@ func TestPaginatedUsers(t *testing.T) {
err = eg.Wait()
require.NoError(t, err, "create users failed")
// Sorting the users will sort by (created_at, uuid). This is to handle
// the off case that created_at is identical for 2 users.
// This is a really rare case in production, but does happen in unit tests
// due to the fake database being in memory and exceptionally quick.
// Sorting the users will sort by username.
sortUsers(allUsers)
sortUsers(specialUsers)
@ -1697,10 +1694,7 @@ func assertPagination(ctx context.Context, t *testing.T, client *codersdk.Client
// sortUsers sorts by (created_at, id)
func sortUsers(users []codersdk.User) {
sort.Slice(users, func(i, j int) bool {
if users[i].CreatedAt.Equal(users[j].CreatedAt) {
return users[i].ID.String() < users[j].ID.String()
}
return users[i].CreatedAt.Before(users[j].CreatedAt)
return users[i].Username < users[j].Username
})
}