@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.9.0

package/dist/modules/customers/commands/emailConversationShares.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/customers/commands/emailConversationShares.ts"],
+  "sourcesContent": ["import { registerCommand } from '@open-mercato/shared/lib/commands'\nimport type { CommandHandler } from '@open-mercato/shared/lib/commands'\nimport { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { assertOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nimport { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'\nimport type { EntityManager, FilterQuery } from '@mikro-orm/postgresql'\nimport { CustomerEmailConversationShare, CustomerEntity } from '../data/entities'\nimport {\n  emailConversationShareSetCommandSchema,\n  type EmailConversationShareSetCommandInput,\n} from '../data/validators'\nimport { ensureOrganizationScope, ensureTenantScope } from './shared'\nimport { emitCustomersEvent } from '../events'\nimport { canShareConversation } from '../lib/conversationShares'\n\nconst RESOURCE_KIND = 'customers.email_conversation_share'\n\nconst POSTGRES_UNIQUE_VIOLATION = '23505'\n\ntype ShareSnapshot = {\n  id: string\n  personEntityId: string\n  ownerUserId: string\n  sharedByUserId: string\n  tenantId: string\n  organizationId: string\n  createdAt: string\n}\n\ntype ShareUndoPayload = {\n  before?: ShareSnapshot | null\n  after?: ShareSnapshot | null\n}\n\nfunction resolveActorUserId(\n  ctx: { auth: { sub?: string | null; userId?: string | null; isApiKey?: boolean } | null },\n): string | null {\n  const auth = ctx.auth\n  if (!auth) return null\n  // An API-key principal is not a person and therefore owns no mailbox \u2014 it can\n  // never be the owner of a conversation share.\n  if (auth.isApiKey) return null\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  return null\n}\n\nfunction toSnapshot(row: CustomerEmailConversationShare, personEntityId: string): ShareSnapshot {\n  return {\n    id: row.id,\n    personEntityId,\n    ownerUserId: row.ownerUserId,\n    sharedByUserId: row.sharedByUserId,\n    tenantId: row.tenantId,\n    organizationId: row.organizationId,\n    createdAt: row.createdAt.toISOString(),\n  }\n}\n\nasync function loadOwnShare(\n  em: EntityManager,\n  parsed: EmailConversationShareSetCommandInput,\n  ownerUserId: string,\n): Promise<CustomerEmailConversationShare | null> {\n  return (await em.findOne(CustomerEmailConversationShare, {\n    tenantId: parsed.tenantId,\n    organizationId: parsed.organizationId,\n    personEntity: parsed.personEntityId,\n    ownerUserId,\n    deletedAt: null,\n  } as FilterQuery<CustomerEmailConversationShare>)) as CustomerEmailConversationShare | null\n}\n\n/**\n * Share or un-share the ACTOR'S OWN email conversation with one Person.\n *\n * Owner-only by construction: `ownerUserId` is always the authenticated actor, so\n * no caller \u2014 admin or otherwise \u2014 can share a mailbox they do not own. That is\n * why holding `customers.email.share_conversation` via the `customers.*` wildcard\n * admins already have is not an escalation.\n *\n * The write only ever touches `customer_email_conversation_shares`. It never\n * rewrites `customer_interactions.visibility`, which is what keeps un-sharing\n * lossless and the query index consistent.\n */\nconst setEmailConversationShareCommand: CommandHandler<\n  EmailConversationShareSetCommandInput,\n  { shareId: string | null; changed: boolean }\n> = {\n  id: 'customers.email_conversation_shares.set',\n\n  async prepare(rawInput, ctx) {\n    const parsed = emailConversationShareSetCommandSchema.parse(rawInput)\n    const em = ctx.container.resolve('em') as EntityManager\n    const ownerUserId = resolveActorUserId(ctx)\n    if (!ownerUserId) return {}\n    const existing = await loadOwnShare(em, parsed, ownerUserId)\n    if (!existing) return {}\n    return { before: toSnapshot(existing, parsed.personEntityId) }\n  },\n\n  async execute(rawInput, ctx) {\n    const parsed = emailConversationShareSetCommandSchema.parse(rawInput)\n    ensureTenantScope(ctx, parsed.tenantId)\n    ensureOrganizationScope(ctx, parsed.organizationId)\n\n    const ownerUserId = resolveActorUserId(ctx)\n    if (!ownerUserId) {\n      throw new CrudHttpError(401, { error: 'Unauthorized' })\n    }\n\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    const scope = { tenantId: parsed.tenantId, organizationId: parsed.organizationId }\n\n    // The Person must exist in this tenant/org. Loading it here (rather than\n    // trusting the id) is what stops a forged id attaching a share to another\n    // tenant's record.\n    const person = await findOneWithDecryption(\n      em,\n      CustomerEntity,\n      {\n        id: parsed.personEntityId,\n        kind: 'person',\n        tenantId: parsed.tenantId,\n        organizationId: parsed.organizationId,\n        deletedAt: null,\n      } as never,\n      undefined,\n      scope,\n    )\n    if (!person) {\n      throw notFound('Person not found')\n    }\n\n    const existing = await loadOwnShare(em, parsed, ownerUserId)\n\n    // Optimistic locking (default ON per root AGENTS.md). Only meaningful when a\n    // row already exists; a first share has no prior version to conflict with.\n    if (existing) {\n      assertOptimisticLock({\n        resourceKind: RESOURCE_KIND,\n        resourceId: existing.id,\n        expected: parsed.expectedUpdatedAt ?? null,\n        current: existing.updatedAt ?? null,\n      })\n    }\n\n    if (parsed.shared) {\n      if (existing) {\n        return { shareId: existing.id, changed: false }\n      }\n      // Nothing to hand over means the share would grant access to no rows.\n      // Reject rather than persist a grant that does nothing.\n      const hasConversation = await canShareConversation(\n        em,\n        scope,\n        ownerUserId,\n        parsed.personEntityId,\n      )\n      if (!hasConversation) {\n        throw new CrudHttpError(400, {\n          error: '[internal] no private email conversation to share for this person',\n        })\n      }\n\n      const created = em.create(CustomerEmailConversationShare, {\n        tenantId: parsed.tenantId,\n        organizationId: parsed.organizationId,\n        personEntity: person as CustomerEntity,\n        ownerUserId,\n        sharedByUserId: ownerUserId,\n      } as never) as CustomerEmailConversationShare\n\n      try {\n        await withAtomicFlush(em, [() => { em.persist(created) }], {\n          transaction: true,\n          label: 'customers.email_conversation_shares.set',\n        })\n      } catch (err) {\n        // `loadOwnShare` -> `em.create` is a read-then-write with no lock, and\n        // `customer_email_conv_shares_uq` is UNIQUE (tenant, person, owner) WHERE\n        // deleted_at IS NULL. Two concurrent PUT {shared:true} both read \"no row\"\n        // and both insert; the loser hits the constraint. The end state the caller\n        // asked for is already true, and the route's openApi documents this\n        // operation as idempotent \u2014 so converge instead of surfacing a 500.\n        if ((err as { code?: string } | null)?.code !== POSTGRES_UNIQUE_VIOLATION) throw err\n        const winner = await loadOwnShare(em.fork(), parsed, ownerUserId)\n        return { shareId: winner?.id ?? null, changed: false }\n      }\n\n      await emitShareEvent(parsed, ownerUserId, true)\n      return { shareId: created.id, changed: true }\n    }\n\n    if (!existing) {\n      return { shareId: null, changed: false }\n    }\n\n    const removedId = existing.id\n    await withAtomicFlush(\n      em,\n      [\n        () => {\n          existing.deletedAt = new Date()\n        },\n      ],\n      { transaction: true, label: 'customers.email_conversation_shares.set' },\n    )\n\n    await emitShareEvent(parsed, ownerUserId, false)\n    return { shareId: removedId, changed: true }\n  },\n\n  buildLog: async ({ result, snapshots }) => {\n    if (!result.changed) return { skipLog: true }\n    const { translate } = await resolveTranslations()\n    const before = (snapshots as ShareUndoPayload).before\n    return {\n      resourceKind: RESOURCE_KIND,\n      resourceId: result.shareId ?? undefined,\n      summary: before\n        ? translate(\n            'customers.email.conversationShare.log.revoked',\n            'Stopped sharing an email conversation with the team',\n          )\n        : translate(\n            'customers.email.conversationShare.log.granted',\n            'Shared an email conversation with the team',\n          ),\n    }\n  },\n}\n\n/**\n * Audit trail for the share act itself. Emitted best-effort: the grant is already\n * committed, so a failed emission must not surface as a failed request.\n */\nasync function emitShareEvent(\n  parsed: EmailConversationShareSetCommandInput,\n  ownerUserId: string,\n  shared: boolean,\n): Promise<void> {\n  try {\n    await emitCustomersEvent('customers.email.conversation_visibility_changed', {\n      personEntityId: parsed.personEntityId,\n      ownerUserId,\n      actorUserId: ownerUserId,\n      shared,\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n    })\n  } catch {\n    /* swallow \u2014 audit emission must not block a committed write */\n  }\n}\n\nregisterCommand(setEmailConversationShareCommand)\n\nexport { setEmailConversationShareCommand }\n"],
+  "mappings": "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",
+  "names": []
+}

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

