add task deleted filter

coder · johnstcn · Nov 5, 2025 · Oct 30, 2025 · Oct 30, 2025 · Nov 3, 2025
commit cdeebf8b9bd016541cad6ed0e4659c33bedae360
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2989,8 +2989,8 @@ func (q *querier) GetTaskByID(ctx context.Context, id uuid.UUID) (database.Task,
 	return fetch(q.log, q.auth, q.db.GetTaskByID)(ctx, id)
 }
 
-func (q *querier) GetTaskByOwnerIDAndName(ctx context.Context, arg database.GetTaskByOwnerIDAndNameParams) (database.Task, error) {
-	return fetch(q.log, q.auth, q.db.GetTaskByOwnerIDAndName)(ctx, arg)
+func (q *querier) GetTaskByOwnerIDAndName(ctx context.Context, arg database.GetTaskByOwnerIDAndNameParams) ([]database.Task, error) {
+	return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetTaskByOwnerIDAndName)(ctx, arg)
 }
 
 func (q *querier) GetTaskByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.Task, error) {

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -2380,6 +2380,7 @@ func (s *MethodTestSuite) TestTasks() {
 		dbm.EXPECT().GetTaskByOwnerIDAndName(gomock.Any(), database.GetTaskByOwnerIDAndNameParams{
 			OwnerID: task.OwnerID,
 			Name:    task.Name,
+			Deleted: false,
 		}).Return(task, nil).AnyTimes()
 		check.Args(database.GetTaskByOwnerIDAndNameParams{
 			OwnerID: task.OwnerID,

diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/tasks.sql b/coderd/database/queries/tasks.sql
@@ -41,10 +41,15 @@ SELECT * FROM tasks_with_status WHERE id = @id::uuid;
 -- name: GetTaskByWorkspaceID :one
 SELECT * FROM tasks_with_status WHERE workspace_id = @workspace_id::uuid;
 
--- name: GetTaskByOwnerIDAndName :one
-SELECT * FROM tasks_with_status 
-WHERE owner_id = @owner_id::uuid 
-  AND LOWER(name) = LOWER(@name::text);
+-- name: GetTaskByOwnerIDAndName :many
+SELECT * FROM tasks_with_status
+WHERE
+	owner_id = @owner_id::uuid
+	AND CASE WHEN @deleted
+		THEN deleted_at IS NOT NULL
+		ELSE deleted_at IS NULL
+	END
+	AND LOWER(name) = LOWER(@name::text);
 
 -- name: ListTasks :many
 SELECT * FROM tasks_with_status tws

diff --git a/coderd/httpmw/taskparam.go b/coderd/httpmw/taskparam.go
@@ -101,9 +101,13 @@ func fetchTaskWithFallback(ctx context.Context, db database.Store, taskParam str
 	task, err := db.GetTaskByOwnerIDAndName(ctx, database.GetTaskByOwnerIDAndNameParams{
 		OwnerID: ownerID,
 		Name:    taskParam,
+		Deleted: false,
 	})
 	if err != nil {
 		return database.Task{}, xerrors.Errorf("fetch task by name: %w", err)
 	}
-	return task, nil
+	if len(task) == 0 {
+		return database.Task{}, sql.ErrNoRows
+	}
+	return task[0], nil
 }