Merge pull request #62 from Dialogue-Bot/DIAL-41-Implement-button-template-urls-for-server

DIAL-41-Implement-button-template-urls-for-server

Author: khanh1902

client/src/components/pages/flow-detail/test-your-bot.tsx

@@ -20,7 +20,9 @@ const TestYourBot = () => {
           'fixed right-4 z-10 rounded-md shadow w-80 transition-transform duration-300 bottom-4 flex flex-col gap-4 bg-white h-[500px]',
         )}
       >
-        <ChatBox channelId={channel.contactId} className='h-full w-full' />
+        <ChatBox channelId={channel.contactId} className='h-full w-full' 
+          isTest
+        />
       </div>
     )
   )

server/src/channels/base.channel.ts

@@ -20,7 +20,7 @@ export class BaseChannel {
     this.channelType = channelType
   }
 
-  public async postMessageToBot({ userId, message = '', data }) {
+  public async postMessageToBot({ userId, message = '', data, isTest }) {
     const uid = this.initConversationId(userId)
     try {
       const postMsg = await axios({
@@ -36,6 +36,7 @@ export class BaseChannel {
           recipient: {
             id: this.contactId,
           },
+          testBot: isTest || false,
           data: data || false,
           text: message,
           type: 'message',

server/src/channels/line.channel.ts

@@ -88,6 +88,7 @@ export class LineChannel extends BaseChannel {
           userId: source.userId,
           message: message.text,
           data: null,
+          isTest: false,
         })
       }
     } catch (e) { }

server/src/channels/messenger.channel.ts

@@ -86,6 +86,7 @@ export class MessengerChannel extends BaseChannel {
           userId: senderId,
           message: messageText || payload,
           data: null,
+          isTest: false,
         })
       })
     })
@@ -96,6 +97,7 @@ export class MessengerChannel extends BaseChannel {
       userId,
       message: 'ADDRESS',
       data: { USER_INFORMATION: Helper.arrayToObj(address) },
+      isTest: false,
     })
   }
 

server/src/channels/web.channel.ts

@@ -28,7 +28,7 @@ export class WebChannel extends BaseChannel {
         channelData: any;
     }) {
         try {
-            let result = { userId, messages: text || '', template: {} };
+            let result = { userId, message: text || '', template: {} };
 
             if (channelData) {
                 result.template = {

server/src/controllers/flows.controller.ts

@@ -76,7 +76,7 @@ export class FlowController {
   )
 
   public getFlowByContactId = catchAsync(async (req: RequestWithUser, res) => {
-    const data = await this.flowService.getFlowByContactId(req.params.contactId)
+    const data = await this.flowService.getFlowByContactId(req.params.contactId, req.body.isTest)
     res.status(StatusCodes.OK).send(data);
   })
 }

server/src/dtos/flows.dto.ts

@@ -3,6 +3,7 @@ import { IFlowSetting, IFlowVariable } from '@/interfaces/flows.interface'
 import { Transform } from 'class-transformer'
 import {
   IsArray,
+  IsBoolean,
   IsNotEmpty,
   IsObject,
   IsOptional,
@@ -65,3 +66,11 @@ export class DeleteFlowDTO {
   @IsString({ each: true })
   ids: string[]
 }
+
+export class TestYourBotDTO {
+  @IsBoolean()
+  @IsNotEmpty({
+    message: () => getCurrentLocale().VALIDATE.REQUIRED({ field: 'Is Test' }),
+  })
+  isTest: boolean
+}

server/src/routes/flow.route.ts

@@ -1,6 +1,6 @@
 import { ENDPOINTS } from '@/constants'
 import { FlowController } from '@/controllers/flows.controller'
-import { FlowDTO } from '@/dtos/flows.dto'
+import { FlowDTO, TestYourBotDTO } from '@/dtos/flows.dto'
 import { PagingDTO } from '@/dtos/paging.dto'
 import { authMiddleware } from '@/middlewares/auth.middleware'
 import { validate } from '@/middlewares/validation.middleware'
@@ -50,6 +50,7 @@ export class FlowRoute implements Routes {
     //for bot get flow by contactId
     this.router.get(
       `${ENDPOINTS.FLOW.INDEX}/:contactId`,
+      validate(TestYourBotDTO, 'body'),
       this.controller.getFlowByContactId,
     )
 

server/src/services/flows.service.ts

@@ -9,7 +9,7 @@ import { LocaleService } from '@/i18n/ctx'
 import { FlowExtend } from '@/interfaces/flows.interface'
 import { Paging } from '@/interfaces/paging.interface'
 import { logger } from '@/utils/logger'
-import { and, asc, desc, eq, like, ne, sql } from 'drizzle-orm'
+import { and, asc, desc, eq, isNotNull, like, ne, sql } from 'drizzle-orm'
 import { StatusCodes } from 'http-status-codes'
 import { omit } from 'lodash'
 import { Inject, Service } from 'typedi'
@@ -265,13 +265,25 @@ export class FlowService {
 
     return result
   }
-  public async getFlowByContactId(contactId: string) {
+  public async getFlowByContactId(contactId: string, isTest: boolean) {
 
-    const channel = await this.chanelService.findOneByContactId(contactId)
+    const channel = await this.chanelService.findOneByContactId(contactId);
+    let flow = null;
 
-    const flow = await db.query.flows.findFirst({
-      where: eq(flows.id, channel?.flowId),
-    })
+    if (isTest) {
+      flow = await db.query.flows.findFirst({
+        where: eq(flows.id, channel?.flowId),
+      });
+
+    }
+    else {
+      flow = await db.query.flows.findFirst({
+        where: and(
+          eq(flows.id, channel?.flowId),
+          isNotNull(flows.publishAt)
+        ),
+      });
+    }
 
     if (!flow) {
       throw new HttpException(

server/src/services/socket.service.ts

@@ -21,7 +21,8 @@ export class SocketService {
   }
 
   private async handleIncomingMessage(io: Socket, data: any) {
-    const { address, message } = data
+    const { address, message, isTest } = data
+    console.log('socket data:' + JSON.stringify(data));
 
     if (!address || !message) return
 
@@ -47,7 +48,7 @@ export class SocketService {
         credentials,
       )
 
-      await webChannel.postMessageToBot({ userId, message, data: '' })
+      await webChannel.postMessageToBot({ userId, message, data: '', isTest })
     }
   }