From b926a9cff36d2537b3535ec7122fcce1a1eedb6e Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Tue, 7 Jul 2026 20:41:08 -0400 Subject: [PATCH 1/3] eng-1909-add-no-op-content-upsert-endpoint --- .../api/internal/space/[id]/content/route.ts | 57 +++++++++++++++++++ apps/website/app/utils/supabase/account.ts | 17 ++++++ packages/database/src/crossAppContracts.ts | 5 ++ .../database/src/lib/crossAppConverters.ts | 34 +++++++++++ 4 files changed, 113 insertions(+) create mode 100644 apps/website/app/api/internal/space/[id]/content/route.ts diff --git a/apps/website/app/api/internal/space/[id]/content/route.ts b/apps/website/app/api/internal/space/[id]/content/route.ts new file mode 100644 index 000000000..0c4522694 --- /dev/null +++ b/apps/website/app/api/internal/space/[id]/content/route.ts @@ -0,0 +1,57 @@ +import { NextResponse, NextRequest } from "next/server"; + +import { createClient } from "~/utils/supabase/server"; +import { + createApiResponse, + handleRouteError, + defaultOptionsHandler, +} from "~/utils/supabase/apiUtils"; +import { asPostgrestFailure } from "@repo/database/lib/contextFunctions"; +import type { Json } from "@repo/database/dbTypes"; +import { StandaloneCrossAppContent } from "@repo/database/crossAppContracts"; +import { crossAppStandaloneContentToDbContent } from "@repo/database/lib/crossAppConverters"; +import { getAccountId } from "~/utils/supabase/account"; + +type ApiParams = Promise<{ id: string }>; +export type SegmentDataType = { params: ApiParams }; + +export const POST = async ( + request: NextRequest, + segmentData: SegmentDataType, +): Promise => { + const { id: spaceIdS } = await segmentData.params; + const spaceId = Number.parseInt(spaceIdS); + if (Number.isNaN(spaceId)) + return createApiResponse( + request, + asPostgrestFailure("Cannot parse space id", "invalid", 403), + ); + + const supabase = await createClient(); + + const userId = await getAccountId(supabase); + if (userId === undefined) + return createApiResponse( + request, + asPostgrestFailure("Please login", "invalid", 401), + ); + try { + const body = (await request.json()) as StandaloneCrossAppContent[]; + // TODO: Zed validator + const content = body + .map((c) => crossAppStandaloneContentToDbContent(c, spaceId)) + .filter((c) => c !== undefined); + if (content.length === 0) throw new Error("Could not translate content"); + const result = await supabase.rpc("upsert_content", { + data: content as Json, + v_space_id: spaceId, + v_creator_id: userId, + content_as_document: true, + }); + return createApiResponse(request, result); + } catch (e: unknown) { + return handleRouteError(request, e, "/api/supabase/space/[id]/content"); + } +}; + +export const OPTIONS = defaultOptionsHandler; diff --git a/apps/website/app/utils/supabase/account.ts b/apps/website/app/utils/supabase/account.ts index e7305f4c9..35c2d4efe 100644 --- a/apps/website/app/utils/supabase/account.ts +++ b/apps/website/app/utils/supabase/account.ts @@ -3,6 +3,23 @@ import type { DGSupabaseClient } from "@repo/database/lib/client"; type AgentType = Database["public"]["Enums"]["AgentType"] | "group"; +export const getAccountId = async ( + client: DGSupabaseClient, +): Promise => { + const { data, error } = await client.auth.getUser(); + if (error || !data?.user) return undefined; + const userData = data.user; + if (typeof userData.id !== "string") return undefined; + const id = userData.id; + const accountReq = await client + .from("PlatformAccount") + .select("id") + .eq("dg_account", id) + .eq("agent_type", "person") + .maybeSingle(); + return accountReq.data?.id; +}; + export const getSessionBaseUserData = async ( client: DGSupabaseClient, ): Promise<{ diff --git a/packages/database/src/crossAppContracts.ts b/packages/database/src/crossAppContracts.ts index c1bf4268a..fb499979b 100644 --- a/packages/database/src/crossAppContracts.ts +++ b/packages/database/src/crossAppContracts.ts @@ -71,6 +71,11 @@ type InlineCrossAppTypedContent = InlineCrossAppContent & { contentType: ContentType; }; +export type StandaloneCrossAppContent = InlineCrossAppTypedContent & + CrossAppBase & { + variant: Enums<"ContentVariant">; + }; + // A node instance export type CrossAppNode = CrossAppBase & { nodeType: LocalId; diff --git a/packages/database/src/lib/crossAppConverters.ts b/packages/database/src/lib/crossAppConverters.ts index 76ead0be6..f05162c41 100644 --- a/packages/database/src/lib/crossAppConverters.ts +++ b/packages/database/src/lib/crossAppConverters.ts @@ -1,6 +1,7 @@ import { CrossAppEmbedding, InlineCrossAppContent, + StandaloneCrossAppContent, CrossAppNode, CrossAppNodeSchema, CrossAppRelationTypeSchema, @@ -10,6 +11,7 @@ import { import { LocalContentDataInput, LocalConceptDataInput } from "../inputTypes"; import { Enums, CompositeTypes } from "../dbTypes"; +type ContentDataInput = CompositeTypes<"content_local_input">; type InlineEmbeddingInput = CompositeTypes<"inline_embedding_input">; const crossAppEmbeddingToDbEmbedding = ( @@ -49,6 +51,38 @@ const inlineCrossAppContentToDbContent = ( }); }; +export const crossAppStandaloneContentToDbContent = ( + content: StandaloneCrossAppContent | undefined, + spaceId: number, +): ContentDataInput | undefined => { + if (content === undefined) return undefined; + return { + source_local_id: content.localId, + author_local_id: content.authorId, + text: content.value, + scale: content.scale || "document", + content_type: content.contentType || "text/plain", + variant: content.variant, + created: content.createdAt.toISOString(), + last_modified: (content.modifiedAt || content.createdAt).toISOString(), + embedding_inline: crossAppEmbeddingToDbEmbedding(content.embedding) || null, + space_id: spaceId, + // provide other explicit null values for type completion + space_url: null, + author_inline: null, + author_id: null, + document_id: null, + creator_id: null, + creator_local_id: null, + creator_inline: null, + document_local_id: null, + document_inline: null, + part_of_id: null, + part_of_local_id: null, + metadata: null, + }; +}; + export const crossAppNodeToDbContent = ( node: CrossAppNode | undefined, variant: "full" | "direct", From bca0d409bcd43a897c6122d302ea8a82cd04df08 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Mon, 13 Jul 2026 10:13:29 -0400 Subject: [PATCH 2/3] Devin and graphite suggestions --- .../app/api/internal/space/[id]/content/route.ts | 11 ++++++++++- apps/website/app/utils/supabase/account.ts | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/website/app/api/internal/space/[id]/content/route.ts b/apps/website/app/api/internal/space/[id]/content/route.ts index 0c4522694..3cdb7ddcb 100644 --- a/apps/website/app/api/internal/space/[id]/content/route.ts +++ b/apps/website/app/api/internal/space/[id]/content/route.ts @@ -39,7 +39,16 @@ export const POST = async ( const body = (await request.json()) as StandaloneCrossAppContent[]; // TODO: Zed validator const content = body - .map((c) => crossAppStandaloneContentToDbContent(c, spaceId)) + .map((c) => + crossAppStandaloneContentToDbContent( + { + ...c, + createdAt: new Date(c.createdAt), + modifiedAt: new Date(c.modifiedAt || c.createdAt), + }, + spaceId, + ), + ) .filter((c) => c !== undefined); if (content.length === 0) throw new Error("Could not translate content"); const result = await supabase.rpc("upsert_content", { diff --git a/apps/website/app/utils/supabase/account.ts b/apps/website/app/utils/supabase/account.ts index 35c2d4efe..2a3d97d49 100644 --- a/apps/website/app/utils/supabase/account.ts +++ b/apps/website/app/utils/supabase/account.ts @@ -17,6 +17,7 @@ export const getAccountId = async ( .eq("dg_account", id) .eq("agent_type", "person") .maybeSingle(); + if (accountReq.error) throw accountReq.error; return accountReq.data?.id; }; From 477c3be8321f7198dcdbdaeeb6b73f20df3f11ff Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Thu, 16 Jul 2026 11:28:06 -0400 Subject: [PATCH 3/3] broaden try stanza to include getAccountId --- .../app/api/internal/space/[id]/content/route.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/website/app/api/internal/space/[id]/content/route.ts b/apps/website/app/api/internal/space/[id]/content/route.ts index 3cdb7ddcb..e56622ba9 100644 --- a/apps/website/app/api/internal/space/[id]/content/route.ts +++ b/apps/website/app/api/internal/space/[id]/content/route.ts @@ -29,13 +29,13 @@ export const POST = async ( const supabase = await createClient(); - const userId = await getAccountId(supabase); - if (userId === undefined) - return createApiResponse( - request, - asPostgrestFailure("Please login", "invalid", 401), - ); try { + const userId = await getAccountId(supabase); + if (userId === undefined) + return createApiResponse( + request, + asPostgrestFailure("Please login", "invalid", 401), + ); const body = (await request.json()) as StandaloneCrossAppContent[]; // TODO: Zed validator const content = body