Merge pull request #178 from WideChat/fix/close_chat_event

Fix close chat event tracking
WideChat · Nov 16, 2022 · 0c82edf · 0c82edf
2 parents 9b4f6f5 + 8327f1e
commit 0c82edf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Room.ts b/lib/Room.ts
@@ -109,7 +109,6 @@ export const closeChat = async (modify: IModify, read: IRead, rid: string, app:
 
 export const sendCloseChatMessage = async (read: IRead, modify: IModify, app: IApp, rid: string) => {
 	const closeChatMessage: string = await getLivechatAgentConfig(read, rid, AppSetting.DialogflowCloseChatMessage);
-	modify.getAnalytics().sendEvent(getEventData(rid, EventName.CHAT_CLOSED_BY_DF_BOT));
 	if (closeChatMessage?.length > 0) {
 		await createMessage(rid, read, modify, { text: closeChatMessage }, app);
 	}

diff --git a/lib/payloadAction.ts b/lib/payloadAction.ts
@@ -3,6 +3,7 @@ import { IApp } from '@rocket.chat/apps-engine/definition/IApp';
 import { ILivechatRoom } from '@rocket.chat/apps-engine/definition/livechat';
 import { AppSetting } from '../config/Settings';
 import { ActionIds } from '../enum/ActionIds';
+import { EventName } from '../enum/Analytics';
 import {
 	CloseChatDescription,
 	DialogflowRequestType,
@@ -27,6 +28,7 @@ import {
 	updatePersistentData,
 } from '../lib/Persistence';
 import { closeChat, performHandover, updateRoomCustomFields } from '../lib/Room';
+import { getEventData } from './Analytics';
 import { Dialogflow } from './Dialogflow';
 import { createDialogflowMessage, createMessage } from './Message';
 import { getLivechatAgentConfig } from './Settings';
@@ -80,6 +82,7 @@ export const handlePayloadActions = async (
 					if (livechatRoom && livechatRoom.isOpen) {
 						await closeChat(modify, read, rid, app, CloseChatDescription.CLOSED_BY_AGENT);
 					}
+					modify.getAnalytics().sendEvent(getEventData(rid, EventName.CHAT_CLOSED_BY_DF_BOT));
 				} else if (actionName === ActionIds.NEW_WELCOME_EVENT) {
 					const livechatRoom = (await read.getRoomReader().getById(rid)) as ILivechatRoom;
 					if (!livechatRoom) {