merge sendMessage() and sendEvent() methods into a generic sendRequest() method

Author: murtaza98

endpoints/IncomingEndpoint.ts

@@ -1,7 +1,7 @@
 import { HttpStatusCode, IHttp, IModify, IPersistence, IRead } from '@rocket.chat/apps-engine/definition/accessors';
 import { ApiEndpoint, IApiEndpointInfo, IApiRequest, IApiResponse } from '@rocket.chat/apps-engine/definition/api';
 import { ILivechatRoom } from '@rocket.chat/apps-engine/definition/livechat';
-import { IDialogflowMessage } from '../enum/Dialogflow';
+import { IDialogflowMessage, DialogflowRequestType } from '../enum/Dialogflow';
 import { EndpointActionNames, IActionsEndpointContent } from '../enum/Endpoints';
 import { Headers, Response } from '../enum/Http';
 import { Logs } from '../enum/Logs';
@@ -50,7 +50,7 @@ export class IncomingEndpoint extends ApiEndpoint {
                 if (!event) { throw new Error(Logs.INVALID_EVENT_DATA); }
 
                 try {
-                    const response: IDialogflowMessage = await Dialogflow.sendEvent(http, read, modify, sessionId, event);
+                    const response: IDialogflowMessage = await Dialogflow.sendRequest(http, read, modify, sessionId, event, DialogflowRequestType.EVENT);
                     await createDialogflowMessage(sessionId, read, modify, response);
                 } catch (error) {
                     this.app.getLogger().error(`${Logs.DIALOGFLOW_REST_API_ERROR} ${error.message}`);

enum/Dialogflow.ts

@@ -44,3 +44,8 @@ export enum Base64 {
 export enum LanguageCode {
     EN = 'en',
 }
+
+export enum DialogflowRequestType {
+    MESSAGE = 'message',
+    EVENT = 'event',
+}

handler/PostMessageSentHandler.ts

@@ -3,7 +3,7 @@ import { IApp } from '@rocket.chat/apps-engine/definition/IApp';
 import { ILivechatMessage, ILivechatRoom } from '@rocket.chat/apps-engine/definition/livechat';
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
 import { AppSetting, DefaultMessage } from '../config/Settings';
-import { IDialogflowMessage } from '../enum/Dialogflow';
+import { DialogflowRequestType, IDialogflowMessage } from '../enum/Dialogflow';
 import { Logs } from '../enum/Logs';
 import { Dialogflow } from '../lib/Dialogflow';
 import { createDialogflowMessage, createMessage } from '../lib/Message';
@@ -48,7 +48,7 @@ export class PostMessageSentHandler {
 
         let response: IDialogflowMessage;
         try {
-            response = (await Dialogflow.sendMessage(this.http, this.read, this.modify, rid, text));
+            response = (await Dialogflow.sendRequest(this.http, this.read, this.modify, rid, text, DialogflowRequestType.MESSAGE));
         } catch (error) {
             this.app.getLogger().error(`${Logs.DIALOGFLOW_REST_API_ERROR} ${error.message}`);
 

lib/Dialogflow.ts

@@ -2,7 +2,7 @@ import { IHttp, IHttpRequest, IModify, IPersistence, IRead } from '@rocket.chat/
 import { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
 import { createSign } from 'crypto';
 import { AppSetting } from '../config/Settings';
-import { DialogflowJWT, DialogflowUrl, IDialogflowAccessToken, IDialogflowEvent, IDialogflowMessage, IDialogflowQuickReplies, LanguageCode } from '../enum/Dialogflow';
+import { DialogflowJWT, DialogflowRequestType, DialogflowUrl, IDialogflowAccessToken, IDialogflowEvent, IDialogflowMessage, IDialogflowQuickReplies, LanguageCode } from '../enum/Dialogflow';
 import { Headers } from '../enum/Http';
 import { Logs } from '../enum/Logs';
 import { base64urlEncode } from './Helper';
@@ -12,43 +12,27 @@ import { getAppSettingValue } from './Settings';
 
 class DialogflowClass {
     private jwtExpiration: Date;
-    public async sendMessage(http: IHttp,
+    public async sendRequest(http: IHttp,
                              read: IRead,
                              modify: IModify,
                              sessionId: string,
-                             messageText: string): Promise<IDialogflowMessage> {
+                             request: IDialogflowEvent | string,
+                             requestType: DialogflowRequestType): Promise<IDialogflowMessage> {
         const serverURL = await this.getServerURL(read, modify, http, sessionId);
 
+        const queryInput = requestType === DialogflowRequestType.EVENT ?
+                            { event: { ...(request as IDialogflowEvent) } } :
+                            { text: { languageCode: LanguageCode.EN, text: request } };
         const httpRequestContent: IHttpRequest = createHttpRequest(
             { 'Content-Type': Headers.CONTENT_TYPE_JSON, 'Accept': Headers.ACCEPT_JSON },
-            { queryInput: { text: { languageCode: LanguageCode.EN, text: messageText } } },
+            { queryInput },
         );
 
         try {
             const response = await http.post(serverURL, httpRequestContent);
             return this.parseRequest(response.data);
         } catch (error) {
-            throw new Error(Logs.HTTP_REQUEST_ERROR);
-        }
-    }
-
-    public async sendEvent(http: IHttp,
-                           read: IRead,
-                           modify: IModify,
-                           sessionId: string,
-                           event: IDialogflowEvent): Promise<IDialogflowMessage> {
-        const serverURL = await this.getServerURL(read, modify, http, sessionId);
-
-        const httpRequestContent: IHttpRequest = createHttpRequest(
-            { 'Content-Type': Headers.CONTENT_TYPE_JSON, 'Accept': Headers.ACCEPT_JSON },
-            { queryInput: { event } },
-        );
-
-        try {
-            const response = await http.post(serverURL, httpRequestContent);
-            return this.parseRequest(response.data);
-        } catch (error) {
-            throw new Error(Logs.HTTP_REQUEST_ERROR);
+            throw new Error(`${ Logs.HTTP_REQUEST_ERROR }`);
         }
     }