Merge commit '698ee4dc791847c256ce756b11fd84f776601226' into DIAL-42-implement-test-your-bot

Author: hi02102002

server/src/channels/web.channel.ts

@@ -1,4 +1,4 @@
-import { SOCKET_EVENTS } from '@/constants'
+import { SOCKET_EVENTS, TEST_YOUR_BOT_CHANNEL } from '@/constants'
 import { ConversationLiveChatService } from '@/services/conversation-live-chat.service'
 import { MessageService } from '@/services/message.service'
 import { logger } from '@/utils/logger'
@@ -26,7 +26,7 @@ export class WebChannel extends BaseChannel {
     this.credentials = credentials
   }
 
-  async prepareMessage(req: Request, res: Response) {}
+  async prepareMessage(req: Request, res: Response) { }
 
   public async sendMessageToUser({
     userId,
@@ -59,7 +59,7 @@ export class WebChannel extends BaseChannel {
         userId,
         this.contactId,
       )
-      if (convExisted && type === 'message') {
+      if (convExisted && type === 'message' && !this.contactId.includes(TEST_YOUR_BOT_CHANNEL)) {
         await this.messageService.createMessage({
           conversationId: convExisted.userId,
           from: 'bot',

server/src/services/socket.service.ts

@@ -15,7 +15,7 @@ export class SocketService {
     private readonly chanelService: ChannelService,
     private readonly conversationLiveChatService: ConversationLiveChatService,
     private readonly messageService: MessageService,
-  ) {}
+  ) { }
   public handleSocketEvents(socket: Socket) {
     socket.on(SOCKET_EVENTS.MESSAGE, (data) => {
       this.handleIncomingMessage(socket, data)
@@ -50,7 +50,7 @@ export class SocketService {
       const { id, contactName, channelType, credentials } = expectedChannel
 
       // save conversation and conversation message
-      if (!type || isTest) {
+      if (message || !type || !isTest) {
         let convExisted =
           await this.conversationLiveChatService.getConversation(
             userId,