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: merge outbound history under a link row lock

Tin1777ae90a465
diff --cc apps/api/src/plugins/gitea/events/task-description-changed.ts
index 4aa249a18,8eb8b148c..260193090
--- a/apps/api/src/plugins/gitea/events/task-description-changed.ts
+++ b/apps/api/src/plugins/gitea/events/task-description-changed.ts
@@@ -1,6 -1,3 +1,5 @@@
+import db from "../../../database";
+import { linkedTaskScope } from "../../github/services/integration-task-scope";
- import { outboundStamp } from "../../github/utils/sync-echo";
import {
findExternalLinksByTask,
updateExternalLink,
@@@ -95,26 -99,21 +94,20 @@@ export async function handleTaskDescrip
const formattedBody = formatIssueBody(event.newDescription, event.taskId);
- await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
- body: formattedBody,
- });
+ const response = await client.updateIssue(
+ repositoryOwner,
+ repositoryName,
+ issueNumber,
+ {
+ body: formattedBody,
+ },
+ );
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...metadata,
-- lastSync: {
-- ...metadata.lastSync,
- description: outboundStamp(
- metadata.lastSync?.description,
- newDescNormalized,
- response?.updated_at,
- ),
- description: {
- timestamp: new Date().toISOString(),
- source: "kaneo",
- value: newDescNormalized,
- },
-- },
++ outbound: {
++ field: "description",
++ value: newDescNormalized,
++ updatedAt: response?.updated_at,
},
});
diff --cc apps/api/src/plugins/gitea/events/task-status-changed.ts
index 6ca4f94f0,957092960..6afa22b25
--- a/apps/api/src/plugins/gitea/events/task-status-changed.ts
+++ b/apps/api/src/plugins/gitea/events/task-status-changed.ts
@@@ -42,54 -40,28 +40,40 @@@ export async function handleTaskStatusC
]);
if (event.newStatus === "done") {
- await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
- state: "closed",
- });
+ const response = await client.updateIssue(
+ repositoryOwner,
+ repositoryName,
+ issueNumber,
+ {
+ state: "closed",
+ },
+ );
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
-- state: "closed",
- lastSync: {
- ...metadata.lastSync,
- state: outboundStamp(
- metadata.lastSync?.state,
- "closed",
- response?.updated_at,
- ),
- },
-- lastOutboundStateSyncAt: Date.now(),
++ outbound: {
++ field: "state",
++ value: "closed",
++ updatedAt: response?.updated_at,
},
++ metadata: { state: "closed", lastOutboundStateSyncAt: Date.now() },
});
} else if (event.oldStatus === "done" && event.newStatus !== "done") {
- await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
- state: "open",
- });
+ const response = await client.updateIssue(
+ repositoryOwner,
+ repositoryName,
+ issueNumber,
+ {
+ state: "open",
+ },
+ );
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
-- state: "open",
- lastSync: {
- ...metadata.lastSync,
- state: outboundStamp(
- metadata.lastSync?.state,
- "open",
- response?.updated_at,
- ),
- },
-- lastOutboundStateSyncAt: Date.now(),
++ outbound: {
++ field: "state",
++ value: "open",
++ updatedAt: response?.updated_at,
},
++ metadata: { state: "open", lastOutboundStateSyncAt: Date.now() },
});
}
} catch (error) {
diff --cc apps/api/src/plugins/gitea/events/task-title-changed.ts
index 371bb6bb5,f5be824f1..5400faa47
--- a/apps/api/src/plugins/gitea/events/task-title-changed.ts
+++ b/apps/api/src/plugins/gitea/events/task-title-changed.ts
@@@ -1,6 -1,3 +1,5 @@@
+import db from "../../../database";
+import { linkedTaskScope } from "../../github/services/integration-task-scope";
- import { outboundStamp } from "../../github/utils/sync-echo";
import {
findExternalLinksByTask,
updateExternalLink,
@@@ -97,16 -96,16 +96,10 @@@ export async function handleTaskTitleCh
await updateExternalLink(issueLink.id, {
title: event.newTitle,
-- metadata: {
-- ...metadata,
-- lastSync: {
-- ...metadata.lastSync,
- title: outboundStamp(
- metadata.lastSync?.title,
- event.newTitle,
- response?.updated_at,
- ),
- title: {
- timestamp: new Date().toISOString(),
- source: "kaneo",
- value: event.newTitle,
- },
-- },
++ outbound: {
++ field: "title",
++ value: event.newTitle,
++ updatedAt: response?.updated_at,
},
});
diff --cc apps/api/src/plugins/github/events/task-description-changed.ts
index 7b1ff6e17,efe559293..03cc2078d
--- a/apps/api/src/plugins/github/events/task-description-changed.ts
+++ b/apps/api/src/plugins/github/events/task-description-changed.ts
@@@ -1,6 -1,3 +1,5 @@@
+import db from "../../../database";
+import { linkedTaskScope } from "../services/integration-task-scope";
- import { outboundStamp } from "../utils/sync-echo";
import type { PluginContext, TaskDescriptionChangedEvent } from "../../types";
import { type GitHubConfig, hasVerifiedGitHubBinding } from "../config";
import {
@@@ -80,16 -77,16 +79,10 @@@ export async function handleTaskDescrip
// Update metadata to track this sync
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...metadata,
-- lastSync: {
-- ...metadata.lastSync,
- description: outboundStamp(
- metadata.lastSync?.description,
- newDescNormalized,
- response?.data?.updated_at,
- ),
- description: {
- timestamp: new Date().toISOString(),
- source: "kaneo",
- value: newDescNormalized,
- },
-- },
++ outbound: {
++ field: "description",
++ value: newDescNormalized,
++ updatedAt: response?.data?.updated_at,
},
});
diff --cc apps/api/src/plugins/github/events/task-status-changed.ts
index ef8125b1c,ef8125b1c..14ef649ee
--- a/apps/api/src/plugins/github/events/task-status-changed.ts
+++ b/apps/api/src/plugins/github/events/task-status-changed.ts
@@@ -55,7 -55,7 +55,7 @@@ export async function handleTaskStatusC
);
if (event.newStatus === "done") {
-- await octokit.rest.issues.update({
++ const response = await octokit.rest.issues.update({
owner: repositoryOwner,
repo: repositoryName,
issue_number: issueNumber,
@@@ -63,13 -63,13 +63,15 @@@
});
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
-- state: "closed",
++ outbound: {
++ field: "state",
++ value: "closed",
++ updatedAt: response?.data?.updated_at,
},
++ metadata: { state: "closed" },
});
} else if (event.oldStatus === "done" && event.newStatus !== "done") {
-- await octokit.rest.issues.update({
++ const response = await octokit.rest.issues.update({
owner: repositoryOwner,
repo: repositoryName,
issue_number: issueNumber,
@@@ -77,10 -77,10 +79,12 @@@
});
await updateExternalLink(issueLink.id, {
-- metadata: {
-- ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
-- state: "open",
++ outbound: {
++ field: "state",
++ value: "open",
++ updatedAt: response?.data?.updated_at,
},
++ metadata: { state: "open" },
});
}
} catch (error) {
diff --cc apps/api/src/plugins/github/events/task-title-changed.ts
index b54806c2e,d0e18c8df..1a4d9daa8
--- a/apps/api/src/plugins/github/events/task-title-changed.ts
+++ b/apps/api/src/plugins/github/events/task-title-changed.ts
@@@ -1,6 -1,3 +1,5 @@@
+import db from "../../../database";
+import { linkedTaskScope } from "../services/integration-task-scope";
- import { outboundStamp } from "../utils/sync-echo";
import type { PluginContext, TaskTitleChangedEvent } from "../../types";
import { type GitHubConfig, hasVerifiedGitHubBinding } from "../config";
import {
@@@ -71,16 -72,16 +70,10 @@@ export async function handleTaskTitleCh
// Update metadata to track this sync
await updateExternalLink(issueLink.id, {
title: event.newTitle,
-- metadata: {
-- ...metadata,
-- lastSync: {
-- ...metadata.lastSync,
- title: outboundStamp(
- metadata.lastSync?.title,
- event.newTitle,
- response?.data?.updated_at,
- ),
- title: {
- timestamp: new Date().toISOString(),
- source: "kaneo",
- value: event.newTitle,
- },
-- },
++ outbound: {
++ field: "title",
++ value: event.newTitle,
++ updatedAt: response?.data?.updated_at,
},
});
diff --cc apps/api/src/plugins/github/services/link-manager.ts
index c62f3b860,c62f3b860..bab3bc857
--- a/apps/api/src/plugins/github/services/link-manager.ts
+++ b/apps/api/src/plugins/github/services/link-manager.ts
@@@ -1,3 -1,3 +1,4 @@@
++import { outboundStamp, type SyncStamp } from "../utils/sync-echo";
import { and, eq } from "drizzle-orm";
import db from "../../../database";
import {
@@@ -21,6 -21,6 +22,11 @@@ export type CreateExternalLinkParams =
};
export type UpdateExternalLinkParams = {
++ outbound?: {
++ field: "title" | "description" | "state";
++ value: string;
++ updatedAt?: string;
++ };
title?: string | null;
url?: string;
metadata?: Record<string, unknown>;
@@@ -116,6 -116,6 +122,40 @@@ export async function updateExternalLin
params: UpdateExternalLinkParams,
database: DbOrTx = db,
) {
++ if (params.outbound) {
++ await db.transaction(async (tx) => {
++ const [link] = await tx
++ .select({ metadata: externalLinkTable.metadata })
++ .from(externalLinkTable)
++ .where(eq(externalLinkTable.id, id))
++ .for("update");
++ if (!link) return;
++ const metadata = (link.metadata ? JSON.parse(link.metadata) : {}) as {
++ lastSync?: Record<string, SyncStamp>;
++ };
++ const { field, value, updatedAt } = params.outbound!;
++ await tx
++ .update(externalLinkTable)
++ .set({
++ ...(params.title !== undefined ? { title: params.title } : {}),
++ ...(params.url !== undefined ? { url: params.url } : {}),
++ metadata: JSON.stringify({
++ ...metadata,
++ ...params.metadata,
++ lastSync: {
++ ...metadata.lastSync,
++ [field]: outboundStamp(
++ metadata.lastSync?.[field],
++ value,
++ updatedAt,
++ ),
++ },
++ }),
++ })
++ .where(eq(externalLinkTable.id, id));
++ });
++ return;
++ }
const updateData: Record<string, unknown> = {};
if (params.title !== undefined) {
diff --cc tests/api-integration/integration-task-ownership.test.ts
index 191d92b4b,191d92b4b..82ee8fb9e
--- a/tests/api-integration/integration-task-ownership.test.ts
+++ b/tests/api-integration/integration-task-ownership.test.ts
@@@ -381,3 -381,3 +381,39 @@@ it("preserves legacy links belonging t
});
expect(await db.query.externalLinkTable.findMany()).toEqual([compatible]);
});
++
++it("preserves outbound history and unrelated fields across concurrent sync completions", async () => {
++ const { updateExternalLink } =
++ await import("../../apps/api/src/plugins/github/services/link-manager");
++ const { isOutboundEcho } =
++ await import("../../apps/api/src/plugins/github/utils/sync-echo");
++ const { link } = await setup();
++ await db
++ .update(schema.externalLinkTable)
++ .set({ metadata: JSON.stringify({ remoteMarker: "keep" }) })
++ .where(eq(schema.externalLinkTable.id, link.id));
++ await Promise.all(
++ Array.from({ length: 12 }, (_, i) =>
++ updateExternalLink(link.id, {
++ outbound: {
++ field: i % 2 ? "description" : "title",
++ value: `edit-${i}`,
++ updatedAt: `time-${i}`,
++ },
++ }),
++ ),
++ );
++ const saved = await db.query.externalLinkTable.findFirst({
++ where: eq(schema.externalLinkTable.id, link.id),
++ });
++ const metadata = JSON.parse(saved!.metadata!);
++ expect(metadata.remoteMarker).toBe("keep");
++ for (let i = 0; i < 12; i++)
++ expect(
++ isOutboundEcho(
++ metadata.lastSync[i % 2 ? "description" : "title"],
++ `edit-${i}`,
++ `time-${i}`,
++ ),
++ ).toBe(true);
++});