@@ -15,4 +15,5 @@ import "./entity-roles.js";
 import "./labels.js";
 import "./personCompanyLinks.js";
 import "./dictionaryKindSettings.js";
+import "./emailConversationShares.js";
 //# sourceMappingURL=index.js.map

package/dist/modules/customers/commands/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/customers/commands/index.ts"],
-  "sourcesContent": ["import './people'\nimport './companies'\nimport './deals'\nimport './activities'\nimport './comments'\nimport './addresses'\nimport './tags'\nimport './todos'\nimport './settings'\nimport './dictionaries'\nimport './pipelines'\nimport './pipeline-stages'\nimport './interactions'\nimport './entity-roles'\nimport './labels'\nimport './personCompanyLinks'\nimport './dictionaryKindSettings'\n"],
-  "mappings": "AAAA,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;",
+  "sourcesContent": ["import './people'\nimport './companies'\nimport './deals'\nimport './activities'\nimport './comments'\nimport './addresses'\nimport './tags'\nimport './todos'\nimport './settings'\nimport './dictionaries'\nimport './pipelines'\nimport './pipeline-stages'\nimport './interactions'\nimport './entity-roles'\nimport './labels'\nimport './personCompanyLinks'\nimport './dictionaryKindSettings'\nimport './emailConversationShares'\n"],
+  "mappings": "AAAA,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;",
   "names": []
 }

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

