From 2c8a901af3d87bf84ff42b3b128234ecbc298f00 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andra@hotmail.com>
Date: Tue, 20 Dec 2022 21:28:41 -0300
Subject: [PATCH] =?UTF-8?q?Atera=C3=A7=C3=A3o=20no=20pageNumber=20para=20e?=
 =?UTF-8?q?vitar=20valores=20numericos=20vazios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/controllers/ContactController.ts   | 18 +++++++++++++-----
 backend/src/helpers/ContactsCache.ts           |  4 +++-
 .../TicketServices/ListTicketsService.ts       | 11 ++++++++++-
 .../WbotServices/SendWhatsAppMessage.ts        |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/backend/src/controllers/ContactController.ts b/backend/src/controllers/ContactController.ts
index 5a125ae..0b8ea1a 100644
--- a/backend/src/controllers/ContactController.ts
+++ b/backend/src/controllers/ContactController.ts
@@ -14,7 +14,7 @@ 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";
 
@@ -39,15 +39,23 @@ interface ContactData {
 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.trim().length == 0 || pageNumber === undefined) {
+    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) {
@@ -191,10 +199,10 @@ export const contacsBulkInsertOnQueue = async (req: Request, res: Response): Pro
       file: file
     }
   });
-  
+
 
   if (process.env.CACHE && contacts_inserted) {
-    
+
     await insertContactsCache(contacts_inserted)
 
   }
diff --git a/backend/src/helpers/ContactsCache.ts b/backend/src/helpers/ContactsCache.ts
index 902a385..a559b7a 100644
--- a/backend/src/helpers/ContactsCache.ts
+++ b/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}`);
diff --git a/backend/src/services/TicketServices/ListTicketsService.ts b/backend/src/services/TicketServices/ListTicketsService.ts
index 8396897..421361d 100644
--- a/backend/src/services/TicketServices/ListTicketsService.ts
+++ b/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);
 
diff --git a/backend/src/services/WbotServices/SendWhatsAppMessage.ts b/backend/src/services/WbotServices/SendWhatsAppMessage.ts
index 636c0e5..3ddbc43 100644
--- a/backend/src/services/WbotServices/SendWhatsAppMessage.ts
+++ b/backend/src/services/WbotServices/SendWhatsAppMessage.ts
@@ -38,7 +38,7 @@ const SendWhatsAppMessage = async ({
   quotedMsg
 }: Request): Promise<WbotMessage> => {
 
-  var timetaken = "####### Time taken to send message";
+  var timetaken = `######################################## TicketId: ${ticket.id} => Time taken to send the message`;
 
 
   console.time(timetaken)