synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use is-dormant instead of dormant_at (#10191)

Browse Source
This commit is contained in:
Jon Ayers
2023-10-10 19:00:09 -05:00
committed by GitHub
parent 652e1a7d43
commit ec9b480ac0
14 changed files with 61 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coderd/database/dbfake/dbfake.go
View File

@ -6818,12 +6818,11 @@ func (q *FakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
}
// We omit locked workspaces by default.
if arg.DormantAt.IsZero() && workspace.DormantAt.Valid {
if arg.IsDormant == "" && workspace.DormantAt.Valid {
continue
}
// Filter out workspaces that are locked after the timestamp.
if !arg.DormantAt.IsZero() && workspace.DormantAt.Time.Before(arg.DormantAt) {
if arg.IsDormant != "" && !workspace.DormantAt.Valid {
continue
}

2
coderd/database/modelqueries.go
View File

@ -217,7 +217,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa
arg.Name,
arg.HasAgent,
arg.AgentInactiveDisconnectTimeoutSeconds,
arg.DormantAt,
arg.IsDormant,
arg.LastUsedBefore,
arg.LastUsedAfter,
arg.Offset,

8
coderd/database/queries.sql.go
View File

@ -10160,8 +10160,8 @@ WHERE
-- Filter by dormant workspaces. By default we do not return dormant
-- workspaces since they are considered soft-deleted.
AND CASE
WHEN $10 :: timestamptz > '0001-01-01 00:00:00+00'::timestamptz THEN
dormant_at IS NOT NULL AND dormant_at >= $10
WHEN $10 :: text != '' THEN
dormant_at IS NOT NULL
ELSE
dormant_at IS NULL
END
@ -10204,7 +10204,7 @@ type GetWorkspacesParams struct {
Name string `db:"name" json:"name"`
HasAgent string `db:"has_agent" json:"has_agent"`
AgentInactiveDisconnectTimeoutSeconds int64 `db:"agent_inactive_disconnect_timeout_seconds" json:"agent_inactive_disconnect_timeout_seconds"`
DormantAt time.Time `db:"dormant_at" json:"dormant_at"`
IsDormant string `db:"is_dormant" json:"is_dormant"`
LastUsedBefore time.Time `db:"last_used_before" json:"last_used_before"`
LastUsedAfter time.Time `db:"last_used_after" json:"last_used_after"`
Offset int32 `db:"offset_" json:"offset_"`
@ -10243,7 +10243,7 @@ func (q *sqlQuerier) GetWorkspaces(ctx context.Context, arg GetWorkspacesParams)
arg.Name,
arg.HasAgent,
arg.AgentInactiveDisconnectTimeoutSeconds,
arg.DormantAt,
arg.IsDormant,
arg.LastUsedBefore,
arg.LastUsedAfter,
arg.Offset,

4
coderd/database/queries/workspaces.sql
View File

@ -242,8 +242,8 @@ WHERE
-- Filter by dormant workspaces. By default we do not return dormant
-- workspaces since they are considered soft-deleted.
AND CASE
WHEN @dormant_at :: timestamptz > '0001-01-01 00:00:00+00'::timestamptz THEN
dormant_at IS NOT NULL AND dormant_at >= @dormant_at
WHEN @is_dormant :: text != '' THEN
dormant_at IS NOT NULL
ELSE
dormant_at IS NULL
END