@erxes/api-shared 3.2.21-1 → 3.2.22-1

package/src/core-modules/automations/index.ts

@@ -11,3 +11,4 @@ export * from './zodTypes';
 export * from './sendAutomationMessage';
 export * from './segmentMembership';
 export * from './reEnrollment';
+export * from './conditionals';

package/src/core-modules/automations/zodTypes.ts

@@ -28,6 +28,7 @@ export const AutomationExecActionInput = z.object({
   nextActionId: z.string().optional(),
   result: z.any().optional(),
   skipReason: z.string().optional(),
+  conditionalMatches: z.record(z.string()).optional(),
   attempt: z.number().optional(),
   jobId: z.string().optional(),
   // Dates arrive serialized across the producer boundary, but stay Date

package/src/core-modules/common/eventHandlers/createEventHandlers.ts

@@ -15,7 +15,7 @@ import {
 } from './utils';
 import { sendAutomationTrigger } from '../../automations';
 import { sendSegmentChanged } from '../../segments/events';
-import { segmentJoinChanges } from '../../segments/joinChanges';
+import { segmentJoinChanges, SegmentTouched } from '../../segments/joinChanges';
 import { INotificationData, sendNotification } from '../../notifications';
 import { logActivityLogError } from '../../logs/activityLog/utils';
 
@@ -25,6 +25,20 @@ const toIdList = (ids?: string | string[]): string[] =>
     (id): id is string => typeof id === 'string' && id.length > 0,
   );
 
+/** The documents an action carried, before and after. */
+const touchedOf = (input: LogEventInput): SegmentTouched => ({
+  prev: [
+    ...('prevDocument' in input && input.prevDocument
+      ? [input.prevDocument]
+      : []),
+    ...('prevDocuments' in input ? input.prevDocuments || [] : []),
+  ],
+  current:
+    'currentDocument' in input && input.currentDocument
+      ? [input.currentDocument]
+      : [],
+});
+
 /**
  * Create an event dispatcher instance with methods for logging and automation triggers
  * @param params - Configuration object for the event dispatcher
@@ -93,7 +107,11 @@ export function createEventHandlers(
       });
     const docIds = toIdList(eventPayload.docIds ?? eventPayload.docId);
 
-    segmentJoinChanges(contentType, payload?.updateDescription)
+    segmentJoinChanges(
+      contentType,
+      payload?.updateDescription,
+      touchedOf(parsed),
+    )
       .then((changed) =>
         sendSegmentChanged({ subdomain, contentType, docIds, changed }),
       )

package/src/core-modules/segments/joinChanges.test.ts

@@ -93,4 +93,66 @@ describe('segmentJoinChanges', () => {
       await segmentJoinChanges('core:contacts.customers', undefined),
     ).toBeUndefined();
   });
+  it('reaches the owner of a record created without a diff', async () => {
+    const changes = await segmentJoinChanges(
+      'core:contacts.customers',
+      undefined,
+      { current: [{ _id: 'c1', ownerId: 'user_a' }] },
+    );
+
+    expect(changes).toEqual({ ownerId: { prev: undefined, next: ['user_a'] } });
+  });
+
+  it('reaches the owner when another field moved', async () => {
+    const changes = await segmentJoinChanges(
+      'core:contacts.customers',
+      { updated: { primaryEmail: { prev: 'a@x.mn', current: 'b@x.mn' } } },
+      {
+        prev: [{ _id: 'c1', ownerId: 'user_a' }],
+        current: [{ _id: 'c1', ownerId: 'user_a' }],
+      },
+    );
+
+    expect(changes).toEqual({
+      ownerId: { prev: ['user_a'], next: ['user_a'] },
+    });
+  });
+
+  it('reaches both owners when the documents say it moved', async () => {
+    const changes = await segmentJoinChanges(
+      'core:contacts.customers',
+      { updated: { ownerId: { prev: 'user_a', current: 'user_b' } } },
+      { current: [{ _id: 'c1', ownerId: 'user_b' }] },
+    );
+
+    expect(changes).toEqual({ ownerId: { prev: 'user_a', next: ['user_b'] } });
+  });
+
+  it('reaches the owner of a deleted record', async () => {
+    const changes = await segmentJoinChanges(
+      'core:contacts.customers',
+      undefined,
+      { prev: [{ _id: 'c1', ownerId: 'user_a' }] },
+    );
+
+    expect(changes).toEqual({ ownerId: { prev: ['user_a'], next: undefined } });
+  });
+
+  it('collects every owner of a batch', async () => {
+    const changes = await segmentJoinChanges(
+      'core:contacts.customers',
+      undefined,
+      {
+        current: [
+          { _id: 'c1', ownerId: 'user_a' },
+          { _id: 'c2' },
+          { _id: 'c3', ownerId: 'user_b' },
+        ],
+      },
+    );
+
+    expect(changes).toEqual({
+      ownerId: { prev: undefined, next: ['user_a', 'user_b'] },
+    });
+  });
 });

package/src/core-modules/segments/joinChanges.ts

@@ -29,11 +29,24 @@ const isBothSides = (
   typeof value === 'object' &&
   ('prev' in (value as object) || 'current' in (value as object));
 
+// The records a change touched, as they were and as they are.
+export type SegmentTouched = { prev?: unknown[]; current?: unknown[] };
+
+const valuesAt = (documents: unknown[] | undefined, path: string) => {
+  const values = (documents || []).flatMap((doc) => {
+    const value = at(doc, path);
+    return value === undefined ? [] : [value].flat();
+  });
+
+  return values.length ? values : undefined;
+};
+
 export const segmentJoinChanges = async (
   contentType: string,
   diff: SegmentDiff | undefined,
+  touched: SegmentTouched = {},
 ): Promise<SegmentJoinChanges | undefined> => {
-  if (!diff) {
+  if (!diff && !touched.prev?.length && !touched.current?.length) {
     return undefined;
   }
 
@@ -48,18 +61,20 @@ export const segmentJoinChanges = async (
   const changes: SegmentJoinChanges = {};
 
   for (const path of paths) {
-    const updated = at(diff.updated, path);
-
-    if (isBothSides(updated)) {
-      changes[path] = { prev: updated.prev, next: updated.current };
-      continue;
-    }
+    const updated = at(diff?.updated, path);
+    const both = isBothSides(updated);
 
-    const added = at(diff.added, path);
-    const removed = at(diff.removed, path);
+    // A record reaches whoever it points at, whether or not that field moved;
+    // the diff only stands in where no document was at hand.
+    const prev =
+      valuesAt(touched.prev, path) ??
+      (both ? updated.prev : at(diff?.removed, path));
+    const next =
+      valuesAt(touched.current, path) ??
+      (both ? updated.current : at(diff?.added, path));
 
-    if (added !== undefined || removed !== undefined) {
-      changes[path] = { prev: removed, next: added };
+    if (prev !== undefined || next !== undefined) {
+      changes[path] = { prev, next };
     }
   }
 

package/utils/dist/erxes-api-shared-utils.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var startPlugin = require('../../dist/start-plugin-7dc096bc.cjs.dev.js');
+var startPlugin = require('../../dist/start-plugin-6687b329.cjs.dev.js');
 var mongoose = require('mongoose');
 var stream$1 = require('stream');
 var _loadash = require('lodash');

package/utils/dist/erxes-api-shared-utils.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var startPlugin = require('../../dist/start-plugin-b095acca.cjs.prod.js');
+var startPlugin = require('../../dist/start-plugin-46baacee.cjs.prod.js');
 var mongoose = require('mongoose');
 var stream$1 = require('stream');
 var _loadash = require('lodash');

package/utils/dist/erxes-api-shared-utils.esm.js

@@ -1,5 +1,5 @@
-import { u as userHeaderName, g as getEnv, c as connect, _ as _asyncToGenerator, a as _regeneratorRuntime, b as coreModelOrganizations, d as getSubdomain, e as getSaasCoreConnection, f as createScopedEventHandlers, h as _slicedToArray, l as logHandler, r as runBeforeResolvers, s as sendWorkerQueue, i as _objectSpread2, j as chunkArray, k as _createForOfIteratorHelper, m as _createClass, n as _classCallCheck, o as isValidURL, p as sendTRPCMessage, q as _inherits, t as _wrapNativeSuper, v as _callSuper, w as _defineProperty, x as _toConsumableArray } from '../../dist/start-plugin-a2f6eca9.esm.js';
-export { K as AGENT_TOOL_DEFAULT_MAX_RESPONSE_BYTES, ak as DEFAULT_JOB_OPTIONS, c1 as EXPECTED_ERROR_NAME, c2 as ExpectedError, aU as GP_STATUS, W as HEADER_SIZE_WARN_BYTES, bc as MAX_HEADER_BYTES, aA as ORGANIZATION_ID_MAPPING, T as TBeforeResolversProducers, V as USER_HEADER_OMITTED_FIELDS, N as agentToolResponseTooLargeError, F as agentToolsAuthHeaderName, y as apolloCustomScalars, bn as applyTrustProxy, bp as authCookieOptions, I as buildAgentToolManifest, bW as buildCursorQuery, ag as buildSearchTokenFilter, D as checkBeforeResolvers, aa as checkCollectionCodeDuplication, bM as checkServiceRunning, by as checkUserIds, j as chunkArray, c4 as classifyError, b$ as cleanHtml, b5 as clearServiceDiscoveryCache, P as clientPortalHeaderName, ad as closeMongooose, X as compactUserForHeader, ah as configureSchemaSearchTokens, c as connect, bo as connectionOptions, ar as coreModelAddons, as as coreModelBundles, av as coreModelEndpoints, ay as coreModelExperiences, at as coreModelInstallations, az as coreModelOrganizationPlanHistories, b as coreModelOrganizations, ax as coreModelPlugins, aw as coreModelPromoCodes, au as coreModelUsers, Q as cpUserHeaderName, c3 as createExpectedError, bL as createHealthRoute, al as createMQWorkerWithListeners, bh as createPluginTRPCContext, bi as createTRPCContext, a8 as cursorPaginate, a9 as cursorPaginateAggregation, bH as dateToShortStr, H as decodeAgentToolsAuthHeader, bV as decodeCursor, bg as decodeTRPCContextHeader, a7 as defaultPaginate, G as encodeAgentToolsAuthHeader, bU as encodeCursor, bf as encodeTRPCContextHeader, bk as err, bu as escapeRegExp, E as expectedErrorPlugin, S as extractCPUserFromHeader, U as extractClientPortalFromHeader, c6 as extractMessage, R as extractUserFromHeader, bx as fixDate, bG as fixNum, bP as flattenObject, z as generateApolloContext, af as generateConfiguredSearchTokens, bN as generateRequestProcess, b3 as getActivePlugins, L as getAgentToolMaxResponseBytes, b4 as getAvailablePlugins, bt as getCoreDomain, bA as getDate, bO as getDiffObjects, g as getEnv, bC as getFullDate, aY as getGlobalProfileV2Plugins, bF as getNextMonth, b6 as getPlugin, ba as getPluginAddress, b1 as getPlugins, bD as getPureDate, e as getSaasCoreConnection, aT as getSaasOrgPromoCodes, aO as getSaasOrganizationActiveAddons, aH as getSaasOrganizationByHelpCenterDomain, aM as getSaasOrganizationDetail, aI as getSaasOrganizationHelpCenterDomains, aB as getSaasOrganizationIdBySubdomain, aN as getSaasOrganizationPlanHistories, aD as getSaasOrganizations, aE as getSaasOrganizationsByFilter, aJ as getSaasOrganizationsWithPendingHelpCenterDomain, aC as getSaasOrgsCache, aR as getSaasPlugin, aQ as getSaasPlugins, aS as getSaasPromoCodes, ai as getSchemaSearchTokenConfig, d as getSubdomain, bB as getToday, bE as getTomorrow, bm as getTrustProxySetting, bz as getUniqueValue, O as graphqlPubsub, aG as helpCenterDomainsOf, c8 as initErxesSentry, bb as initializePluginConfig, a$ as isDev, b9 as isEnabled, c5 as isExpectedError, aV as isGlobalProfileV2, bJ as isImage, o as isValidURL, bK as isVideo, b7 as joinErxesGateway, b0 as keyForConfig, b8 as leaveErxesGateway, l as logHandler, B as markResolvers, a3 as mongoStringRequired, ac as mongooseConnectionOptions, a5 as mongooseField, a2 as mongooseStringNonBlank, a1 as mongooseStringRandomId, a4 as mongooseStringRequiredNonBlank, J as mountAgentTools, bj as ok, M as oversizedAgentToolResultBytes, bq as paginate, aX as pluginsFromStripe, aW as pluginsOfStripeItem, bw as pluralFormation, c0 as random, an as randomAlphanumeric, ao as randomLowercase, bR as readFileFromStorage, bS as readFileStreamFromStorage, bQ as readFileUrl, ap as redis, bs as regexSearchText, bZ as removeExtraSpaces, bY as removeLastTrailingSlash, aP as removeOrgsCache, aL as removeSaasOrganizationHelpCenterDomain, aq as resetConfigsCache, r as runBeforeResolvers, aZ as sanitizeFilename, a_ as sanitizeKey, aK as saveSaasOrganizationHelpCenterDomain, ab as schemaWrapper, bl as sendCoreModuleProducer, p as sendTRPCMessage, am as sendWorkerMessage, s as sendWorkerQueue, c7 as sentryExpectedErrorFilter, b2 as setActivePlugins, Z as setCPUserHeader, $ as setClientPortalHeader, Y as setUserHeader, bI as shortStrToDate, ae as splitSearchWords, b_ as splitStr, a0 as startAfterProcess, C as startBeforeResolvers, bd as startPlugin, bX as stripAnsi, aj as toSerializablePayload, be as trpcContextHeaderName, a6 as updateMongoDocumentOrder, bv as updateOrder, aF as updateSaasOrganization, bT as uploadFileToStorage, u as userHeaderName, br as validSearchText, A as wrapApolloResolvers } from '../../dist/start-plugin-a2f6eca9.esm.js';
+import { u as userHeaderName, g as getEnv, c as connect, _ as _asyncToGenerator, a as _regeneratorRuntime, b as coreModelOrganizations, d as getSubdomain, e as getSaasCoreConnection, f as createScopedEventHandlers, h as _slicedToArray, l as logHandler, r as runBeforeResolvers, s as sendWorkerQueue, i as _objectSpread2, j as chunkArray, k as _createForOfIteratorHelper, m as _createClass, n as _classCallCheck, o as isValidURL, p as sendTRPCMessage, q as _inherits, t as _wrapNativeSuper, v as _callSuper, w as _defineProperty, x as _toConsumableArray } from '../../dist/start-plugin-2b3e89f5.esm.js';
+export { K as AGENT_TOOL_DEFAULT_MAX_RESPONSE_BYTES, ak as DEFAULT_JOB_OPTIONS, c1 as EXPECTED_ERROR_NAME, c2 as ExpectedError, aU as GP_STATUS, W as HEADER_SIZE_WARN_BYTES, bc as MAX_HEADER_BYTES, aA as ORGANIZATION_ID_MAPPING, T as TBeforeResolversProducers, V as USER_HEADER_OMITTED_FIELDS, N as agentToolResponseTooLargeError, F as agentToolsAuthHeaderName, y as apolloCustomScalars, bn as applyTrustProxy, bp as authCookieOptions, I as buildAgentToolManifest, bW as buildCursorQuery, ag as buildSearchTokenFilter, D as checkBeforeResolvers, aa as checkCollectionCodeDuplication, bM as checkServiceRunning, by as checkUserIds, j as chunkArray, c4 as classifyError, b$ as cleanHtml, b5 as clearServiceDiscoveryCache, P as clientPortalHeaderName, ad as closeMongooose, X as compactUserForHeader, ah as configureSchemaSearchTokens, c as connect, bo as connectionOptions, ar as coreModelAddons, as as coreModelBundles, av as coreModelEndpoints, ay as coreModelExperiences, at as coreModelInstallations, az as coreModelOrganizationPlanHistories, b as coreModelOrganizations, ax as coreModelPlugins, aw as coreModelPromoCodes, au as coreModelUsers, Q as cpUserHeaderName, c3 as createExpectedError, bL as createHealthRoute, al as createMQWorkerWithListeners, bh as createPluginTRPCContext, bi as createTRPCContext, a8 as cursorPaginate, a9 as cursorPaginateAggregation, bH as dateToShortStr, H as decodeAgentToolsAuthHeader, bV as decodeCursor, bg as decodeTRPCContextHeader, a7 as defaultPaginate, G as encodeAgentToolsAuthHeader, bU as encodeCursor, bf as encodeTRPCContextHeader, bk as err, bu as escapeRegExp, E as expectedErrorPlugin, S as extractCPUserFromHeader, U as extractClientPortalFromHeader, c6 as extractMessage, R as extractUserFromHeader, bx as fixDate, bG as fixNum, bP as flattenObject, z as generateApolloContext, af as generateConfiguredSearchTokens, bN as generateRequestProcess, b3 as getActivePlugins, L as getAgentToolMaxResponseBytes, b4 as getAvailablePlugins, bt as getCoreDomain, bA as getDate, bO as getDiffObjects, g as getEnv, bC as getFullDate, aY as getGlobalProfileV2Plugins, bF as getNextMonth, b6 as getPlugin, ba as getPluginAddress, b1 as getPlugins, bD as getPureDate, e as getSaasCoreConnection, aT as getSaasOrgPromoCodes, aO as getSaasOrganizationActiveAddons, aH as getSaasOrganizationByHelpCenterDomain, aM as getSaasOrganizationDetail, aI as getSaasOrganizationHelpCenterDomains, aB as getSaasOrganizationIdBySubdomain, aN as getSaasOrganizationPlanHistories, aD as getSaasOrganizations, aE as getSaasOrganizationsByFilter, aJ as getSaasOrganizationsWithPendingHelpCenterDomain, aC as getSaasOrgsCache, aR as getSaasPlugin, aQ as getSaasPlugins, aS as getSaasPromoCodes, ai as getSchemaSearchTokenConfig, d as getSubdomain, bB as getToday, bE as getTomorrow, bm as getTrustProxySetting, bz as getUniqueValue, O as graphqlPubsub, aG as helpCenterDomainsOf, c8 as initErxesSentry, bb as initializePluginConfig, a$ as isDev, b9 as isEnabled, c5 as isExpectedError, aV as isGlobalProfileV2, bJ as isImage, o as isValidURL, bK as isVideo, b7 as joinErxesGateway, b0 as keyForConfig, b8 as leaveErxesGateway, l as logHandler, B as markResolvers, a3 as mongoStringRequired, ac as mongooseConnectionOptions, a5 as mongooseField, a2 as mongooseStringNonBlank, a1 as mongooseStringRandomId, a4 as mongooseStringRequiredNonBlank, J as mountAgentTools, bj as ok, M as oversizedAgentToolResultBytes, bq as paginate, aX as pluginsFromStripe, aW as pluginsOfStripeItem, bw as pluralFormation, c0 as random, an as randomAlphanumeric, ao as randomLowercase, bR as readFileFromStorage, bS as readFileStreamFromStorage, bQ as readFileUrl, ap as redis, bs as regexSearchText, bZ as removeExtraSpaces, bY as removeLastTrailingSlash, aP as removeOrgsCache, aL as removeSaasOrganizationHelpCenterDomain, aq as resetConfigsCache, r as runBeforeResolvers, aZ as sanitizeFilename, a_ as sanitizeKey, aK as saveSaasOrganizationHelpCenterDomain, ab as schemaWrapper, bl as sendCoreModuleProducer, p as sendTRPCMessage, am as sendWorkerMessage, s as sendWorkerQueue, c7 as sentryExpectedErrorFilter, b2 as setActivePlugins, Z as setCPUserHeader, $ as setClientPortalHeader, Y as setUserHeader, bI as shortStrToDate, ae as splitSearchWords, b_ as splitStr, a0 as startAfterProcess, C as startBeforeResolvers, bd as startPlugin, bX as stripAnsi, aj as toSerializablePayload, be as trpcContextHeaderName, a6 as updateMongoDocumentOrder, bv as updateOrder, aF as updateSaasOrganization, bT as uploadFileToStorage, u as userHeaderName, br as validSearchText, A as wrapApolloResolvers } from '../../dist/start-plugin-2b3e89f5.esm.js';
 import mongoose from 'mongoose';
 import { Transform } from 'stream';
 import { keyBy } from 'lodash';