Migration related changes, so that conversation properties doen't bre…

…ak (#104) * All changes * package update
freshworks · Oct 6, 2023 · f6ece55 · f6ece55
1 parent 4b389d3
commit f6ece55
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/packages/marketplace-models/package.json b/packages/marketplace-models/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@freshworks-jaya/marketplace-models",
-  "version": "0.1.21-beta-1",
+  "version": "0.1.23",
   "description": "Provides type definitions for models in marketplace product events",
   "repository": "[email protected]:freshdesk/jaya-lib.git",
   "main": "lib/index.js",

diff --git a/packages/marketplace-models/src/types/PayloadData.ts b/packages/marketplace-models/src/types/PayloadData.ts
@@ -94,6 +94,7 @@ export interface Channel {
 
 export interface UserProperty {
   name: string;
+  oldName?: string;
   value: string;
 }
 

diff --git a/packages/rule-engine/package.json b/packages/rule-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@freshworks-jaya/rule-engine",
-  "version": "0.17.21-beta-7",
+  "version": "0.17.23",
   "description": "Provides methods to process rules in product events in marketplace app",
   "repository": "[email protected]:freshdesk/jaya-lib.git",
   "main": "lib/index.js",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@freshworks-jaya/freshchat-api": "0.7.33-beta-09",
     "@freshworks-jaya/kairos-api": "^0.1.5",
-    "@freshworks-jaya/marketplace-models": "0.1.21-beta-1",
+    "@freshworks-jaya/marketplace-models": "0.1.23",
     "@freshworks-jaya/utilities": "^1.0.0",
     "@google-cloud/logging": "^9.3.1",
     "axios": "^0.21.4",

diff --git a/packages/rule-engine/src/ActionExecutor.ts b/packages/rule-engine/src/ActionExecutor.ts
@@ -131,6 +131,11 @@ export class ActionExecutor {
       user.properties.forEach((userProperty) => {
         const placeholderKey = `user.properties.${userProperty.name}`;
         dynamicPlaceholders[placeholderKey] = userProperty.value;
+        // For backward compatibility with migrated accounts
+        if (userProperty.oldName) {
+          const oldPlaceholderKey = `user.properties.${userProperty.oldName}`;
+          dynamicPlaceholders[oldPlaceholderKey] = userProperty.value;
+        }
       });
     // Register empty placeholder for conversation properties which are not filled
     Utils.registerEmptyPlaceholder(convFieldsMap, conversation, dynamicPlaceholders);

diff --git a/packages/rule-engine/src/recommended/conditions/user-property.ts b/packages/rule-engine/src/recommended/conditions/user-property.ts
@@ -15,7 +15,10 @@ const evaluateUserPropertyCondition = (
   ruleAlias: string,
 ): Promise<void> => {
   const matchedProperty =
-    userObj.properties && userObj.properties.find((property) => property.name === conditionValue.propertyKey);
+    userObj.properties &&
+    userObj.properties.find(
+      (property) => property.name === conditionValue.propertyKey || property.oldName === conditionValue.propertyKey,
+    );
 
   return Utils.evaluateCondition(
     operator,