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

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

@@ -31,6 +31,7 @@ import {
   buildCustomFieldResetMap
 } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { recomputeNextInteraction } from "../lib/interactionProjection.js";
 const INTERACTION_ENTITY_ID = "customers:customer_interaction";
 const interactionCrudIndexer = {
@@ -55,7 +56,7 @@ const interactionCrudEvents = {
   })
 };
 async function loadInteractionSnapshot(em, id) {
-  const interaction = await em.findOne(CustomerInteraction, { id }, { populate: ["entity"] });
+  const interaction = await findOneWithDecryption(em, CustomerInteraction, { id }, { populate: ["entity"] });
   if (!interaction) return null;
   const custom = await loadCustomFieldSnapshot(em, {
     entityId: INTERACTION_ENTITY_ID,
@@ -84,7 +85,17 @@ async function loadInteractionSnapshot(em, id) {
       ownerUserId: interaction.ownerUserId ?? null,
       appearanceIcon: interaction.appearanceIcon ?? null,
       appearanceColor: interaction.appearanceColor ?? null,
-      source: interaction.source ?? null
+      source: interaction.source ?? null,
+      durationMinutes: interaction.durationMinutes ?? null,
+      location: interaction.location ?? null,
+      allDay: interaction.allDay ?? null,
+      recurrenceRule: interaction.recurrenceRule ?? null,
+      recurrenceEnd: interaction.recurrenceEnd ?? null,
+      participants: interaction.participants ?? null,
+      reminderMinutes: interaction.reminderMinutes ?? null,
+      visibility: interaction.visibility ?? null,
+      linkedEntities: interaction.linkedEntities ?? null,
+      guestPermissions: interaction.guestPermissions ?? null
     },
     custom
   };
@@ -105,11 +116,15 @@ async function emitLifecycleEvent(ctx, eventId, payload) {
   let bus = null;
   try {
     bus = ctx.container.resolve("eventBus");
-  } catch {
+  } catch (err) {
+    console.warn("[customers.commands.interactions] eventBus resolve failed; skipping emit", eventId, err);
     bus = null;
   }
   if (!bus) return;
-  await bus.emitEvent(eventId, payload, { persistent: true }).catch(() => void 0);
+  await bus.emitEvent(eventId, payload, { persistent: true }).catch((err) => {
+    console.warn("[customers.commands.interactions] emit failed", eventId, err);
+    return void 0;
+  });
 }
 async function emitInteractionRevertedEvent(ctx, interaction) {
   await emitLifecycleEvent(ctx, "customers.interaction.reverted", {
@@ -132,11 +147,22 @@ function createTransactionalDataEngine(ctx, em) {
   return new DefaultDataEngine(em, ctx.container);
 }
 async function runInTransaction(em, operation) {
-  const transactionalEm = em;
-  if (typeof transactionalEm.transactional === "function") {
-    return transactionalEm.transactional((trx) => operation(trx));
+  const supportsBegin = typeof em.begin === "function" && typeof em.commit === "function" && typeof em.rollback === "function";
+  if (!supportsBegin) {
+    return operation(em);
+  }
+  await em.begin();
+  try {
+    const result = await operation(em);
+    await em.commit();
+    return result;
+  } catch (err) {
+    try {
+      await em.rollback();
+    } catch {
+    }
+    throw err;
   }
-  return operation(em);
 }
 async function emitNextInteractionUpdatedEvent(ctx, projection, identifiers) {
   await emitQueryIndexUpsertEvents(ctx, [{
@@ -184,6 +210,16 @@ const createInteractionCommand = {
         source: parsed.source ?? null,
         appearanceIcon: parsed.appearanceIcon ?? null,
         appearanceColor: parsed.appearanceColor ?? null,
+        durationMinutes: parsed.durationMinutes ?? null,
+        location: parsed.location ?? null,
+        allDay: parsed.allDay ?? null,
+        recurrenceRule: parsed.recurrenceRule ?? null,
+        recurrenceEnd: parsed.recurrenceEnd ?? null,
+        participants: parsed.participants ?? null,
+        reminderMinutes: parsed.reminderMinutes ?? null,
+        visibility: parsed.visibility ?? null,
+        linkedEntities: parsed.linkedEntities ?? null,
+        guestPermissions: parsed.guestPermissions ?? null,
         createdAt: /* @__PURE__ */ new Date(),
         updatedAt: /* @__PURE__ */ new Date()
       });
@@ -252,7 +288,7 @@ const createInteractionCommand = {
     if (!interactionId) return;
     const em = ctx.container.resolve("em").fork();
     const result = await runInTransaction(em, async (trx) => {
-      const record = await trx.findOne(CustomerInteraction, { id: interactionId });
+      const record = await findOneWithDecryption(trx, CustomerInteraction, { id: interactionId });
       if (!record) return null;
       const entityId = typeof record.entity === "string" ? record.entity : record.entity.id;
       trx.remove(record);
@@ -278,7 +314,7 @@ const updateInteractionCommand = {
   id: "customers.interactions.update",
   async prepare(rawInput, ctx) {
     const { parsed } = parseWithCustomFields(interactionUpdateSchema, rawInput);
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadInteractionSnapshot(em, parsed.id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -286,7 +322,7 @@ const updateInteractionCommand = {
     const { parsed, custom } = parseWithCustomFields(interactionUpdateSchema, rawInput);
     const em = ctx.container.resolve("em").fork();
     const { interaction, entityId } = await runInTransaction(em, async (trx) => {
-      const interaction2 = await trx.findOne(CustomerInteraction, { id: parsed.id, deletedAt: null });
+      const interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: parsed.id, deletedAt: null });
       if (!interaction2) throw new CrudHttpError(404, { error: "Interaction not found" });
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
@@ -307,6 +343,17 @@ const updateInteractionCommand = {
       if (parsed.ownerUserId !== void 0) interaction2.ownerUserId = parsed.ownerUserId ?? null;
       if (parsed.appearanceIcon !== void 0) interaction2.appearanceIcon = parsed.appearanceIcon ?? null;
       if (parsed.appearanceColor !== void 0) interaction2.appearanceColor = parsed.appearanceColor ?? null;
+      if (parsed.pinned !== void 0) interaction2.pinned = parsed.pinned;
+      if (parsed.durationMinutes !== void 0) interaction2.durationMinutes = parsed.durationMinutes ?? null;
+      if (parsed.location !== void 0) interaction2.location = parsed.location ?? null;
+      if (parsed.allDay !== void 0) interaction2.allDay = parsed.allDay ?? null;
+      if (parsed.recurrenceRule !== void 0) interaction2.recurrenceRule = parsed.recurrenceRule ?? null;
+      if (parsed.recurrenceEnd !== void 0) interaction2.recurrenceEnd = parsed.recurrenceEnd ?? null;
+      if (parsed.participants !== void 0) interaction2.participants = parsed.participants ?? null;
+      if (parsed.reminderMinutes !== void 0) interaction2.reminderMinutes = parsed.reminderMinutes ?? null;
+      if (parsed.visibility !== void 0) interaction2.visibility = parsed.visibility ?? null;
+      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;
       await setInteractionCustomFields(
@@ -374,7 +421,7 @@ const updateInteractionCommand = {
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
     const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
-      let interaction2 = await trx.findOne(CustomerInteraction, { id: before.interaction.id });
+      let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId);
       if (!interaction2) {
         interaction2 = trx.create(CustomerInteraction, {
@@ -395,6 +442,16 @@ const updateInteractionCommand = {
           source: before.interaction.source,
           appearanceIcon: before.interaction.appearanceIcon,
           appearanceColor: before.interaction.appearanceColor,
+          durationMinutes: before.interaction.durationMinutes,
+          location: before.interaction.location,
+          allDay: before.interaction.allDay,
+          recurrenceRule: before.interaction.recurrenceRule,
+          recurrenceEnd: before.interaction.recurrenceEnd,
+          participants: before.interaction.participants,
+          reminderMinutes: before.interaction.reminderMinutes,
+          visibility: before.interaction.visibility,
+          linkedEntities: before.interaction.linkedEntities,
+          guestPermissions: before.interaction.guestPermissions,
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         });
@@ -414,6 +471,16 @@ const updateInteractionCommand = {
         interaction2.source = before.interaction.source;
         interaction2.appearanceIcon = before.interaction.appearanceIcon;
         interaction2.appearanceColor = before.interaction.appearanceColor;
+        interaction2.durationMinutes = before.interaction.durationMinutes;
+        interaction2.location = before.interaction.location;
+        interaction2.allDay = before.interaction.allDay;
+        interaction2.recurrenceRule = before.interaction.recurrenceRule;
+        interaction2.recurrenceEnd = before.interaction.recurrenceEnd;
+        interaction2.participants = before.interaction.participants;
+        interaction2.reminderMinutes = before.interaction.reminderMinutes;
+        interaction2.visibility = before.interaction.visibility;
+        interaction2.linkedEntities = before.interaction.linkedEntities;
+        interaction2.guestPermissions = before.interaction.guestPermissions;
       }
       await trx.flush();
       const projection = await recomputeNextInteraction(trx, before.interaction.entityId);
@@ -462,7 +529,7 @@ const completeInteractionCommand = {
   id: "customers.interactions.complete",
   async prepare(rawInput, ctx) {
     const parsed = interactionCompleteSchema.parse(rawInput);
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadInteractionSnapshot(em, parsed.id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -470,7 +537,7 @@ const completeInteractionCommand = {
     const parsed = interactionCompleteSchema.parse(rawInput);
     const em = ctx.container.resolve("em").fork();
     const { interaction, entityId } = await runInTransaction(em, async (trx) => {
-      const interaction2 = await trx.findOne(CustomerInteraction, { id: parsed.id, deletedAt: null });
+      const interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: parsed.id, deletedAt: null });
       if (!interaction2) throw new CrudHttpError(404, { error: "Interaction not found" });
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
@@ -542,7 +609,7 @@ const completeInteractionCommand = {
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
     const result = await runInTransaction(em, async (trx) => {
-      const interaction = await trx.findOne(CustomerInteraction, { id: before.interaction.id });
+      const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       if (!interaction) return null;
       interaction.status = before.interaction.status;
       interaction.occurredAt = before.interaction.occurredAt;
@@ -583,7 +650,7 @@ const cancelInteractionCommand = {
   id: "customers.interactions.cancel",
   async prepare(rawInput, ctx) {
     const parsed = interactionCancelSchema.parse(rawInput);
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadInteractionSnapshot(em, parsed.id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -591,7 +658,7 @@ const cancelInteractionCommand = {
     const parsed = interactionCancelSchema.parse(rawInput);
     const em = ctx.container.resolve("em").fork();
     const { interaction, entityId } = await runInTransaction(em, async (trx) => {
-      const interaction2 = await trx.findOne(CustomerInteraction, { id: parsed.id, deletedAt: null });
+      const interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: parsed.id, deletedAt: null });
       if (!interaction2) throw new CrudHttpError(404, { error: "Interaction not found" });
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
@@ -661,7 +728,7 @@ const cancelInteractionCommand = {
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
     const result = await runInTransaction(em, async (trx) => {
-      const interaction = await trx.findOne(CustomerInteraction, { id: before.interaction.id });
+      const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       if (!interaction) return null;
       interaction.status = before.interaction.status;
       await trx.flush();
@@ -701,7 +768,7 @@ const deleteInteractionCommand = {
   id: "customers.interactions.delete",
   async prepare(input, ctx) {
     const id = requireId(input, "Interaction id required");
-    const em = ctx.container.resolve("em");
+    const em = ctx.container.resolve("em").fork();
     const snapshot = await loadInteractionSnapshot(em, id);
     return snapshot ? { before: snapshot } : {};
   },
@@ -709,7 +776,7 @@ const deleteInteractionCommand = {
     const id = requireId(input, "Interaction id required");
     const em = ctx.container.resolve("em").fork();
     const { interaction, entityId } = await runInTransaction(em, async (trx) => {
-      const interaction2 = await trx.findOne(CustomerInteraction, { id, deletedAt: null });
+      const interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id, deletedAt: null });
       if (!interaction2) throw new CrudHttpError(404, { error: "Interaction not found" });
       ensureTenantScope(ctx, interaction2.tenantId);
       ensureOrganizationScope(ctx, interaction2.organizationId);
@@ -768,7 +835,7 @@ const deleteInteractionCommand = {
     const em = ctx.container.resolve("em").fork();
     const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId);
-      let interaction2 = await trx.findOne(CustomerInteraction, { id: before.interaction.id });
+      let interaction2 = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id });
       if (!interaction2) {
         interaction2 = trx.create(CustomerInteraction, {
           id: before.interaction.id,
@@ -788,6 +855,16 @@ const deleteInteractionCommand = {
           source: before.interaction.source,
           appearanceIcon: before.interaction.appearanceIcon,
           appearanceColor: before.interaction.appearanceColor,
+          durationMinutes: before.interaction.durationMinutes,
+          location: before.interaction.location,
+          allDay: before.interaction.allDay,
+          recurrenceRule: before.interaction.recurrenceRule,
+          recurrenceEnd: before.interaction.recurrenceEnd,
+          participants: before.interaction.participants,
+          reminderMinutes: before.interaction.reminderMinutes,
+          visibility: before.interaction.visibility,
+          linkedEntities: before.interaction.linkedEntities,
+          guestPermissions: before.interaction.guestPermissions,
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         });
@@ -808,6 +885,16 @@ const deleteInteractionCommand = {
         interaction2.source = before.interaction.source;
         interaction2.appearanceIcon = before.interaction.appearanceIcon;
         interaction2.appearanceColor = before.interaction.appearanceColor;
+        interaction2.durationMinutes = before.interaction.durationMinutes;
+        interaction2.location = before.interaction.location;
+        interaction2.allDay = before.interaction.allDay;
+        interaction2.recurrenceRule = before.interaction.recurrenceRule;
+        interaction2.recurrenceEnd = before.interaction.recurrenceEnd;
+        interaction2.participants = before.interaction.participants;
+        interaction2.reminderMinutes = before.interaction.reminderMinutes;
+        interaction2.visibility = before.interaction.visibility;
+        interaction2.linkedEntities = before.interaction.linkedEntities;
+        interaction2.guestPermissions = before.interaction.guestPermissions;
       }
       await trx.flush();
       const projection = await recomputeNextInteraction(trx, before.interaction.entityId);