Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions coderd/database/querier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,53 @@ func TestGetWorkspaceAgentUsageStatsAndLabels(t *testing.T) {
})
}

// A deleted user's username can be reused, so the requester's own
// workspaces must be matched by owner ID, not by owner username.
func TestGetWorkspacesOrderIgnoresDeletedUserWithRequesterUsername(t *testing.T) {
t.Parallel()
if testing.Short() {
t.SkipNow()
}

db, _ := dbtestutil.NewDB(t)
ctx := testutil.Context(t, testutil.WaitShort)

org := dbgen.Organization(t, db, database.Organization{})
deletedWorkspace := func(owner database.User, name string) database.WorkspaceTable {
return dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
Name: name,
OwnerID: owner.ID,
OrganizationID: org.ID,
Deleted: true,
}).Seed(database.WorkspaceBuild{
Transition: database.WorkspaceTransitionDelete,
}).Do().Workspace
}

formerUser := dbgen.User(t, db, database.User{Username: "reused-username"})
formerWorkspace := deletedWorkspace(formerUser, "aaa")
err := db.FavoriteWorkspace(ctx, formerWorkspace.ID)
require.NoError(t, err)
err = db.UpdateUserDeletedByID(ctx, formerUser.ID)
require.NoError(t, err)

requester := dbgen.User(t, db, database.User{Username: formerUser.Username})
requesterWorkspace := deletedWorkspace(requester, "zzz")

rows, err := db.GetWorkspaces(ctx, database.GetWorkspacesParams{
Deleted: true,
OrganizationID: org.ID,
RequesterID: requester.ID,
})
require.NoError(t, err)
names := make([]string, 0, len(rows))
for _, row := range rows {
names = append(names, row.Name)
}
require.Equal(t, []string{requesterWorkspace.Name, formerWorkspace.Name}, names,
"the requester's workspace sorts first, the former user's favorite does not")
}

func TestGetAuthorizedWorkspacesAndAgentsByOwnerID(t *testing.T) {
t.Parallel()
if testing.Short() {
Expand Down
4 changes: 2 additions & 2 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions coderd/database/queries/workspaces.sql
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,9 @@ WHERE
filtered_workspaces fw
ORDER BY
-- Favorited workspaces should show up first only for their owner.
CASE WHEN favorite AND owner_username = (SELECT users.username FROM users WHERE users.id = @requester_id) THEN 0 ELSE 1 END ASC,
CASE WHEN favorite AND owner_id = @requester_id THEN 0 ELSE 1 END ASC,
-- Workspaces you own should show up first.
CASE WHEN owner_username = (SELECT users.username FROM users WHERE users.id = @requester_id) THEN 0 ELSE 1 END ASC,
CASE WHEN owner_id = @requester_id THEN 0 ELSE 1 END ASC,
-- Running workspaces should show up first.
(latest_build_completed_at IS NOT NULL AND
latest_build_canceled_at IS NULL AND
Expand Down
Loading