@open-mercato/core 0.5.1-develop.2663.2c29774b5b → 0.5.1-develop.2681.c559bb2bc3

package/dist/modules/customers/commands/people.js

@@ -14,6 +14,7 @@ import {
   CustomerInteraction,
   CustomerDeal,
   CustomerDealPersonLink,
+  CustomerPersonCompanyLink,
   CustomerTodoLink,
   CustomerEntity,
   CustomerPersonProfile,
@@ -36,6 +37,7 @@ import {
   emitQueryIndexDeleteEvents,
   emitQueryIndexUpsertEvents
 } from "./shared.js";
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import {
@@ -44,6 +46,11 @@ import {
 } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { E } from "../../../generated/entities.ids.generated.js";
 import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import {
+  loadPersonCompanyLinks,
+  summarizePersonCompanies,
+  syncLegacyPrimaryCompanyLink
+} from "../lib/personCompanies.js";
 const INTERACTION_ENTITY_ID = "customers:customer_interaction";
 const personCrudIndexer = {
   entityType: E.customers.customer_person_profile
@@ -82,6 +89,7 @@ function normalizeEmail(value) {
   return normalized ? normalized.toLowerCase() : null;
 }
 function serializePersonSnapshot(entity, profile, tagIds, addresses, comments, deals, activities, todoLinks, interactions, custom) {
+  const companies = summarizePersonCompanies(profile, []);
   return {
     entity: {
       id: entity.id,
@@ -115,6 +123,7 @@ function serializePersonSnapshot(entity, profile, tagIds, addresses, comments, d
       twitterUrl: profile.twitterUrl ?? null,
       companyEntityId: profile.company ? typeof profile.company === "string" ? profile.company : profile.company.id : null
     },
+    companies,
     tagIds,
     addresses: addresses.map((address) => ({
       id: address.id,
@@ -182,6 +191,7 @@ async function loadPersonSnapshot(em, entityId) {
     { tenantId: entity.tenantId, organizationId: entity.organizationId }
   );
   if (!profile) return null;
+  const companyLinks = await loadPersonCompanyLinks(em, entity);
   const tagIds = await loadEntityTagIds(em, entity);
   const addresses = await em.find(CustomerAddress, { entity }, { orderBy: { createdAt: "asc" } });
   const comments = await findWithDecryption(
@@ -253,7 +263,9 @@ async function loadPersonSnapshot(em, entityId) {
       })
     }))
   );
-  return serializePersonSnapshot(entity, profile, tagIds, addresses, comments, deals, activities, todoLinks, interactionSnapshots, custom);
+  const snapshot = serializePersonSnapshot(entity, profile, tagIds, addresses, comments, deals, activities, todoLinks, interactionSnapshots, custom);
+  snapshot.companies = summarizePersonCompanies(profile, companyLinks);
+  return snapshot;
 }
 async function resolveCompanyReference(em, companyId, organizationId, tenantId) {
   if (!companyId) return null;
@@ -334,72 +346,78 @@ const createPersonCommand = {
     if (!displayName) {
       throw new CrudHttpError(400, { error: "Display name is required" });
     }
-    const entity = em.create(CustomerEntity, {
-      organizationId: parsed.organizationId,
-      tenantId: parsed.tenantId,
-      kind: "person",
-      displayName,
-      description,
-      ownerUserId: parsed.ownerUserId ?? null,
-      primaryEmail,
-      primaryPhone,
-      status,
-      lifecycleStage,
-      source,
-      nextInteractionAt: parsed.nextInteraction?.at ?? null,
-      nextInteractionName,
-      nextInteractionRefId,
-      nextInteractionIcon,
-      nextInteractionColor,
-      isActive: parsed.isActive ?? true
-    });
-    const company = await resolveCompanyReference(em, parsed.companyEntityId ?? null, parsed.organizationId, parsed.tenantId);
-    const profile = em.create(CustomerPersonProfile, {
-      organizationId: parsed.organizationId,
-      tenantId: parsed.tenantId,
-      entity,
-      firstName,
-      lastName,
-      preferredName,
-      jobTitle,
-      department,
-      seniority,
-      timezone,
-      linkedInUrl,
-      twitterUrl,
-      company
-    });
-    em.persist(entity);
-    em.persist(profile);
-    if (status) {
-      await ensureDictionaryEntry(em, {
-        tenantId: parsed.tenantId,
-        organizationId: parsed.organizationId,
-        kind: "status",
-        value: status
-      });
-    }
-    if (jobTitle) {
-      await ensureDictionaryEntry(em, {
-        tenantId: parsed.tenantId,
-        organizationId: parsed.organizationId,
-        kind: "job_title",
-        value: jobTitle
-      });
-    }
-    if (source) {
-      await ensureDictionaryEntry(em, {
-        tenantId: parsed.tenantId,
-        organizationId: parsed.organizationId,
-        kind: "source",
-        value: source
-      });
-    }
-    await em.flush();
+    let entity;
+    let profile;
+    await withAtomicFlush(em, [
+      () => {
+        entity = em.create(CustomerEntity, {
+          organizationId: parsed.organizationId,
+          tenantId: parsed.tenantId,
+          kind: "person",
+          displayName,
+          description,
+          ownerUserId: parsed.ownerUserId ?? null,
+          primaryEmail,
+          primaryPhone,
+          status,
+          lifecycleStage,
+          source,
+          nextInteractionAt: parsed.nextInteraction?.at ?? null,
+          nextInteractionName,
+          nextInteractionRefId,
+          nextInteractionIcon,
+          nextInteractionColor,
+          isActive: parsed.isActive ?? true
+        });
+        profile = em.create(CustomerPersonProfile, {
+          organizationId: parsed.organizationId,
+          tenantId: parsed.tenantId,
+          entity,
+          firstName,
+          lastName,
+          preferredName,
+          jobTitle,
+          department,
+          seniority,
+          timezone,
+          linkedInUrl,
+          twitterUrl,
+          company: null
+        });
+        em.persist(entity);
+        em.persist(profile);
+      },
+      async () => {
+        if (status) {
+          await ensureDictionaryEntry(em, {
+            tenantId: parsed.tenantId,
+            organizationId: parsed.organizationId,
+            kind: "status",
+            value: status
+          });
+        }
+        if (jobTitle) {
+          await ensureDictionaryEntry(em, {
+            tenantId: parsed.tenantId,
+            organizationId: parsed.organizationId,
+            kind: "job_title",
+            value: jobTitle
+          });
+        }
+        if (source) {
+          await ensureDictionaryEntry(em, {
+            tenantId: parsed.tenantId,
+            organizationId: parsed.organizationId,
+            kind: "source",
+            value: source
+          });
+        }
+      },
+      () => syncLegacyPrimaryCompanyLink(em, entity, profile, parsed.companyEntityId ?? null),
+      () => syncEntityTags(em, entity, parsed.tags)
+    ], { transaction: true });
     const tenantId = entity.tenantId;
     const organizationId = entity.organizationId;
-    await syncEntityTags(em, entity, parsed.tags);
-    await em.flush();
     await setCustomFieldsForPerson(ctx, entity.id, profile.id, organizationId, tenantId, custom);
     const de = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -445,17 +463,25 @@ const createPersonCommand = {
     const em = ctx.container.resolve("em").fork();
     const entity = await em.findOne(CustomerEntity, { id: entityId });
     if (!entity) return;
-    const profile = await em.findOne(CustomerPersonProfile, { entity });
+    const profile = await findOneWithDecryption(
+      em,
+      CustomerPersonProfile,
+      { entity },
+      void 0,
+      { tenantId: entity.tenantId, organizationId: entity.organizationId }
+    );
     const identifiers = {
       id: payload?.after?.profile.id ?? profile?.id ?? entity.id,
       organizationId: entity.organizationId,
       tenantId: entity.tenantId
     };
-    await em.nativeDelete(CustomerTagAssignment, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    if (profile) {
-      await em.remove(profile).flush();
-    }
-    await em.remove(entity).flush();
+    await withAtomicFlush(em, [
+      () => em.nativeDelete(CustomerTagAssignment, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId }),
+      () => {
+        if (profile) em.remove(profile);
+      },
+      () => em.remove(entity)
+    ], { transaction: true });
     const de = ctx.container.resolve("dataEngine");
     await emitCrudUndoSideEffects({
       dataEngine: de,
@@ -472,7 +498,7 @@ const updatePersonCommand = {
   id: "customers.people.update",
   async prepare(rawInput, ctx) {
     const { parsed } = parseWithCustomFields(personUpdateSchema, rawInput);
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadPersonSnapshot(em, parsed.id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -485,97 +511,111 @@ const updatePersonCommand = {
     ensureOrganizationScope(ctx, record.organizationId);
     const profile = await em.findOne(CustomerPersonProfile, { entity: record });
     if (!profile) throw new CrudHttpError(404, { error: "Person profile not found" });
-    if (parsed.description !== void 0) record.description = normalizeOptionalString(parsed.description);
-    if (parsed.ownerUserId !== void 0) record.ownerUserId = parsed.ownerUserId ?? null;
-    if (parsed.primaryEmail !== void 0) record.primaryEmail = normalizeEmail(parsed.primaryEmail);
-    if (parsed.primaryPhone !== void 0) record.primaryPhone = normalizeOptionalString(parsed.primaryPhone);
-    if (parsed.status !== void 0) {
-      const normalizedStatus = normalizeOptionalString(parsed.status);
-      record.status = normalizedStatus;
-      if (normalizedStatus) {
-        await ensureDictionaryEntry(em, {
-          tenantId: record.tenantId,
-          organizationId: record.organizationId,
-          kind: "status",
-          value: normalizedStatus
-        });
-      }
-    }
-    if (parsed.lifecycleStage !== void 0) record.lifecycleStage = normalizeOptionalString(parsed.lifecycleStage);
-    if (parsed.source !== void 0) {
-      const normalizedSource = normalizeOptionalString(parsed.source);
-      record.source = normalizedSource;
-      if (normalizedSource) {
-        await ensureDictionaryEntry(em, {
-          tenantId: record.tenantId,
-          organizationId: record.organizationId,
-          kind: "source",
-          value: normalizedSource
-        });
-      }
-    }
-    if (parsed.isActive !== void 0) record.isActive = parsed.isActive;
-    if (parsed.nextInteraction) {
-      record.nextInteractionAt = parsed.nextInteraction.at;
-      record.nextInteractionName = parsed.nextInteraction.name.trim();
-      record.nextInteractionRefId = normalizeOptionalString(parsed.nextInteraction.refId) ?? null;
-      record.nextInteractionIcon = normalizeOptionalString(parsed.nextInteraction.icon);
-      record.nextInteractionColor = normalizeHexColor(parsed.nextInteraction.color);
-    } else if (parsed.nextInteraction === null) {
-      record.nextInteractionAt = null;
-      record.nextInteractionName = null;
-      record.nextInteractionRefId = null;
-      record.nextInteractionIcon = null;
-      record.nextInteractionColor = null;
-    }
-    if (parsed.firstName !== void 0) profile.firstName = normalizeOptionalString(parsed.firstName);
-    if (parsed.lastName !== void 0) profile.lastName = normalizeOptionalString(parsed.lastName);
-    if (parsed.preferredName !== void 0) profile.preferredName = normalizeOptionalString(parsed.preferredName);
-    if (parsed.jobTitle !== void 0) {
-      const normalizedJobTitle = normalizeOptionalString(parsed.jobTitle);
-      profile.jobTitle = normalizedJobTitle;
-      if (normalizedJobTitle) {
-        await ensureDictionaryEntry(em, {
-          tenantId: record.tenantId,
-          organizationId: record.organizationId,
-          kind: "job_title",
-          value: normalizedJobTitle
-        });
-      }
-    }
-    if (parsed.department !== void 0) profile.department = normalizeOptionalString(parsed.department);
-    if (parsed.seniority !== void 0) profile.seniority = normalizeOptionalString(parsed.seniority);
-    if (parsed.timezone !== void 0) profile.timezone = normalizeOptionalString(parsed.timezone);
-    if (parsed.linkedInUrl !== void 0) profile.linkedInUrl = normalizeOptionalString(parsed.linkedInUrl);
-    if (parsed.twitterUrl !== void 0) profile.twitterUrl = normalizeOptionalString(parsed.twitterUrl);
-    if (parsed.companyEntityId !== void 0) {
-      profile.company = await resolveCompanyReference(em, parsed.companyEntityId, record.organizationId, record.tenantId);
-    }
-    const profileFieldsUpdated = [
-      parsed.firstName,
-      parsed.lastName,
-      parsed.preferredName,
-      parsed.jobTitle,
-      parsed.department,
-      parsed.seniority,
-      parsed.timezone,
-      parsed.linkedInUrl,
-      parsed.twitterUrl,
-      parsed.companyEntityId
-    ].some((v) => v !== void 0);
-    if (profileFieldsUpdated) {
-      record.updatedAt = /* @__PURE__ */ new Date();
-    }
     if (parsed.displayName !== void 0) {
       const nextDisplayName = parsed.displayName.trim();
       if (!nextDisplayName) {
         throw new CrudHttpError(400, { error: "Display name is required" });
       }
-      record.displayName = nextDisplayName;
     }
-    await em.flush();
-    await syncEntityTags(em, record, parsed.tags);
-    await em.flush();
+    await withAtomicFlush(em, [
+      () => {
+        if (parsed.description !== void 0) record.description = normalizeOptionalString(parsed.description);
+        if (parsed.ownerUserId !== void 0) record.ownerUserId = parsed.ownerUserId ?? null;
+        if (parsed.primaryEmail !== void 0) record.primaryEmail = normalizeEmail(parsed.primaryEmail);
+        if (parsed.primaryPhone !== void 0) record.primaryPhone = normalizeOptionalString(parsed.primaryPhone);
+        if (parsed.status !== void 0) {
+          record.status = normalizeOptionalString(parsed.status);
+        }
+        if (parsed.lifecycleStage !== void 0) record.lifecycleStage = normalizeOptionalString(parsed.lifecycleStage);
+        if (parsed.source !== void 0) {
+          record.source = normalizeOptionalString(parsed.source);
+        }
+        if (parsed.isActive !== void 0) record.isActive = parsed.isActive;
+        if (parsed.nextInteraction) {
+          record.nextInteractionAt = parsed.nextInteraction.at;
+          record.nextInteractionName = parsed.nextInteraction.name.trim();
+          record.nextInteractionRefId = normalizeOptionalString(parsed.nextInteraction.refId) ?? null;
+          record.nextInteractionIcon = normalizeOptionalString(parsed.nextInteraction.icon);
+          record.nextInteractionColor = normalizeHexColor(parsed.nextInteraction.color);
+        } else if (parsed.nextInteraction === null) {
+          record.nextInteractionAt = null;
+          record.nextInteractionName = null;
+          record.nextInteractionRefId = null;
+          record.nextInteractionIcon = null;
+          record.nextInteractionColor = null;
+        }
+        if (parsed.firstName !== void 0) profile.firstName = normalizeOptionalString(parsed.firstName);
+        if (parsed.lastName !== void 0) profile.lastName = normalizeOptionalString(parsed.lastName);
+        if (parsed.preferredName !== void 0) profile.preferredName = normalizeOptionalString(parsed.preferredName);
+        if (parsed.jobTitle !== void 0) {
+          profile.jobTitle = normalizeOptionalString(parsed.jobTitle);
+        }
+        if (parsed.department !== void 0) profile.department = normalizeOptionalString(parsed.department);
+        if (parsed.seniority !== void 0) profile.seniority = normalizeOptionalString(parsed.seniority);
+        if (parsed.timezone !== void 0) profile.timezone = normalizeOptionalString(parsed.timezone);
+        if (parsed.linkedInUrl !== void 0) profile.linkedInUrl = normalizeOptionalString(parsed.linkedInUrl);
+        if (parsed.twitterUrl !== void 0) profile.twitterUrl = normalizeOptionalString(parsed.twitterUrl);
+        const profileFieldsUpdated = [
+          parsed.firstName,
+          parsed.lastName,
+          parsed.preferredName,
+          parsed.jobTitle,
+          parsed.department,
+          parsed.seniority,
+          parsed.timezone,
+          parsed.linkedInUrl,
+          parsed.twitterUrl,
+          parsed.companyEntityId
+        ].some((v) => v !== void 0);
+        if (profileFieldsUpdated) {
+          record.updatedAt = /* @__PURE__ */ new Date();
+        }
+        if (parsed.displayName !== void 0) {
+          record.displayName = parsed.displayName.trim();
+        }
+      },
+      async () => {
+        if (parsed.status !== void 0) {
+          const normalizedStatus = normalizeOptionalString(parsed.status);
+          if (normalizedStatus) {
+            await ensureDictionaryEntry(em, {
+              tenantId: record.tenantId,
+              organizationId: record.organizationId,
+              kind: "status",
+              value: normalizedStatus
+            });
+          }
+        }
+        if (parsed.source !== void 0) {
+          const normalizedSource = normalizeOptionalString(parsed.source);
+          if (normalizedSource) {
+            await ensureDictionaryEntry(em, {
+              tenantId: record.tenantId,
+              organizationId: record.organizationId,
+              kind: "source",
+              value: normalizedSource
+            });
+          }
+        }
+        if (parsed.jobTitle !== void 0) {
+          const normalizedJobTitle = normalizeOptionalString(parsed.jobTitle);
+          if (normalizedJobTitle) {
+            await ensureDictionaryEntry(em, {
+              tenantId: record.tenantId,
+              organizationId: record.organizationId,
+              kind: "job_title",
+              value: normalizedJobTitle
+            });
+          }
+        }
+      },
+      async () => {
+        if (parsed.companyEntityId !== void 0) {
+          await syncLegacyPrimaryCompanyLink(em, record, profile, parsed.companyEntityId);
+        }
+      },
+      () => syncEntityTags(em, record, parsed.tags)
+    ], { transaction: true });
     await setCustomFieldsForPerson(ctx, record.id, profile.id, record.organizationId, record.tenantId, custom);
     const de = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -628,90 +668,92 @@ const updatePersonCommand = {
     const em = ctx.container.resolve("em").fork();
     const entity = await em.findOne(CustomerEntity, { id: before.entity.id });
     if (!entity) {
-      const newEntity = em.create(CustomerEntity, {
-        id: before.entity.id,
-        organizationId: before.entity.organizationId,
-        tenantId: before.entity.tenantId,
-        kind: "person",
-        displayName: before.entity.displayName,
-        description: before.entity.description,
-        ownerUserId: before.entity.ownerUserId,
-        primaryEmail: before.entity.primaryEmail,
-        primaryPhone: before.entity.primaryPhone,
-        status: before.entity.status,
-        lifecycleStage: before.entity.lifecycleStage,
-        source: before.entity.source,
-        nextInteractionAt: before.entity.nextInteractionAt,
-        nextInteractionName: before.entity.nextInteractionName,
-        nextInteractionRefId: before.entity.nextInteractionRefId,
-        nextInteractionIcon: before.entity.nextInteractionIcon,
-        nextInteractionColor: before.entity.nextInteractionColor,
-        isActive: before.entity.isActive
-      });
-      em.persist(newEntity);
-      const profile = em.create(CustomerPersonProfile, {
-        id: before.profile.id,
-        organizationId: before.entity.organizationId,
-        tenantId: before.entity.tenantId,
-        entity: newEntity,
-        firstName: before.profile.firstName,
-        lastName: before.profile.lastName,
-        preferredName: before.profile.preferredName,
-        jobTitle: before.profile.jobTitle,
-        department: before.profile.department,
-        seniority: before.profile.seniority,
-        timezone: before.profile.timezone,
-        linkedInUrl: before.profile.linkedInUrl,
-        twitterUrl: before.profile.twitterUrl
-      });
-      em.persist(profile);
-      if (before.profile.companyEntityId) {
-        profile.company = await resolveCompanyReference(
-          em,
-          before.profile.companyEntityId,
-          before.entity.organizationId,
-          before.entity.tenantId
-        );
-      }
-      await em.flush();
-      await syncEntityTags(em, newEntity, before.tagIds);
-      await em.flush();
+      let newEntity;
+      let newProfile;
+      await withAtomicFlush(em, [
+        () => {
+          newEntity = em.create(CustomerEntity, {
+            id: before.entity.id,
+            organizationId: before.entity.organizationId,
+            tenantId: before.entity.tenantId,
+            kind: "person",
+            displayName: before.entity.displayName,
+            description: before.entity.description,
+            ownerUserId: before.entity.ownerUserId,
+            primaryEmail: before.entity.primaryEmail,
+            primaryPhone: before.entity.primaryPhone,
+            status: before.entity.status,
+            lifecycleStage: before.entity.lifecycleStage,
+            source: before.entity.source,
+            nextInteractionAt: before.entity.nextInteractionAt,
+            nextInteractionName: before.entity.nextInteractionName,
+            nextInteractionRefId: before.entity.nextInteractionRefId,
+            nextInteractionIcon: before.entity.nextInteractionIcon,
+            nextInteractionColor: before.entity.nextInteractionColor,
+            isActive: before.entity.isActive
+          });
+          em.persist(newEntity);
+          newProfile = em.create(CustomerPersonProfile, {
+            id: before.profile.id,
+            organizationId: before.entity.organizationId,
+            tenantId: before.entity.tenantId,
+            entity: newEntity,
+            firstName: before.profile.firstName,
+            lastName: before.profile.lastName,
+            preferredName: before.profile.preferredName,
+            jobTitle: before.profile.jobTitle,
+            department: before.profile.department,
+            seniority: before.profile.seniority,
+            timezone: before.profile.timezone,
+            linkedInUrl: before.profile.linkedInUrl,
+            twitterUrl: before.profile.twitterUrl
+          });
+          em.persist(newProfile);
+        },
+        () => syncLegacyPrimaryCompanyLink(em, newEntity, newProfile, before.profile.companyEntityId),
+        () => syncEntityTags(em, newEntity, before.tagIds)
+      ], { transaction: true });
     } else {
-      entity.displayName = before.entity.displayName;
-      entity.description = before.entity.description;
-      entity.ownerUserId = before.entity.ownerUserId;
-      entity.primaryEmail = before.entity.primaryEmail;
-      entity.primaryPhone = before.entity.primaryPhone;
-      entity.status = before.entity.status;
-      entity.lifecycleStage = before.entity.lifecycleStage;
-      entity.source = before.entity.source;
-      entity.nextInteractionAt = before.entity.nextInteractionAt;
-      entity.nextInteractionName = before.entity.nextInteractionName;
-      entity.nextInteractionRefId = before.entity.nextInteractionRefId;
-      entity.nextInteractionIcon = before.entity.nextInteractionIcon;
-      entity.nextInteractionColor = before.entity.nextInteractionColor;
-      entity.isActive = before.entity.isActive;
-      await em.flush();
-      const profile = await em.findOne(CustomerPersonProfile, { entity });
-      if (profile) {
-        profile.firstName = before.profile.firstName;
-        profile.lastName = before.profile.lastName;
-        profile.preferredName = before.profile.preferredName;
-        profile.jobTitle = before.profile.jobTitle;
-        profile.department = before.profile.department;
-        profile.seniority = before.profile.seniority;
-        profile.timezone = before.profile.timezone;
-        profile.linkedInUrl = before.profile.linkedInUrl;
-        profile.twitterUrl = before.profile.twitterUrl;
-        profile.company = before.profile.companyEntityId ? await resolveCompanyReference(
-          em,
-          before.profile.companyEntityId,
-          before.entity.organizationId,
-          before.entity.tenantId
-        ) : null;
-      }
-      await syncEntityTags(em, entity, before.tagIds);
-      await em.flush();
+      await withAtomicFlush(em, [
+        () => {
+          entity.displayName = before.entity.displayName;
+          entity.description = before.entity.description;
+          entity.ownerUserId = before.entity.ownerUserId;
+          entity.primaryEmail = before.entity.primaryEmail;
+          entity.primaryPhone = before.entity.primaryPhone;
+          entity.status = before.entity.status;
+          entity.lifecycleStage = before.entity.lifecycleStage;
+          entity.source = before.entity.source;
+          entity.nextInteractionAt = before.entity.nextInteractionAt;
+          entity.nextInteractionName = before.entity.nextInteractionName;
+          entity.nextInteractionRefId = before.entity.nextInteractionRefId;
+          entity.nextInteractionIcon = before.entity.nextInteractionIcon;
+          entity.nextInteractionColor = before.entity.nextInteractionColor;
+          entity.isActive = before.entity.isActive;
+        },
+        async () => {
+          const profile = await findOneWithDecryption(
+            em,
+            CustomerPersonProfile,
+            { entity },
+            void 0,
+            { tenantId: before.entity.tenantId, organizationId: before.entity.organizationId }
+          );
+          if (profile) {
+            profile.firstName = before.profile.firstName;
+            profile.lastName = before.profile.lastName;
+            profile.preferredName = before.profile.preferredName;
+            profile.jobTitle = before.profile.jobTitle;
+            profile.department = before.profile.department;
+            profile.seniority = before.profile.seniority;
+            profile.timezone = before.profile.timezone;
+            profile.linkedInUrl = before.profile.linkedInUrl;
+            profile.twitterUrl = before.profile.twitterUrl;
+            await syncLegacyPrimaryCompanyLink(em, entity, profile, before.profile.companyEntityId);
+          }
+        },
+        () => syncEntityTags(em, entity, before.tagIds)
+      ], { transaction: true });
     }
     const indexedEntity = await em.findOne(CustomerEntity, { id: before.entity.id });
     const de = ctx.container.resolve("dataEngine");
@@ -740,7 +782,7 @@ const deletePersonCommand = {
   id: "customers.people.delete",
   async prepare(input, ctx) {
     const id = requireId(input, "Person id required");
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadPersonSnapshot(em, id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -761,6 +803,7 @@ const deletePersonCommand = {
     await em.nativeDelete(CustomerTodoLink, { entity: record, organizationId: record.organizationId, tenantId: record.tenantId });
     await em.nativeDelete(CustomerTagAssignment, { entity: record, organizationId: record.organizationId, tenantId: record.tenantId });
     await em.nativeDelete(CustomerDealPersonLink, { person: record });
+    await em.nativeDelete(CustomerPersonCompanyLink, { person: record });
     if (profile) {
       await em.nativeDelete(CustomFieldValue, { entityId: PERSON_ENTITY_ID, recordId: profile.id });
     }
@@ -862,237 +905,291 @@ const deletePersonCommand = {
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
-    let entity = await em.findOne(CustomerEntity, { id: before.entity.id });
-    if (!entity) {
-      entity = em.create(CustomerEntity, {
-        id: before.entity.id,
-        organizationId: before.entity.organizationId,
-        tenantId: before.entity.tenantId,
-        kind: "person",
-        displayName: before.entity.displayName,
-        description: before.entity.description,
-        ownerUserId: before.entity.ownerUserId,
-        primaryEmail: before.entity.primaryEmail,
-        primaryPhone: before.entity.primaryPhone,
-        status: before.entity.status,
-        lifecycleStage: before.entity.lifecycleStage,
-        source: before.entity.source,
-        nextInteractionAt: before.entity.nextInteractionAt,
-        nextInteractionName: before.entity.nextInteractionName,
-        nextInteractionRefId: before.entity.nextInteractionRefId,
-        nextInteractionIcon: before.entity.nextInteractionIcon,
-        nextInteractionColor: before.entity.nextInteractionColor,
-        isActive: before.entity.isActive
-      });
-      em.persist(entity);
-    }
-    entity.displayName = before.entity.displayName;
-    entity.description = before.entity.description;
-    entity.ownerUserId = before.entity.ownerUserId;
-    entity.primaryEmail = before.entity.primaryEmail;
-    entity.primaryPhone = before.entity.primaryPhone;
-    entity.status = before.entity.status;
-    entity.lifecycleStage = before.entity.lifecycleStage;
-    entity.source = before.entity.source;
-    entity.nextInteractionAt = before.entity.nextInteractionAt;
-    entity.nextInteractionName = before.entity.nextInteractionName;
-    entity.nextInteractionRefId = before.entity.nextInteractionRefId;
-    entity.nextInteractionIcon = before.entity.nextInteractionIcon;
-    entity.nextInteractionColor = before.entity.nextInteractionColor;
-    entity.isActive = before.entity.isActive;
-    entity.deletedAt = null;
-    let profile = await em.findOne(CustomerPersonProfile, { entity });
-    if (!profile) {
-      profile = em.create(CustomerPersonProfile, {
-        id: before.profile.id,
-        organizationId: before.entity.organizationId,
-        tenantId: before.entity.tenantId,
-        entity,
-        firstName: before.profile.firstName,
-        lastName: before.profile.lastName,
-        preferredName: before.profile.preferredName,
-        jobTitle: before.profile.jobTitle,
-        department: before.profile.department,
-        seniority: before.profile.seniority,
-        timezone: before.profile.timezone,
-        linkedInUrl: before.profile.linkedInUrl,
-        twitterUrl: before.profile.twitterUrl
-      });
-    } else {
-      profile.firstName = before.profile.firstName;
-      profile.lastName = before.profile.lastName;
-      profile.preferredName = before.profile.preferredName;
-      profile.jobTitle = before.profile.jobTitle;
-      profile.department = before.profile.department;
-      profile.seniority = before.profile.seniority;
-      profile.timezone = before.profile.timezone;
-      profile.linkedInUrl = before.profile.linkedInUrl;
-      profile.twitterUrl = before.profile.twitterUrl;
-    }
-    if (before.profile.companyEntityId) {
-      profile.company = await resolveCompanyReference(
-        em,
-        before.profile.companyEntityId,
-        before.entity.organizationId,
-        before.entity.tenantId
-      );
-    } else {
-      profile.company = null;
-    }
-    await em.flush();
-    await syncEntityTags(em, entity, before.tagIds);
-    await em.flush();
-    const beforeActivities = before.activities ?? [];
-    const beforeTodos = before.todos ?? [];
-    const beforeInteractions = before.interactions ?? [];
-    const relatedDealIds = /* @__PURE__ */ new Set();
-    for (const link of before.deals) relatedDealIds.add(link.dealId);
-    for (const activity of beforeActivities) {
-      if (activity.dealId) relatedDealIds.add(activity.dealId);
-    }
-    for (const comment of before.comments) {
-      if (comment.dealId) relatedDealIds.add(comment.dealId);
-    }
-    let dealMap = /* @__PURE__ */ new Map();
-    if (relatedDealIds.size) {
-      const deals = await em.find(CustomerDeal, {
-        id: { $in: Array.from(relatedDealIds) },
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId
-      });
-      dealMap = new Map(deals.map((deal) => [deal.id, deal]));
-    }
-    await em.nativeDelete(CustomerDealPersonLink, { person: entity });
-    for (const link of before.deals) {
-      const deal = dealMap.get(link.dealId);
-      if (!deal) continue;
-      const restoredLink = em.create(CustomerDealPersonLink, {
-        id: link.id,
-        deal,
-        person: entity,
-        participantRole: link.participantRole,
-        createdAt: link.createdAt
-      });
-      em.persist(restoredLink);
-    }
-    await em.flush();
-    await em.nativeDelete(CustomerActivity, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    for (const activity of beforeActivities) {
-      const restoredActivity = em.create(CustomerActivity, {
-        id: activity.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
-        entity,
-        activityType: activity.activityType,
-        subject: activity.subject,
-        body: activity.body,
-        occurredAt: activity.occurredAt,
-        authorUserId: activity.authorUserId,
-        appearanceIcon: activity.appearanceIcon,
-        appearanceColor: activity.appearanceColor,
-        deal: activity.dealId ? dealMap.get(activity.dealId) ?? null : null,
-        createdAt: activity.createdAt,
-        updatedAt: activity.updatedAt
-      });
-      em.persist(restoredActivity);
-    }
-    await em.flush();
-    await em.nativeDelete(CustomerComment, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    for (const comment of before.comments) {
-      const restoredComment = em.create(CustomerComment, {
-        id: comment.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
-        entity,
-        body: comment.body,
-        authorUserId: comment.authorUserId,
-        appearanceIcon: comment.appearanceIcon,
-        appearanceColor: comment.appearanceColor,
-        deal: comment.dealId ? dealMap.get(comment.dealId) ?? null : null,
-        createdAt: comment.createdAt,
-        updatedAt: comment.updatedAt,
-        deletedAt: comment.deletedAt
-      });
-      em.persist(restoredComment);
-    }
-    await em.flush();
-    await em.nativeDelete(CustomerAddress, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    for (const address of before.addresses) {
-      const restoredAddress = em.create(CustomerAddress, {
-        id: address.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
-        entity,
-        name: address.name,
-        purpose: address.purpose,
-        addressLine1: address.addressLine1,
-        addressLine2: address.addressLine2,
-        city: address.city,
-        region: address.region,
-        postalCode: address.postalCode,
-        country: address.country,
-        latitude: address.latitude,
-        longitude: address.longitude,
-        isPrimary: address.isPrimary
-      });
-      em.persist(restoredAddress);
-    }
-    await em.flush();
-    await em.nativeDelete(CustomerTodoLink, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    for (const todo of beforeTodos) {
-      const restoredTodo = em.create(CustomerTodoLink, {
-        id: todo.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
-        entity,
-        todoId: todo.todoId,
-        todoSource: todo.todoSource,
-        createdAt: todo.createdAt,
-        createdByUserId: todo.createdByUserId
-      });
-      em.persist(restoredTodo);
-    }
-    await em.flush();
     const de = ctx.container.resolve("dataEngine");
-    await em.nativeDelete(CustomerInteraction, { entity, organizationId: entity.organizationId, tenantId: entity.tenantId });
-    for (const interaction of beforeInteractions) {
-      const restoredInteraction = em.create(CustomerInteraction, {
-        id: interaction.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
-        entity,
-        interactionType: interaction.interactionType,
-        title: interaction.title,
-        body: interaction.body,
-        status: interaction.status,
-        scheduledAt: interaction.scheduledAt,
-        occurredAt: interaction.occurredAt,
-        priority: interaction.priority,
-        authorUserId: interaction.authorUserId,
-        ownerUserId: interaction.ownerUserId,
-        dealId: interaction.dealId,
-        source: interaction.source,
-        appearanceIcon: interaction.appearanceIcon,
-        appearanceColor: interaction.appearanceColor,
-        createdAt: interaction.createdAt,
-        updatedAt: interaction.updatedAt,
-        deletedAt: interaction.deletedAt
-      });
-      em.persist(restoredInteraction);
+    const decryptionScope = {
+      tenantId: before.entity.tenantId ?? null,
+      organizationId: before.entity.organizationId ?? null
+    };
+    await em.begin();
+    let txResult;
+    try {
+      txResult = await (async () => {
+        let entity2 = await findOneWithDecryption(
+          em,
+          CustomerEntity,
+          {
+            id: before.entity.id,
+            tenantId: before.entity.tenantId,
+            organizationId: before.entity.organizationId
+          },
+          {},
+          decryptionScope
+        );
+        if (!entity2) {
+          entity2 = em.create(CustomerEntity, {
+            id: before.entity.id,
+            organizationId: before.entity.organizationId,
+            tenantId: before.entity.tenantId,
+            kind: "person",
+            displayName: before.entity.displayName,
+            description: before.entity.description,
+            ownerUserId: before.entity.ownerUserId,
+            primaryEmail: before.entity.primaryEmail,
+            primaryPhone: before.entity.primaryPhone,
+            status: before.entity.status,
+            lifecycleStage: before.entity.lifecycleStage,
+            source: before.entity.source,
+            nextInteractionAt: before.entity.nextInteractionAt,
+            nextInteractionName: before.entity.nextInteractionName,
+            nextInteractionRefId: before.entity.nextInteractionRefId,
+            nextInteractionIcon: before.entity.nextInteractionIcon,
+            nextInteractionColor: before.entity.nextInteractionColor,
+            isActive: before.entity.isActive
+          });
+          em.persist(entity2);
+        }
+        entity2.displayName = before.entity.displayName;
+        entity2.description = before.entity.description;
+        entity2.ownerUserId = before.entity.ownerUserId;
+        entity2.primaryEmail = before.entity.primaryEmail;
+        entity2.primaryPhone = before.entity.primaryPhone;
+        entity2.status = before.entity.status;
+        entity2.lifecycleStage = before.entity.lifecycleStage;
+        entity2.source = before.entity.source;
+        entity2.nextInteractionAt = before.entity.nextInteractionAt;
+        entity2.nextInteractionName = before.entity.nextInteractionName;
+        entity2.nextInteractionRefId = before.entity.nextInteractionRefId;
+        entity2.nextInteractionIcon = before.entity.nextInteractionIcon;
+        entity2.nextInteractionColor = before.entity.nextInteractionColor;
+        entity2.isActive = before.entity.isActive;
+        entity2.deletedAt = null;
+        let profile2 = await findOneWithDecryption(
+          em,
+          CustomerPersonProfile,
+          {
+            entity: entity2,
+            tenantId: before.entity.tenantId,
+            organizationId: before.entity.organizationId
+          },
+          {},
+          decryptionScope
+        );
+        if (!profile2) {
+          profile2 = em.create(CustomerPersonProfile, {
+            id: before.profile.id,
+            organizationId: before.entity.organizationId,
+            tenantId: before.entity.tenantId,
+            entity: entity2,
+            firstName: before.profile.firstName,
+            lastName: before.profile.lastName,
+            preferredName: before.profile.preferredName,
+            jobTitle: before.profile.jobTitle,
+            department: before.profile.department,
+            seniority: before.profile.seniority,
+            timezone: before.profile.timezone,
+            linkedInUrl: before.profile.linkedInUrl,
+            twitterUrl: before.profile.twitterUrl
+          });
+        } else {
+          profile2.firstName = before.profile.firstName;
+          profile2.lastName = before.profile.lastName;
+          profile2.preferredName = before.profile.preferredName;
+          profile2.jobTitle = before.profile.jobTitle;
+          profile2.department = before.profile.department;
+          profile2.seniority = before.profile.seniority;
+          profile2.timezone = before.profile.timezone;
+          profile2.linkedInUrl = before.profile.linkedInUrl;
+          profile2.twitterUrl = before.profile.twitterUrl;
+        }
+        await syncLegacyPrimaryCompanyLink(em, entity2, profile2, before.profile.companyEntityId);
+        await em.flush();
+        await em.nativeDelete(CustomerPersonCompanyLink, { person: entity2 });
+        for (const companyLink of before.companies ?? []) {
+          const company = await resolveCompanyReference(
+            em,
+            companyLink.companyId,
+            before.entity.organizationId,
+            before.entity.tenantId
+          );
+          if (!company) continue;
+          const restoredLink = em.create(CustomerPersonCompanyLink, {
+            id: companyLink.linkId ?? void 0,
+            organizationId: before.entity.organizationId,
+            tenantId: before.entity.tenantId,
+            person: entity2,
+            company,
+            isPrimary: companyLink.isPrimary
+          });
+          em.persist(restoredLink);
+          if (companyLink.isPrimary) {
+            profile2.company = company;
+          }
+        }
+        await withAtomicFlush(em, [
+          () => syncEntityTags(em, entity2, before.tagIds)
+        ]);
+        const beforeActivities = before.activities ?? [];
+        const beforeTodos = before.todos ?? [];
+        const beforeInteractions = before.interactions ?? [];
+        const relatedDealIds = /* @__PURE__ */ new Set();
+        for (const link of before.deals) relatedDealIds.add(link.dealId);
+        for (const activity of beforeActivities) {
+          if (activity.dealId) relatedDealIds.add(activity.dealId);
+        }
+        for (const comment of before.comments) {
+          if (comment.dealId) relatedDealIds.add(comment.dealId);
+        }
+        let dealMap = /* @__PURE__ */ new Map();
+        if (relatedDealIds.size) {
+          const deals = await em.find(CustomerDeal, {
+            id: { $in: Array.from(relatedDealIds) },
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId
+          });
+          dealMap = new Map(deals.map((deal) => [deal.id, deal]));
+        }
+        await em.nativeDelete(CustomerDealPersonLink, { person: entity2 });
+        for (const link of before.deals) {
+          const deal = dealMap.get(link.dealId);
+          if (!deal) continue;
+          const restoredLink = em.create(CustomerDealPersonLink, {
+            id: link.id,
+            deal,
+            person: entity2,
+            participantRole: link.participantRole,
+            createdAt: link.createdAt
+          });
+          em.persist(restoredLink);
+        }
+        await em.flush();
+        await em.nativeDelete(CustomerActivity, { entity: entity2, organizationId: entity2.organizationId, tenantId: entity2.tenantId });
+        for (const activity of beforeActivities) {
+          const restoredActivity = em.create(CustomerActivity, {
+            id: activity.id,
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId,
+            entity: entity2,
+            activityType: activity.activityType,
+            subject: activity.subject,
+            body: activity.body,
+            occurredAt: activity.occurredAt,
+            authorUserId: activity.authorUserId,
+            appearanceIcon: activity.appearanceIcon,
+            appearanceColor: activity.appearanceColor,
+            deal: activity.dealId ? dealMap.get(activity.dealId) ?? null : null,
+            createdAt: activity.createdAt,
+            updatedAt: activity.updatedAt
+          });
+          em.persist(restoredActivity);
+        }
+        await em.flush();
+        await em.nativeDelete(CustomerComment, { entity: entity2, organizationId: entity2.organizationId, tenantId: entity2.tenantId });
+        for (const comment of before.comments) {
+          const restoredComment = em.create(CustomerComment, {
+            id: comment.id,
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId,
+            entity: entity2,
+            body: comment.body,
+            authorUserId: comment.authorUserId,
+            appearanceIcon: comment.appearanceIcon,
+            appearanceColor: comment.appearanceColor,
+            deal: comment.dealId ? dealMap.get(comment.dealId) ?? null : null,
+            createdAt: comment.createdAt,
+            updatedAt: comment.updatedAt,
+            deletedAt: comment.deletedAt
+          });
+          em.persist(restoredComment);
+        }
+        await em.flush();
+        await em.nativeDelete(CustomerAddress, { entity: entity2, organizationId: entity2.organizationId, tenantId: entity2.tenantId });
+        for (const address of before.addresses) {
+          const restoredAddress = em.create(CustomerAddress, {
+            id: address.id,
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId,
+            entity: entity2,
+            name: address.name,
+            purpose: address.purpose,
+            addressLine1: address.addressLine1,
+            addressLine2: address.addressLine2,
+            city: address.city,
+            region: address.region,
+            postalCode: address.postalCode,
+            country: address.country,
+            latitude: address.latitude,
+            longitude: address.longitude,
+            isPrimary: address.isPrimary
+          });
+          em.persist(restoredAddress);
+        }
+        await em.flush();
+        await em.nativeDelete(CustomerTodoLink, { entity: entity2, organizationId: entity2.organizationId, tenantId: entity2.tenantId });
+        for (const todo of beforeTodos) {
+          const restoredTodo = em.create(CustomerTodoLink, {
+            id: todo.id,
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId,
+            entity: entity2,
+            todoId: todo.todoId,
+            todoSource: todo.todoSource,
+            createdAt: todo.createdAt,
+            createdByUserId: todo.createdByUserId
+          });
+          em.persist(restoredTodo);
+        }
+        await em.flush();
+        await em.nativeDelete(CustomerInteraction, { entity: entity2, organizationId: entity2.organizationId, tenantId: entity2.tenantId });
+        for (const interaction of beforeInteractions) {
+          const restoredInteraction = em.create(CustomerInteraction, {
+            id: interaction.id,
+            organizationId: entity2.organizationId,
+            tenantId: entity2.tenantId,
+            entity: entity2,
+            interactionType: interaction.interactionType,
+            title: interaction.title,
+            body: interaction.body,
+            status: interaction.status,
+            scheduledAt: interaction.scheduledAt,
+            occurredAt: interaction.occurredAt,
+            priority: interaction.priority,
+            authorUserId: interaction.authorUserId,
+            ownerUserId: interaction.ownerUserId,
+            dealId: interaction.dealId,
+            source: interaction.source,
+            appearanceIcon: interaction.appearanceIcon,
+            appearanceColor: interaction.appearanceColor,
+            createdAt: interaction.createdAt,
+            updatedAt: interaction.updatedAt,
+            deletedAt: interaction.deletedAt
+          });
+          em.persist(restoredInteraction);
+        }
+        await em.flush();
+        return { entity: entity2, profile: profile2, beforeInteractions, beforeTodos };
+      })();
+      await em.commit();
+    } catch (err) {
+      try {
+        await em.rollback();
+      } catch {
+      }
+      throw err;
     }
-    await em.flush();
-    for (const interaction of beforeInteractions) {
+    for (const interaction of txResult.beforeInteractions) {
       if (!interaction.custom || !Object.keys(interaction.custom).length) continue;
       await setCustomFieldsIfAny({
         dataEngine: de,
         entityId: INTERACTION_ENTITY_ID,
         recordId: interaction.id,
-        organizationId: entity.organizationId,
-        tenantId: entity.tenantId,
+        organizationId: txResult.entity.organizationId,
+        tenantId: txResult.entity.tenantId,
         values: interaction.custom,
         notify: false
       });
     }
+    const entity = txResult.entity;
+    const profile = txResult.profile;
     await emitCrudUndoSideEffects({
       dataEngine: de,
       action: "created",
@@ -1130,7 +1227,7 @@ const deletePersonCommand = {
         organizationId: entity.organizationId
       });
     }
-    for (const todo of beforeTodos ?? []) {
+    for (const todo of txResult.beforeTodos ?? []) {
       upsertEntries.push({
         entityType: E.customers.customer_todo_link,
         recordId: todo.id,
@@ -1138,7 +1235,7 @@ const deletePersonCommand = {
         organizationId: entity.organizationId
       });
     }
-    for (const interaction of beforeInteractions ?? []) {
+    for (const interaction of txResult.beforeInteractions ?? []) {
       upsertEntries.push({
         entityType: E.customers.customer_interaction,
         recordId: interaction.id,