Merge pull request #108 from freshworks/FC-116162

Support send message for email conversation
freshworks · Nov 20, 2023 · 9aa7c02 · 9aa7c02
2 parents a0113e2 + 55c1502
commit 9aa7c02
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 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.34",
+  "version": "0.7.35",
   "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
@@ -142,8 +142,10 @@ export default class Freshchat {
     actorType?: 'agent' | 'bot',
     actorId?: string,
     replyParts?: ReplyPart[],
+    isEmailConversation?: boolean
   ): AxiosPromise<Message> {
     const postMessageApiUrl = `${this.apiUrl}/conversations/${conversationId}/messages`;
+    const messagePartType = isEmailConversation ? 'email' : 'text';
 
     return axios.post(
       postMessageApiUrl,
@@ -152,7 +154,7 @@ export default class Freshchat {
         actor_type: actorType || 'bot',
         message_parts: [
           {
-            text: {
+            [messagePartType]: {
               content: message,
             },
           },
@@ -294,8 +296,8 @@ export default class Freshchat {
   /**
    * Send Normal Reply.
    */
-  sendNormalReplyText(conversationId: string, message: string, agentId?: string): AxiosPromise<Message> {
-    return this.postMessage(conversationId, message, 'normal', agentId ? 'agent' : 'bot', agentId);
+  sendNormalReplyText(conversationId: string, message: string, agentId?: string, isEmailConversation: boolean = false): AxiosPromise<Message> {
+    return this.postMessage(conversationId, message, 'normal', agentId ? 'agent' : 'bot', agentId, undefined, isEmailConversation);
   }
 
   /** Update User API */

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.27",
+  "version": "0.1.28",
   "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
@@ -37,6 +37,7 @@ export enum ConversationSource {
   MobileSDK = 'MOBILE',
   WebMessenger = 'WEBCHAT',
   WhatsApp = 'WHATSAPP',
+  Email = 'EMAIL',
 }
 
 export enum MessageSource {

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.26",
+  "version": "0.17.27",
   "description": "Provides methods to process rules in product events in marketplace app",
   "repository": "[email protected]:freshdesk/jaya-lib.git",
   "main": "lib/index.js",
@@ -44,9 +44,9 @@
     "typescript": "^4.3.2"
   },
   "dependencies": {
-    "@freshworks-jaya/freshchat-api": "0.7.34",
+    "@freshworks-jaya/freshchat-api": "0.7.35",
     "@freshworks-jaya/kairos-api": "^0.1.5",
-    "@freshworks-jaya/marketplace-models": "0.1.27",
+    "@freshworks-jaya/marketplace-models": "0.1.28",
     "@freshworks-jaya/utilities": "^1.0.0",
     "@google-cloud/logging": "^9.3.1",
     "axios": "^0.21.4",

diff --git a/packages/rule-engine/src/recommended/actions/send-message.ts b/packages/rule-engine/src/recommended/actions/send-message.ts
@@ -1,4 +1,4 @@
-import { ProductEventPayload } from '@freshworks-jaya/marketplace-models';
+import { ConversationSource, ProductEventPayload } from '@freshworks-jaya/marketplace-models';
 import Freshchat from '@freshworks-jaya/freshchat-api';
 import { PlaceholdersMap } from '@freshworks-jaya/utilities';
 import { Integrations, RuleEngineOptions } from '../../models/rule-engine';
@@ -20,6 +20,7 @@ export default async (
   const freshchatApiToken = integrations.freshchatv2.token;
   const freshchat = new Freshchat(freshchatApiUrl, freshchatApiToken, ruleAlias);
   const modelProperties = productEventPayload.data.conversation || productEventPayload.data.message;
+  const isEmailConversation = modelProperties.source === ConversationSource.Email;
   const conversationId = modelProperties.conversation_id;
   let generatedPlaceholders: PlaceholdersMap = {};
 
@@ -37,7 +38,7 @@ export default async (
       actionValue as string,
       combinedPlaceholders,
     );
-    await freshchat.sendNormalReplyText(conversationId, textWithReplacedPlaceholders);
+    await freshchat.sendNormalReplyText(conversationId, textWithReplacedPlaceholders, undefined, isEmailConversation);
   } catch (err) {
     Utils.log(
       productEventPayload,