Merge branch 'dual_session_test' into dialogflow

backend/src/controllers/ContactController.ts

@@ -13,7 +13,7 @@ import CheckIsValidContact from "../services/WbotServices/CheckIsValidContact";
 import GetProfilePicUrl from "../services/WbotServices/GetProfilePicUrl";
 import AppError from "../errors/AppError"; 
 
-import { searchContactCache, insertContactsCache } from '../helpers/ContactsCache' 
+import { searchContactCache, insertContactsCache, escapeCharCache } from '../helpers/ContactsCache' 
 
 import { off } from "process";
 
@@ -47,15 +47,23 @@ type IndexGetContactQuery = {
 export const index = async (req: Request, res: Response): Promise<Response> => {
   let { searchParam, pageNumber } = req.query as IndexQuery;
 
+  console.log('PAGE NUMBER CONTACT: ', pageNumber)
+
+  if (pageNumber === undefined || pageNumber.trim().length == 0) {
+    pageNumber = '1'
+  }
+
   // TEST DEL 
   if (searchParam && searchParam.trim().length > 0 && process.env.CACHE) {
 
     try {
 
-      console.log('QUERY CONTACTS FROM CACHE SEARCH PARAM: ', searchParam)
-
       const offset = 20 * (+pageNumber - 1);
 
+      searchParam = searchParam.replace(/\s+/g, ' ').trim().toLowerCase();
+
+      console.log('QUERY CONTACTS FROM CACHE SEARCH PARAM: ', searchParam)
+
       const data = await searchContactCache(searchParam, offset, 20)
 
       if (data) {
@@ -101,7 +109,7 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
 
   try {
     await schema.validate(newContact);
-  } catch (err) {
+  } catch (err: any) {
     throw new AppError(err.message);
   }
 
@@ -158,7 +166,7 @@ export const update = async (
 
   try {
     await schema.validate(contactData);
-  } catch (err) {
+  } catch (err: any) {
     throw new AppError(err.message);
   }
 
@@ -246,10 +254,10 @@ export const contacsBulkInsertOnQueue = async (req: Request, res: Response): Pro
       file: file
     }
   });
-  
+
 
   if (process.env.CACHE && contacts_inserted) {
-    
+
     await insertContactsCache(contacts_inserted)
 
   }

backend/src/helpers/ContactsCache.ts

@@ -143,13 +143,15 @@ async function searchContactCache(search: string, offset: number, limit: number)
 
 const removeExtraSpace = (str: string) => {
 
-    str = str.replace(/^\s+/g, '')
+    // str = str.replace(/^\s+/g, '')
 
     return str.replace(/\s+/g, ' ')
 }
 
 const escapeCharCache = (str: string) => {
 
+    str = str.replace(/\s+/g,' ').trim().toLowerCase();
+
     const pattern = /[\'|\"|\.|\,|\;|\<|\>|\{|\}|\[|\]|\"|\'|\=|\~|\*|\:|\#|\+|\^|\$|\@|\%|\!|\&|\)|\(|/|\-|\\)]/g; // no match, use replace function.
 
     let newStr = str.replace(pattern, (t1) => `\\${t1}`);

backend/src/services/TicketServices/ListTicketsService.ts

@@ -53,13 +53,22 @@ const ListTicketsService = async ({
 
   let whereCondition: Filterable["where"] = { [Op.or]: [{ userId }, { status: "pending" }], queueId: { [Op.or]: [queueIds, null] } };
 
+  console.log('PAGE NUMBER TICKET: ', pageNumber)
+
+  if (pageNumber.trim().length == 0) {
+    pageNumber = '1'
+  }
+
+
   if (searchParam && searchParam.trim().length > 0 && process.env.CACHE) {
 
     try {
 
       const offset = 40 * (+pageNumber - 1);
 
-      console.log('QUERY TICKET SEARCH PARAM FROM CACHE: ', searchParam) 
+      searchParam = searchParam.replace(/\s+/g, ' ').trim().toLowerCase();
+
+      console.log('QUERY TICKET SEARCH PARAM FROM CACHE: ', searchParam)
 
       let tickets: any = await searchTicketCache(searchParam, offset, 40);
 

backend/src/services/WbotServices/SendWhatsAppMessage.ts

@@ -38,7 +38,8 @@ const SendWhatsAppMessage = async ({
   quotedMsg
 }: Request): Promise<WbotMessage> => {
 
-  var timetaken = "####### Time taken to send message";
+  let timestamp = Math.floor(Date.now() / 1000)
+  var timetaken = `########################################${timestamp}| TicketId: ${ticket.id} => Time taken to send the message`;
 
 
   console.time(timetaken)

backend/src/services/WbotServices/StartWhatsAppSession.ts

@@ -60,14 +60,14 @@ export const StartWhatsAppSession = async (whatsapp: Whatsapp, backupSession: bo
             const _whatsapp = await Whatsapp.findOne({ where: { id: autoR.whatsappId } });
 
             let whatsappStatus = ["CONFLICT",
-              "DEPRECATED_VERSION ",
-              "OPENING ",
-              "PROXYBLOCK ",
-              "SMB_TOS_BLOCK ",
-              "TIMEOUT ",
-              "TOS_BLOCK ",
-              "UNLAUNCHED ",
-              "UNPAIRED ",
+              "DEPRECATED_VERSION",
+              "OPENING",
+              "PROXYBLOCK",
+              "SMB_TOS_BLOCK",
+              "TIMEOUT",
+              "TOS_BLOCK",
+              "UNLAUNCHED",
+              "UNPAIRED",
               "UNPAIRED_IDLE"]
 
             if (_whatsapp?.status) {