Merge pull request #117 from freshworks/FC-129678

FC-129678 : Remove status field dependency on conversation property update
freshworks · Oct 8, 2024 · 66e805c · 66e805c
2 parents 68cea94 + cbb59d4
commit 66e805c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/packages/freshchat-api/package.json b/packages/freshchat-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@freshworks-jaya/freshchat-api",
-  "version": "0.7.36",
+  "version": "0.7.36-beta-2",
   "description": "Provides simple interface for accessing Freshchat's public APIs",
   "repository": "[email protected]:freshdesk/jaya-lib.git",
   "main": "lib/index.js",

diff --git a/packages/freshchat-api/src/index.ts b/packages/freshchat-api/src/index.ts
@@ -455,15 +455,13 @@ export default class Freshchat {
    */
   conversationPropertiesUpdate(
     conversationId: string,
-    status: string,
     properties: unknown,
-    assigned_agent_id: string,
+    status?: string | null,
   ): AxiosPromise<Conversation> {
     const conversationPropsUpdateApiUrl = `${this.apiUrl}/conversations/${conversationId}`;
-    let requiredProperties = JSON.stringify({
-        properties,
-        status,
-      });
+
+    const payload = status === null ? { properties } : { properties, status };
+    const requiredProperties = JSON.stringify(payload);
 
     return axios.put(conversationPropsUpdateApiUrl, requiredProperties, { headers: this.headers });
   }

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.18.6-beta-1",
+  "version": "0.18.6-beta-24",
   "description": "Provides methods to process rules in product events in marketplace app",
   "repository": "[email protected]:freshdesk/jaya-lib.git",
   "main": "lib/index.js",
@@ -44,7 +44,7 @@
     "typescript": "^4.3.2"
   },
   "dependencies": {
-    "@freshworks-jaya/freshchat-api": "0.7.36",
+    "@freshworks-jaya/freshchat-api": "0.7.36-beta-2",
     "@freshworks-jaya/kairos-api": "^0.1.5",
     "@freshworks-jaya/marketplace-models": "0.1.36",
     "@freshworks-jaya/utilities": "^1.0.0",

diff --git a/packages/rule-engine/src/Utils.ts b/packages/rule-engine/src/Utils.ts
@@ -331,6 +331,7 @@ export class Utils {
       }
     });
   }
+
   public static setConversationFields(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     conversationFieldsResponse: any,
@@ -346,4 +347,15 @@ export class Utils {
       convFieldsMap.set(field.column_name, field.name);
     });
   }
+
+  /*
+  * Check if feature flag is available and enabled.
+  */
+  public static isFeatureFlagEnabled = (
+    integrations: Integrations,
+    featureFlag: string,
+  ): Boolean => {
+    return integrations?.featureFlags?.[featureFlag] || false;
+  };
+
 }
diff --git a/packages/rule-engine/src/models/rule-engine.ts b/packages/rule-engine/src/models/rule-engine.ts
@@ -26,10 +26,7 @@ export interface Integrations {
     requestProxy: RequestProxy;
   };
   timezoneOffset: number;
-  features: {
-    betaFeaturesEnabled: string[];
-    featuresEnabled: string[];
-  };
+  featureFlags: Record<string, boolean>;
 }
 
 export interface ProductCredentials {

diff --git a/packages/rule-engine/src/recommended/actions/update-conversation-property.ts b/packages/rule-engine/src/recommended/actions/update-conversation-property.ts
@@ -21,7 +21,6 @@ export default async (
   const freshchat = new Freshchat(freshchatApiUrl, freshchatApiToken, ruleAlias);
   const modelProperties = productEventPayload.data.conversation || productEventPayload.data.message;
   const conversationId = modelProperties.conversation_id;
-  const assigned_agent_id = modelProperties.assigned_agent_id ? modelProperties.assigned_agent_id : '';
   const status = modelProperties.status;
 
   const convPropertiesActionValue = actionValue as PropertiesConditionValue;
@@ -50,7 +49,13 @@ export default async (
         ),
       };
     }
-    await freshchat.conversationPropertiesUpdate(conversationId, status, properties, assigned_agent_id);
+
+    if (Utils.isFeatureFlagEnabled(integrations, 'EXCLUSIVE_UPDATE_FOR_CONV_PROP')) {
+      await freshchat.conversationPropertiesUpdate(conversationId, properties, null);
+    } else {
+      await freshchat.conversationPropertiesUpdate(conversationId, properties, status);
+    }
+
   } catch (err) {
     Utils.log(
       productEventPayload,