@@ -65,6 +65,9 @@ const interactionCrudEvents = {
     ...ctx.syncOrigin ? { syncOrigin: ctx.syncOrigin } : {}
   })
 };
+const INTERACTION_UNDO_DATE_OPTIONS = {
+  datePaths: ["before.interaction.scheduledAt", "before.interaction.occurredAt", "before.interaction.recurrenceEnd"]
+};
 async function loadInteractionSnapshot(em, id) {
   const interaction = await findOneWithDecryption(em, CustomerInteraction, { id }, { populate: ["entity"] });
   if (!interaction) return null;
@@ -470,7 +473,7 @@ const updateInteractionCommand = {
   async execute(rawInput, ctx) {
     const { parsed, custom } = parseWithCustomFields(interactionUpdateSchema, rawInput);
     const em = ctx.container.resolve("em").fork();
-    const { interaction, entityId, nextInteractionId } = await runInTransaction(em, async (trx) => {
+    const { interaction, projections } = await runInTransaction(em, async (trx) => {
       const interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: parsed.id, deletedAt: null });
       if (!interaction2) {
         enforceRecordGoneIsConflict({ resourceKind: "customers.interaction", resourceId: parsed.id, request: ctx.request ?? null });
@@ -499,12 +502,18 @@ const updateInteractionCommand = {
           throw notFound("Email not found");
         }
       }
+      const previousEntityId = typeof interaction2.entity === "string" ? interaction2.entity : interaction2.entity.id;
+      const nextEntity = parsed.entityId !== void 0 && parsed.entityId !== previousEntityId ? await requireTimelineParentEntity(trx, parsed.entityId, {
+        tenantId: interaction2.tenantId,
+        organizationId: interaction2.organizationId
+      }) : null;
       if (parsed.dealId !== void 0) {
         if (parsed.dealId) {
           await requireDealInScope(trx, parsed.dealId, interaction2.tenantId, interaction2.organizationId);
         }
         interaction2.dealId = parsed.dealId ?? null;
       }
+      if (nextEntity) interaction2.entity = nextEntity;
       if (parsed.interactionType !== void 0) interaction2.interactionType = parsed.interactionType;
       if (parsed.title !== void 0) interaction2.title = parsed.title ?? null;
       if (parsed.body !== void 0) interaction2.body = parsed.body ?? null;
@@ -528,7 +537,7 @@ const updateInteractionCommand = {
       if (parsed.linkedEntities !== void 0) interaction2.linkedEntities = parsed.linkedEntities ?? null;
       if (parsed.guestPermissions !== void 0) interaction2.guestPermissions = parsed.guestPermissions ?? null;
       await trx.flush();
-      const entityId2 = typeof interaction2.entity === "string" ? interaction2.entity : interaction2.entity.id;
+      const entityId = typeof interaction2.entity === "string" ? interaction2.entity : interaction2.entity.id;
       await setInteractionCustomFields(
         createTransactionalDataEngine(ctx, trx),
         interaction2.id,
@@ -536,8 +545,15 @@ const updateInteractionCommand = {
         interaction2.tenantId,
         custom
       );
-      const projection = await recomputeNextInteraction(trx, entityId2);
-      return { interaction: interaction2, entityId: entityId2, nextInteractionId: projection.nextInteractionId };
+      const projection = await recomputeNextInteraction(trx, entityId);
+      const projections2 = [
+        { entityId, nextInteractionId: projection.nextInteractionId }
+      ];
+      if (previousEntityId !== entityId) {
+        const previousProjection = await recomputeNextInteraction(trx, previousEntityId);
+        projections2.push({ entityId: previousEntityId, nextInteractionId: previousProjection.nextInteractionId });
+      }
+      return { interaction: interaction2, projections: projections2 };
     });
     const de = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -553,11 +569,13 @@ const updateInteractionCommand = {
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents
     });
-    await emitNextInteractionUpdatedEvent(ctx, { entityId, nextInteractionId }, {
-      id: interaction.id,
-      organizationId: interaction.organizationId,
-      tenantId: interaction.tenantId
-    });
+    for (const projection of projections) {
+      await emitNextInteractionUpdatedEvent(ctx, projection, {
+        id: interaction.id,
+        organizationId: interaction.organizationId,
+        tenantId: interaction.tenantId
+      });
+    }
     return { interactionId: interaction.id };
   },
   captureAfter: async (_input, result, ctx) => {
@@ -588,11 +606,11 @@ const updateInteractionCommand = {
     };
   },
   undo: async ({ logEntry, ctx }) => {
-    const payload = extractUndoPayload(logEntry);
+    const payload = extractUndoPayload(logEntry, INTERACTION_UNDO_DATE_OPTIONS);
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
-    const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
+    const { interaction, projections } = await runInTransaction(em, async (trx) => {
       let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId, { tenantId: before.interaction.tenantId, organizationId: before.interaction.organizationId });
       if (!interaction2) {
@@ -656,6 +674,14 @@ const updateInteractionCommand = {
       }
       await trx.flush();
       const projection = await recomputeNextInteraction(trx, before.interaction.entityId);
+      const projections2 = [
+        { entityId: before.interaction.entityId, nextInteractionId: projection.nextInteractionId }
+      ];
+      const reattachedEntityId = payload?.after?.interaction.entityId;
+      if (reattachedEntityId && reattachedEntityId !== before.interaction.entityId) {
+        const reattachedProjection = await recomputeNextInteraction(trx, reattachedEntityId);
+        projections2.push({ entityId: reattachedEntityId, nextInteractionId: reattachedProjection.nextInteractionId });
+      }
       const resetValues = buildCustomFieldResetMap(before.custom, payload?.after?.custom);
       if (Object.keys(resetValues).length) {
         await setCustomFieldsIfAny({
@@ -670,7 +696,7 @@ const updateInteractionCommand = {
       }
       return {
         interaction: interaction2,
-        nextInteractionId: projection.nextInteractionId
+        projections: projections2
       };
     });
     const de = ctx.container.resolve("dataEngine");
@@ -687,14 +713,13 @@ const updateInteractionCommand = {
       indexer: interactionCrudIndexer,
       events: interactionCrudEvents
     });
-    await emitNextInteractionUpdatedEvent(ctx, {
-      entityId: before.interaction.entityId,
-      nextInteractionId
-    }, {
-      id: interaction.id,
-      organizationId: interaction.organizationId,
-      tenantId: interaction.tenantId
-    });
+    for (const projection of projections) {
+      await emitNextInteractionUpdatedEvent(ctx, projection, {
+        id: interaction.id,
+        organizationId: interaction.organizationId,
+        tenantId: interaction.tenantId
+      });
+    }
   }
 };
 const completeInteractionCommand = {
@@ -784,7 +809,7 @@ const completeInteractionCommand = {
     };
   },
   undo: async ({ logEntry, ctx }) => {
-    const payload = extractUndoPayload(logEntry);
+    const payload = extractUndoPayload(logEntry, INTERACTION_UNDO_DATE_OPTIONS);
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
@@ -911,7 +936,7 @@ const cancelInteractionCommand = {
     };
   },
   undo: async ({ logEntry, ctx }) => {
-    const payload = extractUndoPayload(logEntry);
+    const payload = extractUndoPayload(logEntry, INTERACTION_UNDO_DATE_OPTIONS);
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
@@ -1025,7 +1050,7 @@ const deleteInteractionCommand = {
     };
   },
   undo: async ({ logEntry, ctx }) => {
-    const payload = extractUndoPayload(logEntry);
+    const payload = extractUndoPayload(logEntry, INTERACTION_UNDO_DATE_OPTIONS);
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();