Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix: keep queued writes and validation scoped to their owner

Tindf36d9eca826
diff --git a/apps/api/src/task/controllers/update-task-assignee.ts b/apps/api/src/task/controllers/update-task-assignee.ts
index 56fdba4cf..a796ef975 100644
--- a/apps/api/src/task/controllers/update-task-assignee.ts
+++ b/apps/api/src/task/controllers/update-task-assignee.ts
@@ -28,7 +28,8 @@ async function updateTaskAssignee({
if (nextAssigneeId) {
await assertAssignableUser(
nextAssigneeId,
- await getProjectWorkspaceId(existingTask.projectId),
+ await getProjectWorkspaceId(existingTask.projectId, tx),
+ tx,
);
}
diff --git a/apps/api/src/task/controllers/update-task-status.ts b/apps/api/src/task/controllers/update-task-status.ts
index d9dda6740..5e76fe8d0 100644
--- a/apps/api/src/task/controllers/update-task-status.ts
+++ b/apps/api/src/task/controllers/update-task-status.ts
@@ -17,7 +17,7 @@ async function updateTaskStatus({
const { before: existingTask, after: updatedTask } = await withLockedTask(
id,
async (tx, existingTask) => {
- await assertValidTaskStatus(status, existingTask.projectId);
+ await assertValidTaskStatus(status, existingTask.projectId, tx);
const column = await tx.query.columnTable.findFirst({
where: and(
diff --git a/apps/api/src/task/validate-task-fields.ts b/apps/api/src/task/validate-task-fields.ts
index b2a70b33b..05f2e3e75 100644
--- a/apps/api/src/task/validate-task-fields.ts
+++ b/apps/api/src/task/validate-task-fields.ts
@@ -241,8 +241,9 @@ export function assertValidPriority(priority: string): void {
export async function getValidTaskStatuses(
projectId: string,
+ database: Pick<typeof db, "select"> = db,
): Promise<string[]> {
- const columns = await db
+ const columns = await database
.select({ slug: columnTable.slug })
.from(columnTable)
.where(eq(columnTable.projectId, projectId))
@@ -254,8 +255,9 @@ export async function getValidTaskStatuses(
export async function assertValidTaskStatus(
status: string,
projectId: string,
+ database: Pick<typeof db, "select"> = db,
): Promise<void> {
- const validStatuses = await getValidTaskStatuses(projectId);
+ const validStatuses = await getValidTaskStatuses(projectId, database);
if (!validStatuses.includes(status)) {
throw new HTTPException(400, {
diff --git a/apps/api/src/utils/assert-assignable-user.ts b/apps/api/src/utils/assert-assignable-user.ts
index eb0640a49..eef238c49 100644
--- a/apps/api/src/utils/assert-assignable-user.ts
+++ b/apps/api/src/utils/assert-assignable-user.ts
@@ -8,12 +8,13 @@ const NOT_ASSIGNABLE = "Assignee is not a member of this workspace";
export async function filterAssignableUsers(
userIds: string[],
workspaceId: string,
+ database: Pick<typeof db, "select"> = db,
): Promise<Set<string>> {
if (userIds.length === 0) {
return new Set();
}
- const memberships = await db
+ const memberships = await database
.select({ userId: schema.workspaceUserTable.userId })
.from(schema.workspaceUserTable)
.where(
@@ -30,7 +31,7 @@ export async function filterAssignableUsers(
return assignable;
}
- const admins = await db
+ const admins = await database
.select({ id: schema.userTable.id })
.from(schema.userTable)
.where(
@@ -50,8 +51,13 @@ export async function filterAssignableUsers(
export async function assertAssignableUser(
userId: string,
workspaceId: string,
+ database: Pick<typeof db, "select"> = db,
): Promise<void> {
- const assignable = await filterAssignableUsers([userId], workspaceId);
+ const assignable = await filterAssignableUsers(
+ [userId],
+ workspaceId,
+ database,
+ );
if (!assignable.has(userId)) {
throw new HTTPException(403, { message: NOT_ASSIGNABLE });
@@ -60,8 +66,9 @@ export async function assertAssignableUser(
export async function getProjectWorkspaceId(
projectId: string,
+ database: Pick<typeof db, "select"> = db,
): Promise<string> {
- const [project] = await db
+ const [project] = await database
.select({ workspaceId: schema.projectTable.workspaceId })
.from(schema.projectTable)
.where(eq(schema.projectTable.id, projectId))
diff --git a/tests/api-integration/task-mutation-parity.test.ts b/tests/api-integration/task-mutation-parity.test.ts
index cd0283b96..f501c304b 100644
--- a/tests/api-integration/task-mutation-parity.test.ts
+++ b/tests/api-integration/task-mutation-parity.test.ts
@@ -1,3 +1,5 @@
+import updateTaskStatus from "../../apps/api/src/task/controllers/update-task-status";
+import updateTaskAssignee from "../../apps/api/src/task/controllers/update-task-assignee";
import updateTaskPriority from "../../apps/api/src/task/controllers/update-task-priority";
import { eq } from "drizzle-orm";
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
@@ -240,3 +242,45 @@ it.each(["single", "bulk"])(
);
},
);
+
+it("validates status and assignment without a second pool client inside the mutation transaction", async () => {
+ const { user, workspace } = await createWorkspaceMember();
+ const { project } = await createProjectFixture({ workspaceId: workspace.id });
+ const [task] = await db
+ .insert(schema.taskTable)
+ .values({ projectId: project.id, title: "pool safety" })
+ .returning();
+ let locked = false;
+ const select = getDatabase().select.bind(getDatabase());
+ vi.spyOn(getDatabase(), "select").mockImplementation((...args) => {
+ if (locked)
+ throw new Error("Validation attempted a second pool connection");
+ return select(...args);
+ });
+ const transaction = db.transaction.bind(db);
+ vi.spyOn(getDatabase(), "transaction").mockImplementation((apply, config) =>
+ transaction(async (tx) => {
+ locked = true;
+ try {
+ return await apply(tx);
+ } finally {
+ locked = false;
+ }
+ }, config),
+ );
+ await updateTaskStatus({
+ id: task.id,
+ status: "done",
+ currentUserId: user.id,
+ });
+ await updateTaskAssignee({
+ id: task.id,
+ userId: user.id,
+ currentUserId: user.id,
+ });
+ expect(
+ await db.query.taskTable.findFirst({
+ where: eq(schema.taskTable.id, task.id),
+ }),
+ ).toMatchObject({ status: "done", userId: user.id });
+});