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): coderabbit nitpick

justin019ac9eed6c3
diff --git a/apps/api/src/label/controllers/assign-label-to-task.ts b/apps/api/src/label/controllers/assign-label-to-task.ts
index fe6c4a825..6e7adaa05 100644
--- a/apps/api/src/label/controllers/assign-label-to-task.ts
+++ b/apps/api/src/label/controllers/assign-label-to-task.ts
@@ -57,13 +57,43 @@ async function assignLabelToTask(id: string, taskId: string, userId: string) {
return label;
}
- const previousTaskId =
- label.taskId && label.taskId !== taskId ? label.taskId : null;
- const previousName = label.name;
+ type InsertionResult = {
+ taskLabel: LabelRow;
+ inserted: boolean;
+ previousTaskId: string | null;
+ previousName: string;
+ };
+ const { taskLabel, inserted, previousTaskId, previousName } =
+ await db.transaction<InsertionResult>(async (tx) => {
+ const currentLabel = await tx.query.labelTable.findFirst({
+ where: (label, { eq }) => eq(label.id, id),
+ });
+
+ if (!currentLabel) {
+ throw new HTTPException(404, {
+ message: "Label not found",
+ });
+ }
+
+ if (
+ currentLabel.workspaceId &&
+ currentLabel.workspaceId !== task.workspaceId
+ ) {
+ throw new HTTPException(400, {
+ message: "Label and task must belong to the same workspace",
+ });
+ }
- type InsertionResult = { taskLabel: LabelRow; inserted: boolean };
- const { taskLabel, inserted } = await db.transaction<InsertionResult>(
- async (tx) => {
+ if (currentLabel.taskId === taskId) {
+ return {
+ taskLabel: currentLabel,
+ inserted: false,
+ previousTaskId: null,
+ previousName: currentLabel.name,
+ };
+ }
+
+ const previousTaskId = currentLabel.taskId;
if (previousTaskId) {
await tx.delete(labelTable).where(eq(labelTable.id, id));
}
@@ -71,8 +101,8 @@ async function assignLabelToTask(id: string, taskId: string, userId: string) {
const [insertedRow] = await tx
.insert(labelTable)
.values({
- name: label.name,
- color: label.color,
+ name: currentLabel.name,
+ color: currentLabel.color,
taskId,
workspaceId: task.workspaceId,
})
@@ -82,13 +112,18 @@ async function assignLabelToTask(id: string, taskId: string, userId: string) {
.returning();
if (insertedRow) {
- return { taskLabel: insertedRow, inserted: true };
+ return {
+ taskLabel: insertedRow,
+ inserted: true,
+ previousTaskId,
+ previousName: currentLabel.name,
+ };
}
const existing = await tx.query.labelTable.findFirst({
where: and(
eq(labelTable.taskId, taskId),
- eq(labelTable.name, label.name),
+ eq(labelTable.name, currentLabel.name),
),
});
@@ -98,9 +133,13 @@ async function assignLabelToTask(id: string, taskId: string, userId: string) {
});
}
- return { taskLabel: existing, inserted: false };
- },
- );
+ return {
+ taskLabel: existing,
+ inserted: false,
+ previousTaskId,
+ previousName: currentLabel.name,
+ };
+ });
if (previousTaskId) {
removeLabelFromGitHub(previousTaskId, previousName).catch((error) => {
diff --git a/tests/api/label/assign-and-unassign-label.test.ts b/tests/api/label/assign-and-unassign-label.test.ts
index f4a93119c..047c462c7 100644
--- a/tests/api/label/assign-and-unassign-label.test.ts
+++ b/tests/api/label/assign-and-unassign-label.test.ts
@@ -18,8 +18,8 @@ const mockRemoveLabelFromGitea = vi.fn();
const mockSyncLabelToGitHub = vi.fn();
const mockSyncLabelToGitea = vi.fn();
-const mockTransaction = vi.fn(async (cb: (tx: unknown) => unknown) =>
- cb({
+function createMockTxContext() {
+ return {
insert: (...args: unknown[]) => mockInsert(...args),
delete: (...args: unknown[]) => mockDelete(...args),
query: {
@@ -27,7 +27,11 @@ const mockTransaction = vi.fn(async (cb: (tx: unknown) => unknown) =>
findFirst: (...args: unknown[]) => mockFindFirst(...args),
},
},
- }),
+ };
+}
+
+const mockTransaction = vi.fn(async (cb: (tx: unknown) => unknown) =>
+ cb(createMockTxContext()),
);
vi.mock("../../../apps/api/src/database", () => ({
@@ -127,15 +131,7 @@ describe("unassignLabelFromTask", () => {
beforeEach(() => {
vi.resetAllMocks();
mockTransaction.mockImplementation(async (cb: (tx: unknown) => unknown) =>
- cb({
- insert: (...args: unknown[]) => mockInsert(...args),
- delete: (...args: unknown[]) => mockDelete(...args),
- query: {
- labelTable: {
- findFirst: (...args: unknown[]) => mockFindFirst(...args),
- },
- },
- }),
+ cb(createMockTxContext()),
);
});
@@ -190,15 +186,7 @@ describe("assignLabelToTask", () => {
beforeEach(() => {
vi.resetAllMocks();
mockTransaction.mockImplementation(async (cb: (tx: unknown) => unknown) =>
- cb({
- insert: (...args: unknown[]) => mockInsert(...args),
- delete: (...args: unknown[]) => mockDelete(...args),
- query: {
- labelTable: {
- findFirst: (...args: unknown[]) => mockFindFirst(...args),
- },
- },
- }),
+ cb(createMockTxContext()),
);
});
@@ -207,7 +195,7 @@ describe("assignLabelToTask", () => {
});
it("creates a task-level copy without mutating the workspace definition", async () => {
- mockFindFirst.mockResolvedValueOnce(WORKSPACE_LABEL);
+ mockFindFirst.mockResolvedValue(WORKSPACE_LABEL);
mockSelect.mockReturnValue(makeSelectMock([TASK]));
const insertedCopy = { ...TASK_LABEL, id: "label-task-2" };
const insertChain = makeInsertMock(insertedCopy);
@@ -257,7 +245,7 @@ describe("assignLabelToTask", () => {
it("removes the stale task copy when moving the label to a different task", async () => {
const stale = { ...TASK_LABEL, taskId: "task-old" };
- mockFindFirst.mockResolvedValueOnce(stale);
+ mockFindFirst.mockResolvedValue(stale);
mockSelect.mockReturnValue(makeSelectMock([TASK]));
mockDelete.mockReturnValue(makeDeleteMock(stale));
const insertedCopy = { ...TASK_LABEL, id: "label-task-2" };
@@ -290,6 +278,7 @@ describe("assignLabelToTask", () => {
mockSelect.mockReturnValue(makeSelectMock([TASK]));
const insertChain = makeInsertMock(undefined);
mockInsert.mockReturnValue(insertChain);
+ mockFindFirst.mockResolvedValueOnce(WORKSPACE_LABEL);
mockFindFirst.mockResolvedValueOnce(TASK_LABEL);
const result = await assignLabelToTask("label-ws-1", "task-1", "user-1");
@@ -306,13 +295,14 @@ describe("assignLabelToTask", () => {
mockSelect.mockReturnValue(makeSelectMock([TASK]));
const insertChain = makeInsertMock(undefined);
mockInsert.mockReturnValue(insertChain);
+ mockFindFirst.mockResolvedValueOnce(WORKSPACE_LABEL);
mockFindFirst.mockResolvedValueOnce(TASK_LABEL);
await assignLabelToTask("label-ws-1", "task-1", "user-1");
expect(mockTransaction).toHaveBeenCalledTimes(1);
expect(mockInsert).toHaveBeenCalledTimes(1);
- expect(mockFindFirst).toHaveBeenCalledTimes(2);
+ expect(mockFindFirst).toHaveBeenCalledTimes(3);
});
it("throws HTTP 500 when the insert and fallback lookup both return no row", async () => {
@@ -320,6 +310,7 @@ describe("assignLabelToTask", () => {
mockSelect.mockReturnValue(makeSelectMock([TASK]));
const insertChain = makeInsertMock(undefined);
mockInsert.mockReturnValue(insertChain);
+ mockFindFirst.mockResolvedValueOnce(WORKSPACE_LABEL);
mockFindFirst.mockResolvedValueOnce(undefined);
await expect(
@@ -332,4 +323,19 @@ describe("assignLabelToTask", () => {
expect(mockSyncLabelToGitea).not.toHaveBeenCalled();
expect(mockPublishEvent).not.toHaveBeenCalled();
});
+
+ it("throws HTTP 404 when the label is removed before the transaction begins", async () => {
+ mockFindFirst.mockResolvedValueOnce(WORKSPACE_LABEL);
+ mockFindFirst.mockResolvedValueOnce(undefined);
+ mockSelect.mockReturnValue(makeSelectMock([TASK]));
+
+ await expect(
+ assignLabelToTask("label-ws-1", "task-1", "user-1"),
+ ).rejects.toMatchObject({
+ status: 404,
+ });
+
+ expect(mockDelete).not.toHaveBeenCalled();
+ expect(mockInsert).not.toHaveBeenCalled();
+ });
});