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(api): keep imported tasks visible after column deletion

Tin31eaecf332da
diff --git a/apps/api/src/task/controllers/import-tasks.ts b/apps/api/src/task/controllers/import-tasks.ts
index 2d4fed23e..9d96ce40a 100644
--- a/apps/api/src/task/controllers/import-tasks.ts
+++ b/apps/api/src/task/controllers/import-tasks.ts
@@ -9,7 +9,7 @@ import {
NO_PROJECT_ACCESS,
NOT_ASSIGNABLE,
} from "../../utils/assert-assignable-user";
-import { coercePriority } from "../validate-task-fields";
+import { coercePriority, VIRTUAL_STATUSES } from "../validate-task-fields";
import { resolveImportTaskStatus } from "../resolve-import-task-status";
import { claimTaskNumber } from "./claim-task-numbers";
import { nextTaskPosition } from "./next-task-position";
@@ -81,7 +81,7 @@ async function importTasks(
results.push({ success: false, error: resolved.error, task: taskData });
continue;
}
- const { status, warning: statusWarning } = resolved;
+ const { status: resolvedStatus, warning: statusWarning } = resolved;
const { priority, warning: priorityWarning } = coercePriority(
taskData.priority || "low",
);
@@ -96,11 +96,21 @@ async function importTasks(
.where(
and(
eq(columnTable.projectId, projectId),
- eq(columnTable.slug, status),
+ eq(columnTable.slug, resolvedStatus),
),
)
.limit(1)
.for("key share");
+ const status =
+ column ||
+ VIRTUAL_STATUSES.some((virtual) => virtual === resolvedStatus)
+ ? resolvedStatus
+ : "planned";
+ if (status !== resolvedStatus) {
+ warnings.push(
+ `Status "${resolvedStatus}" no longer has a column. Mapped to "planned".`,
+ );
+ }
const position = await nextTaskPosition(
tx,
projectId,
diff --git a/tests/api-integration/task-import-column-race.test.ts b/tests/api-integration/task-import-column-race.test.ts
index ccf086e1a..d49be0641 100644
--- a/tests/api-integration/task-import-column-race.test.ts
+++ b/tests/api-integration/task-import-column-race.test.ts
@@ -2,7 +2,9 @@ import { eq, sql } from "drizzle-orm";
import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
import db, { getDatabasePool, schema } from "../../apps/api/src/database";
import deleteColumn from "../../apps/api/src/column/controllers/delete-column";
+import { createApp } from "../../apps/api/src/index";
import importTasks from "../../apps/api/src/task/controllers/import-tasks";
+import { mockAuthenticatedSession } from "./helpers/auth";
import { resetTestDatabase } from "./helpers/database";
import {
createProjectFixture,
@@ -48,26 +50,45 @@ async function fixture() {
}
describe("task import column deletion", () => {
- it("does not reuse a column ID deleted after the import snapshot", async () => {
- const { user, project, columns } = await fixture();
- hooks.publish.mockImplementationOnce(async () => {
- await deleteColumn(columns.done.id);
- });
- const result = await importTasks(
- project.id,
- [
- { title: "First", status: "to-do" },
- { title: "Second", status: "done" },
- ],
- user.id,
- );
- expect(result.results.successful).toBe(2);
- expect(result.results.failed).toBe(0);
- expect(result.results.tasks[1]?.task).toMatchObject({
- status: "done",
- columnId: null,
- });
- });
+ it.each(["done", "Ready to Start"])(
+ "keeps %s visible in the backlog when its column disappears after the snapshot",
+ async (status) => {
+ const { user, project, columns } = await fixture();
+ await db
+ .update(schema.columnTable)
+ .set({ name: "Ready to Start" })
+ .where(eq(schema.columnTable.id, columns.done.id));
+ hooks.publish.mockImplementationOnce(async () => {
+ await deleteColumn(columns.done.id);
+ });
+ const result = await importTasks(
+ project.id,
+ [
+ { title: "First", status: "to-do" },
+ { title: "Second", status },
+ ],
+ user.id,
+ );
+ expect(result.results.successful).toBe(2);
+ expect(result.results.failed).toBe(0);
+ expect(result.results.tasks[1]).toMatchObject({
+ task: { status: "planned", columnId: null },
+ warnings: [expect.stringContaining('"planned"')],
+ });
+
+ mockAuthenticatedSession(user);
+ const { app } = createApp();
+ const response = await app.request(
+ `/api/task/tasks/${project.id}?status=planned`,
+ );
+ expect(response.status).toBe(200);
+ const backlog = await response.json();
+ expect(backlog.pagination.total).toBe(1);
+ expect(backlog.data.plannedTasks).toMatchObject([
+ { title: "Second", status: "planned" },
+ ]);
+ },
+ );
it("keeps a resolved column valid until its task transaction commits", async () => {
const { user, project, columns } = await fixture();