@open-mercato/shared 0.6.4-develop.4210.1.d412061cfe → 0.6.4-develop.4236.1.9fa6806b34

package/dist/lib/crud/factory.js

@@ -20,6 +20,10 @@ import {
   applyCustomFieldsNormalization,
   loadCustomFieldDefinitionIndex
 } from "./custom-fields.js";
+import {
+  canReuseCustomFieldDefinitions,
+  resolveCfDefIndexOrgCandidates
+} from "./custom-field-definition-index.js";
 import { serializeExport, normalizeExportFormat, defaultExportFilename, ensureColumns } from "./exporters.js";
 import { isCrudHttpError } from "./errors.js";
 import {
@@ -612,7 +616,7 @@ function makeCrudRoute(opts) {
     }
     return null;
   };
-  const decorateItemsWithCustomFields = async (items, ctx) => {
+  const decorateItemsWithCustomFields = async (items, ctx, precomputedDefinitions) => {
     if (!listCustomFieldDecorator || !Array.isArray(items) || items.length === 0) return items;
     const entityIds = Array.isArray(listCustomFieldDecorator.entityIds) ? listCustomFieldDecorator.entityIds : [listCustomFieldDecorator.entityIds];
     if (!entityIds.length) return items;
@@ -627,29 +631,41 @@ function makeCrudRoute(opts) {
     try {
       const em = ctx.container.resolve("em");
       const organizationIds = Array.isArray(ctx.organizationIds) && ctx.organizationIds.length ? ctx.organizationIds : [ctx.selectedOrganizationId ?? null];
-      let cfDefCache = null;
-      try {
-        cfDefCache = ctx.container.resolve("cache");
-      } catch {
-      }
-      const definitionIndex = await loadCustomFieldDefinitionIndex({
-        em,
-        entityIds,
-        tenantId: ctx.auth?.tenantId ?? null,
-        organizationIds,
-        cache: cfDefCache ?? null,
-        requestScope: ctx
+      const tenantId = ctx.auth?.tenantId ?? null;
+      const reusable = canReuseCustomFieldDefinitions(precomputedDefinitions, {
+        entityIds: entityIds.map(String),
+        tenantId,
+        organizationIds: resolveCfDefIndexOrgCandidates(ctx.organizationIds, ctx.selectedOrganizationId ?? null)
       });
-      cfProfiler.mark("definitions_loaded", { definitionCount: definitionIndex.size });
+      let definitionIndex;
+      if (reusable && precomputedDefinitions) {
+        definitionIndex = precomputedDefinitions.index;
+        cfProfiler.mark("definitions_reused", { definitionCount: definitionIndex.size });
+      } else {
+        let cfDefCache = null;
+        try {
+          cfDefCache = ctx.container.resolve("cache");
+        } catch {
+        }
+        definitionIndex = await loadCustomFieldDefinitionIndex({
+          em,
+          entityIds,
+          tenantId,
+          organizationIds,
+          cache: cfDefCache ?? null,
+          requestScope: ctx
+        });
+        cfProfiler.mark("definitions_loaded", { definitionCount: definitionIndex.size });
+      }
       const decoratedItems = items.map((raw) => {
         if (!raw || typeof raw !== "object") return raw;
         const item = raw;
         const context = listCustomFieldDecorator.resolveContext ? listCustomFieldDecorator.resolveContext(raw, ctx) ?? {} : {};
         const organizationId = context.organizationId ?? inferFieldValue(item, ["organization_id", "organizationId"]);
-        const tenantId = context.tenantId ?? inferFieldValue(item, ["tenant_id", "tenantId"]) ?? ctx.auth?.tenantId ?? null;
+        const tenantId2 = context.tenantId ?? inferFieldValue(item, ["tenant_id", "tenantId"]) ?? ctx.auth?.tenantId ?? null;
         const decorated = decorateRecordWithCustomFields(item, definitionIndex, {
           organizationId: organizationId ?? null,
-          tenantId: tenantId ?? null
+          tenantId: tenantId2 ?? null
         });
         return applyCustomFieldsNormalization(item, decorated, {
           stripPrefixedKeys: listCustomFieldDecorator.stripPrefixedKeys === true
@@ -1137,7 +1153,7 @@ function makeCrudRoute(opts) {
         const rawItems = res.items || [];
         let transformedItems = rawItems.map((i) => opts.list.transformItem ? opts.list.transformItem(i) : i);
         profiler.mark("transform_complete", { itemCount: transformedItems.length });
-        transformedItems = await decorateItemsWithCustomFields(transformedItems, ctx);
+        transformedItems = await decorateItemsWithCustomFields(transformedItems, ctx, res.customFieldDefinitions);
         profiler.mark("custom_fields_complete", { itemCount: transformedItems.length });
         if (opts.list?.entityId && request) {
           try {
@@ -1190,7 +1206,7 @@ function makeCrudRoute(opts) {
               const nextItemsRaw = nextRes.items || [];
               if (!nextItemsRaw.length) break;
               let nextTransformed = nextItemsRaw.map((i) => opts.list.transformItem ? opts.list.transformItem(i) : i);
-              nextTransformed = await decorateItemsWithCustomFields(nextTransformed, ctx);
+              nextTransformed = await decorateItemsWithCustomFields(nextTransformed, ctx, nextRes.customFieldDefinitions);
               const nextExportItems = exportFullRequested ? nextItemsRaw.map(normalizeFullRecordForExport) : nextTransformed;
               exportItems.push(...nextExportItems);
               if (nextExportItems.length < exportPageSizeNumber) break;
@@ -1487,9 +1503,9 @@ function makeCrudRoute(opts) {
         if (createLifecycleCmd.beforeEventId && ctx.auth.tenantId) {
           const syncSubs = collectSyncSubscribers(getAllSyncSubscribers(), createLifecycleCmd.beforeEventId);
           if (syncSubs.length) {
-            const em = ctx.container.resolve("em");
+            const em2 = ctx.container.resolve("em");
             const syncPayload = buildSyncPayload(
-              { eventId: createLifecycleCmd.beforeEventId, entity: createLifecycleCmd.entity, operation: "create", timing: "before", resourceId: null, userId: ctx.auth.sub, organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null, tenantId: ctx.auth.tenantId, em, request },
+              { eventId: createLifecycleCmd.beforeEventId, entity: createLifecycleCmd.entity, operation: "create", timing: "before", resourceId: null, userId: ctx.auth.sub, organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null, tenantId: ctx.auth.tenantId, em: em2, request },
               { payload: input2 && typeof input2 === "object" ? input2 : void 0 }
             );
             const syncResult = await runSyncBeforeEvent(syncSubs, syncPayload, ctx.container);
@@ -1512,9 +1528,9 @@ function makeCrudRoute(opts) {
         if (createLifecycleCmd.afterEventId && ctx.auth.tenantId) {
           const syncAfterSubs = collectSyncSubscribers(getAllSyncSubscribers(), createLifecycleCmd.afterEventId);
           if (syncAfterSubs.length) {
-            const em = ctx.container.resolve("em");
+            const em2 = ctx.container.resolve("em");
             const syncPayload = buildSyncPayload(
-              { eventId: createLifecycleCmd.afterEventId, entity: createLifecycleCmd.entity, operation: "create", timing: "after", resourceId: result?.id ?? null, userId: ctx.auth.sub, organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null, tenantId: ctx.auth.tenantId, em, request },
+              { eventId: createLifecycleCmd.afterEventId, entity: createLifecycleCmd.entity, operation: "create", timing: "after", resourceId: result?.id ?? null, userId: ctx.auth.sub, organizationId: ctx.selectedOrganizationId ?? ctx.auth.orgId ?? null, tenantId: ctx.auth.tenantId, em: em2, request },
               { payload: input2 && typeof input2 === "object" ? input2 : void 0 }
             );
             await runSyncAfterEvent(syncAfterSubs, syncPayload, ctx.container);
@@ -1562,9 +1578,9 @@ function makeCrudRoute(opts) {
       if (createLifecycle.beforeEventId && ctx.auth.tenantId) {
         const syncSubs = collectSyncSubscribers(getAllSyncSubscribers(), createLifecycle.beforeEventId);
         if (syncSubs.length) {
-          const em = ctx.container.resolve("em");
+          const em2 = ctx.container.resolve("em");
           const syncPayload = buildSyncPayload(
-            { eventId: createLifecycle.beforeEventId, entity: createLifecycle.entity, operation: "create", timing: "before", resourceId: null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+            { eventId: createLifecycle.beforeEventId, entity: createLifecycle.entity, operation: "create", timing: "before", resourceId: null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
             { payload: input && typeof input === "object" ? input : void 0 }
           );
           const syncResult = await runSyncBeforeEvent(syncSubs, syncPayload, ctx.container);
@@ -1612,21 +1628,26 @@ function makeCrudRoute(opts) {
         if (!ctx.auth.tenantId) return json({ error: "Tenant context is required" }, { status: 400 });
         entityData[ormCfg.tenantField] = ctx.auth.tenantId;
       }
-      const entity = await de.createOrmEntity({ entity: ormCfg.entity, data: entityData });
-      if (createConfig.customFields && createConfig.customFields.enabled) {
-        const cfc = createConfig.customFields;
-        const values = cfc.map ? cfc.map(body) : cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body) : {};
-        if (values && Object.keys(values).length > 0) {
-          const de2 = ctx.container.resolve("dataEngine");
-          await de2.setCustomFields({
-            entityId: cfc.entityId,
-            recordId: String(entity[ormCfg.idField]),
-            organizationId: targetOrgId,
-            tenantId: ctx.auth.tenantId,
-            values
-          });
+      const em = ctx.container.resolve("em");
+      const writeTenantId = ctx.auth.tenantId;
+      const entity = await em.transactional(async () => {
+        const created = await de.createOrmEntity({ entity: ormCfg.entity, data: entityData });
+        if (createConfig.customFields && createConfig.customFields.enabled) {
+          const cfc = createConfig.customFields;
+          const values = cfc.map ? cfc.map(body) : cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body) : {};
+          if (values && Object.keys(values).length > 0) {
+            const de2 = ctx.container.resolve("dataEngine");
+            await de2.setCustomFields({
+              entityId: cfc.entityId,
+              recordId: String(created[ormCfg.idField]),
+              organizationId: targetOrgId,
+              tenantId: writeTenantId,
+              values
+            });
+          }
         }
-      }
+        return created;
+      });
       await opts.hooks?.afterCreate?.(entity, { ...ctx, input });
       const createdEntityId = String(entity[ormCfg.idField]);
       if (createGuardAfterCallbacks?.length && ctx.auth.tenantId) {
@@ -1644,9 +1665,9 @@ function makeCrudRoute(opts) {
       if (createLifecycle.afterEventId && ctx.auth.tenantId) {
         const syncAfterSubs = collectSyncSubscribers(getAllSyncSubscribers(), createLifecycle.afterEventId);
         if (syncAfterSubs.length) {
-          const em = ctx.container.resolve("em");
+          const em2 = ctx.container.resolve("em");
           const syncPayload = buildSyncPayload(
-            { eventId: createLifecycle.afterEventId, entity: createLifecycle.entity, operation: "create", timing: "after", resourceId: createdEntityId, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+            { eventId: createLifecycle.afterEventId, entity: createLifecycle.entity, operation: "create", timing: "after", resourceId: createdEntityId, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
             { payload: input && typeof input === "object" ? input : void 0, entityData: snapshotEntity(entity) }
           );
           await runSyncAfterEvent(syncAfterSubs, syncPayload, ctx.container);
@@ -1728,13 +1749,13 @@ function makeCrudRoute(opts) {
         if (updateLifecycleCmd.beforeEventId && ctx.auth.tenantId) {
           const syncSubs = collectSyncSubscribers(getAllSyncSubscribers(), updateLifecycleCmd.beforeEventId);
           if (syncSubs.length) {
-            const em = ctx.container.resolve("em");
+            const em2 = ctx.container.resolve("em");
             if (candidateId) {
-              const prevEntity = await em.findOne(ormCfg.entity, { [ormCfg.idField]: candidateId });
+              const prevEntity = await em2.findOne(ormCfg.entity, { [ormCfg.idField]: candidateId });
               if (prevEntity) cmdUpdatePreviousData = snapshotEntity(prevEntity);
             }
             const syncPayload = buildSyncPayload(
-              { eventId: updateLifecycleCmd.beforeEventId, entity: updateLifecycleCmd.entity, operation: "update", timing: "before", resourceId: candidateId ?? null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+              { eventId: updateLifecycleCmd.beforeEventId, entity: updateLifecycleCmd.entity, operation: "update", timing: "before", resourceId: candidateId ?? null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
               { payload: input2 && typeof input2 === "object" ? input2 : void 0, previousData: cmdUpdatePreviousData }
             );
             const syncResult = await runSyncBeforeEvent(syncSubs, syncPayload, ctx.container);
@@ -1813,9 +1834,9 @@ function makeCrudRoute(opts) {
         if (updateLifecycleCmd.afterEventId && ctx.auth.tenantId) {
           const syncAfterSubs = collectSyncSubscribers(getAllSyncSubscribers(), updateLifecycleCmd.afterEventId);
           if (syncAfterSubs.length) {
-            const em = ctx.container.resolve("em");
+            const em2 = ctx.container.resolve("em");
             const syncPayload = buildSyncPayload(
-              { eventId: updateLifecycleCmd.afterEventId, entity: updateLifecycleCmd.entity, operation: "update", timing: "after", resourceId: candidateId ?? null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+              { eventId: updateLifecycleCmd.afterEventId, entity: updateLifecycleCmd.entity, operation: "update", timing: "after", resourceId: candidateId ?? null, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
               { payload: input2 && typeof input2 === "object" ? input2 : void 0, previousData: cmdUpdatePreviousData }
             );
             await runSyncAfterEvent(syncAfterSubs, syncPayload, ctx.container);
@@ -1843,14 +1864,14 @@ function makeCrudRoute(opts) {
       if (updateLifecycle.beforeEventId && ctx.auth.tenantId) {
         const syncSubs = collectSyncSubscribers(getAllSyncSubscribers(), updateLifecycle.beforeEventId);
         if (syncSubs.length) {
-          const em = ctx.container.resolve("em");
+          const em2 = ctx.container.resolve("em");
           const updateCandidateId = input?.id ?? null;
           if (updateCandidateId) {
-            const prevEntity = await em.findOne(ormCfg.entity, { [ormCfg.idField]: updateCandidateId });
+            const prevEntity = await em2.findOne(ormCfg.entity, { [ormCfg.idField]: updateCandidateId });
             if (prevEntity) updatePreviousData = snapshotEntity(prevEntity);
           }
           const syncPayload = buildSyncPayload(
-            { eventId: updateLifecycle.beforeEventId, entity: updateLifecycle.entity, operation: "update", timing: "before", resourceId: updateCandidateId, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+            { eventId: updateLifecycle.beforeEventId, entity: updateLifecycle.entity, operation: "update", timing: "before", resourceId: updateCandidateId, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
             { payload: input && typeof input === "object" ? input : void 0, previousData: updatePreviousData }
           );
           const syncResult = await runSyncBeforeEvent(syncSubs, syncPayload, ctx.container);
@@ -1903,26 +1924,32 @@ function makeCrudRoute(opts) {
           softDeleteField: ormCfg.softDeleteField
         }
       );
-      const entity = await de.updateOrmEntity({
-        entity: ormCfg.entity,
-        where,
-        apply: (e) => updateConfig.applyToEntity(e, input, ctx)
+      const em = ctx.container.resolve("em");
+      const writeTenantId = ctx.auth.tenantId;
+      const entity = await em.transactional(async () => {
+        const updated = await de.updateOrmEntity({
+          entity: ormCfg.entity,
+          where,
+          apply: (e) => updateConfig.applyToEntity(e, input, ctx)
+        });
+        if (!updated) return null;
+        if (updateConfig.customFields && updateConfig.customFields.enabled) {
+          const cfc = updateConfig.customFields;
+          const values = cfc.map ? cfc.map(body) : cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body) : {};
+          if (values && Object.keys(values).length > 0) {
+            const de2 = ctx.container.resolve("dataEngine");
+            await de2.setCustomFields({
+              entityId: cfc.entityId,
+              recordId: String(updated[ormCfg.idField]),
+              organizationId: targetOrgId,
+              tenantId: writeTenantId,
+              values
+            });
+          }
+        }
+        return updated;
       });
       if (!entity) return json({ error: "Not found" }, { status: 404 });
-      if (updateConfig.customFields && updateConfig.customFields.enabled) {
-        const cfc = updateConfig.customFields;
-        const values = cfc.map ? cfc.map(body) : cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body) : {};
-        if (values && Object.keys(values).length > 0) {
-          const de2 = ctx.container.resolve("dataEngine");
-          await de2.setCustomFields({
-            entityId: cfc.entityId,
-            recordId: String(entity[ormCfg.idField]),
-            organizationId: targetOrgId,
-            tenantId: ctx.auth.tenantId,
-            values
-          });
-        }
-      }
       await opts.hooks?.afterUpdate?.(entity, { ...ctx, input });
       if (updateGuardAfterCallbacks.length && ctx.auth.tenantId) {
         await runGuardAfterSuccessCallbacks(updateGuardAfterCallbacks, {
@@ -1939,9 +1966,9 @@ function makeCrudRoute(opts) {
       if (updateLifecycle.afterEventId && ctx.auth.tenantId) {
         const syncAfterSubs = collectSyncSubscribers(getAllSyncSubscribers(), updateLifecycle.afterEventId);
         if (syncAfterSubs.length) {
-          const em = ctx.container.resolve("em");
+          const em2 = ctx.container.resolve("em");
           const syncPayload = buildSyncPayload(
-            { eventId: updateLifecycle.afterEventId, entity: updateLifecycle.entity, operation: "update", timing: "after", resourceId: id, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em, request },
+            { eventId: updateLifecycle.afterEventId, entity: updateLifecycle.entity, operation: "update", timing: "after", resourceId: id, userId: ctx.auth.sub, organizationId: scopeOrganizationId, tenantId: ctx.auth.tenantId, em: em2, request },
             { payload: input && typeof input === "object" ? input : void 0, previousData: updatePreviousData, entityData: snapshotEntity(entity) }
           );
           await runSyncAfterEvent(syncAfterSubs, syncPayload, ctx.container);