ENG-771 Handle empty account name (#364)

* Do not overwrite name with empty name

* document upsert_accounts_in_space

Author: maparent

packages/database/doc/upsert_content.md

@@ -3,8 +3,10 @@
 In general, for external references, you can either embed it inline, reference it by `X_local_id` (where local means the platform) or use the db_ids as in the tables.
 
 ```typescript
-import type { LocalDocumentDataInput, LocalContentDataInput } from '@repo/database/inputTypes.ts';
+import type { LocalAccountDataInput, LocalDocumentDataInput, LocalContentDataInput } from '@repo/database/inputTypes';
 
+const accounts: LocalAccountDataInput[] = [{
+  "account_local_id": "sR22zZ470dNPkIf9PpjQXXdTBjG2", "name": "maparent" }];
 const docs: LocalDocumentDataInput[] = [{ "source_local_id": "page1_uid", "created": "2000/01/01", "last_modified": "2001/01/02", author_local_id:"sR22zZ470dNPkIf9PpjQXXdTBjG2"}];
 const contents: LocalContentDataInput[] = [
   {
@@ -32,6 +34,13 @@ const contents: LocalContentDataInput[] = [
   } }
 ];
 
+// optional preliminary step: upsert accounts.
+{
+  const { data, error } = await client.rpc("upsert_accounts_in_space", { space_id_: 12, data: accounts as Json });
+  if (error) console.error(error);
+  console.log(data);
+}
+
 // optional preliminary step: upsert documents.
 {
   const { data, error } = await client.rpc("upsert_documents", { v_space_id: 12, data: docs as Json });

packages/database/src/inputTypes.ts

@@ -1,13 +1,24 @@
 import type { Database, TablesInsert } from "@repo/database/dbTypes";
 
+export type LocalAccountDataInput = Partial<
+  Database["public"]["CompositeTypes"]["account_local_input"]
+>;
 export type LocalDocumentDataInput = Partial<
-  Omit<Database['public']["CompositeTypes"]["document_local_input"], "author_inline">
-  & { author_inline: Partial<TablesInsert<"PlatformAccount">> }>;
+  Omit<
+    Database["public"]["CompositeTypes"]["document_local_input"],
+    "author_inline"
+  > & { author_inline: LocalAccountDataInput }
+>;
 export type LocalContentDataInput = Partial<
-  Omit<Database['public']["CompositeTypes"]["content_local_input"], "document_inline" | "author_inline" | "creator_inline">
-  & {
-    document_inline: LocalDocumentDataInput,
-    author_inline: Partial<TablesInsert<"PlatformAccount">>,
-    creator_inline: Partial<TablesInsert<"PlatformAccount">>
-  }>;
-export type LocalConceptDataInput = Partial<Database['public']["CompositeTypes"]["concept_local_input"]>;
+  Omit<
+    Database["public"]["CompositeTypes"]["content_local_input"],
+    "document_inline" | "author_inline" | "creator_inline"
+  > & {
+    document_inline: LocalDocumentDataInput;
+    author_inline: LocalAccountDataInput;
+    creator_inline: LocalAccountDataInput;
+  }
+>;
+export type LocalConceptDataInput = Partial<
+  Database["public"]["CompositeTypes"]["concept_local_input"]
+>;

packages/database/supabase/migrations/20250824134305_do_not_overwrite_with_empty_name.sql

@@ -0,0 +1,31 @@
+CREATE OR REPLACE FUNCTION public.upsert_account_in_space(space_id_ bigint, local_account account_local_input)
+ RETURNS bigint
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO ''
+AS $function$
+DECLARE
+    platform_ public."Platform";
+    account_id_ BIGINT;
+BEGIN
+    SELECT platform INTO STRICT platform_ FROM public."Space" WHERE id = space_id_;
+    INSERT INTO public."PlatformAccount" AS pa (
+            account_local_id, name, platform
+        ) VALUES (
+            local_account.account_local_id, local_account.name, platform_
+        ) ON CONFLICT (account_local_id, platform) DO UPDATE SET
+            name = COALESCE(NULLIF(TRIM(EXCLUDED.name), ''), pa.name)
+        RETURNING id INTO STRICT account_id_;
+    INSERT INTO public."SpaceAccess" as sa (space_id, account_id, editor) values (space_id_, account_id_, COALESCE(local_account.space_editor, true))
+        ON CONFLICT (space_id, account_id)
+        DO UPDATE SET editor = COALESCE(local_account.space_editor, sa.editor, true);
+    IF local_account.email IS NOT NULL THEN
+        -- TODO: how to distinguish basic untrusted from platform placeholder email?
+        INSERT INTO public."AgentIdentifier" as ai (account_id, value, identifier_type, trusted) VALUES (account_id_, local_account.email, 'email', COALESCE(local_account.email_trusted, false))
+        ON CONFLICT (value, identifier_type, account_id)
+        DO UPDATE SET trusted = COALESCE(local_account.email_trusted, ai.trusted, false);
+    END IF;
+    RETURN account_id_;
+END;
+$function$
+;

packages/database/supabase/schemas/account.sql

@@ -126,7 +126,7 @@ BEGIN
         ) VALUES (
             local_account.account_local_id, local_account.name, platform_
         ) ON CONFLICT (account_local_id, platform) DO UPDATE SET
-            name = coalesce(local_account.name, pa.name)
+            name = COALESCE(NULLIF(TRIM(EXCLUDED.name), ''), pa.name)
         RETURNING id INTO STRICT account_id_;
     INSERT INTO public."SpaceAccess" as sa (space_id, account_id, editor) values (space_id_, account_id_, COALESCE(local_account.space_editor, true))
         ON CONFLICT (space_id, account_id)