diff --git a/apps/obsidian/src/utils/__tests__/conceptConversion.test.ts b/apps/obsidian/src/utils/__tests__/conceptConversion.test.ts index f3e382694..4e12e6ee9 100644 --- a/apps/obsidian/src/utils/__tests__/conceptConversion.test.ts +++ b/apps/obsidian/src/utils/__tests__/conceptConversion.test.ts @@ -1,11 +1,13 @@ import { TFile } from "obsidian"; import { describe, expect, it } from "vitest"; import type { LocalConceptDataInput } from "@repo/database/inputTypes"; -import type { DiscourseNode } from "~/types"; +import type { DiscourseNode, RelationInstance } from "~/types"; import { discourseNodeInstanceToLocalConcept, discourseNodeSchemaToLocalConcept, + relationInstanceToLocalConcept, } from "~/utils/conceptConversion"; +import type { DiscourseNodeInVault } from "~/utils/getDiscourseNodes"; const conceptFor = ({ format, @@ -131,3 +133,46 @@ describe("discourseNodeSchemaToLocalConcept format", () => { }); }); }); + +describe("relationInstanceToLocalConcept author", () => { + const noteInVault = (nodeInstanceId: string): DiscourseNodeInVault => ({ + file: Object.assign(new TFile(), { basename: nodeInstanceId }), + frontmatter: { nodeInstanceId, nodeTypeId: "type-1" }, + nodeTypeId: "type-1", + nodeInstanceId, + }); + const relationConceptFor = ( + relation: Partial, + ): LocalConceptDataInput | null => + relationInstanceToLocalConcept({ + accountLocalId: "account-1", + relationTypesById: { + "supports-type": { + id: "supports-type", + label: "supports", + complement: "is supported by", + color: "green", + created: 0, + modified: 0, + }, + }, + allNodesById: { + "node-1": noteInVault("node-1"), + "node-2": noteInVault("node-2"), + }, + relationInstanceData: { + id: "relation-1", + type: "supports-type", + source: "node-1", + destination: "node-2", + created: 0, + ...relation, + }, + }); + + it("keeps a relation's numeric authorId as author_id, without an author_local_id", () => { + const concept = relationConceptFor({ authorId: 9 }); + expect(concept).toHaveProperty("author_id", 9); + expect(concept).not.toHaveProperty("author_local_id"); + }); +}); diff --git a/apps/obsidian/src/utils/__tests__/syncDgNodesToSupabase.test.ts b/apps/obsidian/src/utils/__tests__/syncDgNodesToSupabase.test.ts index 3dbefa76a..879445c24 100644 --- a/apps/obsidian/src/utils/__tests__/syncDgNodesToSupabase.test.ts +++ b/apps/obsidian/src/utils/__tests__/syncDgNodesToSupabase.test.ts @@ -815,15 +815,12 @@ describe("what Obsidian sync sends to upsert_concepts", () => { it("sends a relation with no lastModified as a Concept between its notes' ids, named by their titles, with its created time as last_modified", () => { expect(sentRow("rel-cites")).toStrictEqual({ - space_id: SPACE_ID, source_local_id: "rel-cites", schema_represented_by_local_id: "cites-type", - is_schema: false, - author_id: USER_ID, + author_local_id: ACCOUNT_LOCAL_ID, name: "[[CLM - Sleep consolidates memory]] -cites-> [[SRC - Walker 2017]]", created: RELATION_CREATED, last_modified: RELATION_CREATED, - literal_content: {}, local_reference_content: { source: "claim-node", destination: "source-node", @@ -833,30 +830,24 @@ describe("what Obsidian sync sends to upsert_concepts", () => { it("points a relation at an imported note by the note's origin RID, at either end", () => { expect(sentRow("rel-imported-opposes")).toStrictEqual({ - space_id: SPACE_ID, source_local_id: "rel-imported-opposes", schema_represented_by_local_id: "opposes-type", - is_schema: false, - author_id: USER_ID, + author_local_id: ACCOUNT_LOCAL_ID, name: "[[CLM - Dreams replay the day]] -opposes-> [[CLM - Sleep consolidates memory]]", created: RELATION_CREATED, last_modified: RELATION_MODIFIED, - literal_content: {}, local_reference_content: { source: IMPORTED_CLAIM_RID, destination: "claim-node", }, }); expect(sentRow("rel-supports-imported")).toStrictEqual({ - space_id: SPACE_ID, source_local_id: "rel-supports-imported", schema_represented_by_local_id: "supports-type", - is_schema: false, - author_id: USER_ID, + author_local_id: ACCOUNT_LOCAL_ID, name: "[[CLM - Sleep consolidates memory]] -supports-> [[CLM - Dreams replay the day]]", created: RELATION_CREATED, last_modified: RELATION_MODIFIED, - literal_content: {}, local_reference_content: { source: "claim-node", destination: IMPORTED_CLAIM_RID, diff --git a/apps/obsidian/src/utils/conceptConversion.ts b/apps/obsidian/src/utils/conceptConversion.ts index c28925378..c9b5da6e6 100644 --- a/apps/obsidian/src/utils/conceptConversion.ts +++ b/apps/obsidian/src/utils/conceptConversion.ts @@ -4,7 +4,6 @@ import type { DiscourseRelationType, RelationInstance, } from "~/types"; -import type { SupabaseContext } from "./supabaseContext"; import type { DiscourseNodeInVault } from "./getDiscourseNodes"; import type { LocalConceptDataInput } from "@repo/database/inputTypes"; import type { ObsidianDiscourseNodeData } from "./syncDgNodesToSupabase"; @@ -13,12 +12,14 @@ import type { ChangedNodeContent } from "./upsertNodesAsContentWithEmbeddings"; import { crossAppNodeSchemaToDbConcept, crossAppNodeToDbConcept, + crossAppRelationToDbConcept, crossAppRelationTripleSchemaToDbConcept, crossAppRelationTypeSchemaToDbConcept, } from "@repo/database/lib/crossAppConverters"; import { nodeInstanceToCrossApp, nodeTypeToCrossApp, + relationInstanceToCrossApp, relationTripleToCrossApp, relationTypeToCrossApp, } from "./obsidianToCrossAppConverters"; @@ -182,18 +183,17 @@ export const discourseNodeInstanceToLocalConcept = ({ }; export const relationInstanceToLocalConcept = ({ - context, + accountLocalId, relationTypesById, allNodesById, relationInstanceData, }: { - context: SupabaseContext; + accountLocalId: string; relationTypesById: Record; allNodesById: Record; relationInstanceData: RelationInstance; }): LocalConceptDataInput | null => { - const { type, created, lastModified, source, destination, importedFromRid } = - relationInstanceData; + const { type, source, destination, authorId } = relationInstanceData; const relationType = relationTypesById[type]; if (!relationType) { @@ -207,26 +207,20 @@ export const relationInstanceToLocalConcept = ({ return null; } - const literal_content: Record = {}; - if (importedFromRid) literal_content.importedFromRid = importedFromRid; + const { author_local_id, ...concept } = crossAppRelationToDbConcept( + relationInstanceToCrossApp({ + relation: relationInstanceData, + sourceNode, + destinationNode, + accountLocalId, + }), + ); return { - space_id: context.spaceId, + ...concept, + ...(typeof authorId === "number" + ? { author_id: authorId } + : { author_local_id }), name: `[[${sourceNode.file.basename}]] -${relationType.label}-> [[${destinationNode.file.basename}]]`, - source_local_id: relationInstanceData.id, - author_id: relationInstanceData.authorId ?? context.userId, - schema_represented_by_local_id: type, - is_schema: false, - created: new Date(created).toISOString(), - last_modified: new Date(lastModified ?? created).toISOString(), - literal_content, - local_reference_content: { - source: - (sourceNode.frontmatter.importedFromRid as string | undefined) ?? - source, - destination: - (destinationNode.frontmatter.importedFromRid as string | undefined) ?? - destination, - }, }; }; diff --git a/apps/obsidian/src/utils/obsidianToCrossAppConverters.ts b/apps/obsidian/src/utils/obsidianToCrossAppConverters.ts index 2cb480838..db065b5d6 100644 --- a/apps/obsidian/src/utils/obsidianToCrossAppConverters.ts +++ b/apps/obsidian/src/utils/obsidianToCrossAppConverters.ts @@ -1,6 +1,7 @@ import type { CrossAppNode, CrossAppNodeSchema, + CrossAppRelation, CrossAppRelationTripleSchema, CrossAppRelationTypeSchema, } from "@repo/database/crossAppContracts"; @@ -10,7 +11,10 @@ import type { DiscourseNode, DiscourseRelation, DiscourseRelationType, + RelationInstance, } from "~/types"; +import type { DiscourseNodeInVault } from "./getDiscourseNodes"; +import { referenceIdOf } from "./sourceSlot"; import type { ObsidianDiscourseNodeData } from "./syncDgNodesToSupabase"; import type { ChangedNodeContent } from "./upsertNodesAsContentWithEmbeddings"; @@ -112,3 +116,23 @@ export const nodeInstanceToCrossApp = ({ }, }; }; + +export const relationInstanceToCrossApp = ({ + relation, + sourceNode, + destinationNode, + accountLocalId, +}: { + relation: RelationInstance; + sourceNode: DiscourseNodeInVault; + destinationNode: DiscourseNodeInVault; + accountLocalId: string; +}): CrossAppRelation => ({ + localId: relation.id, + relationType: relation.type, + source: referenceIdOf(sourceNode), + destination: referenceIdOf(destinationNode), + authorId: accountLocalId, + createdAt: new Date(relation.created), + modifiedAt: new Date(relation.lastModified ?? relation.created), +}); diff --git a/apps/obsidian/src/utils/sourceSlot.ts b/apps/obsidian/src/utils/sourceSlot.ts index b41f14028..b9857253e 100644 --- a/apps/obsidian/src/utils/sourceSlot.ts +++ b/apps/obsidian/src/utils/sourceSlot.ts @@ -41,7 +41,7 @@ const isSourceNodeType = (nodeType: DiscourseNode | undefined): boolean => const byCreatedThenId = (a: RelationInstance, b: RelationInstance): number => a.created - b.created || a.id.localeCompare(b.id); -const sourceDocumentIdOf = (node: DiscourseNodeInVault): string => { +export const referenceIdOf = (node: DiscourseNodeInVault): string => { const importedFromRid = node.frontmatter.importedFromRid; return typeof importedFromRid === "string" ? importedFromRid @@ -80,7 +80,7 @@ export const indexSourceSlotValues = ({ return Object.fromEntries( Object.entries(earliestByNodeId).map(([nodeInstanceId, candidate]) => [ nodeInstanceId, - sourceDocumentIdOf(candidate.sourceDocumentNode), + referenceIdOf(candidate.sourceDocumentNode), ]), ); }; diff --git a/apps/obsidian/src/utils/syncDgNodesToSupabase.ts b/apps/obsidian/src/utils/syncDgNodesToSupabase.ts index f0c22daf2..2e052b835 100644 --- a/apps/obsidian/src/utils/syncDgNodesToSupabase.ts +++ b/apps/obsidian/src/utils/syncDgNodesToSupabase.ts @@ -881,7 +881,7 @@ const convertDgToSupabaseConcepts = async ({ ) .map((relationInstanceData) => relationInstanceToLocalConcept({ - context, + accountLocalId, relationTypesById, allNodesById, relationInstanceData,