backend/src/controllers/TicketController.ts

@@ -93,9 +93,9 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
 
   let queueIds: number[] = [];
 
-  if (queueIdsStringified && queueIdsStringified.trim().length > 0) {
+  if (queueIdsStringified) {
     queueIds = JSON.parse(queueIdsStringified);
-  }
+  }  
 
   const { tickets, count, hasMore } = await ListTicketsService({
     searchParam,
@@ -109,7 +109,7 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
     unlimited,
     searchParamContent
   });
-
+  
   return res.status(200).json({ tickets, count, hasMore });
 };
 

backend/src/controllers/WhatsAppController.ts

@@ -265,10 +265,6 @@ export const weebhook = async (
       });
 
       if (type == "text") {
-        if (!message?.text?.body) {
-          return res.status(400).json({ error: "body not found" });
-        }
-
         type = "chat";
         msg = {
           ...msg,
@@ -276,10 +272,6 @@ export const weebhook = async (
           type
         };
       } else {
-        if (!message[message?.type]?.id) {
-          return res.status(400).json({ error: "id not found" });
-        }
-
         const mediaId = message[message.type].id;
         const mimetype = message[message.type].mime_type;
 

backend/src/helpers/GetDefaultWhatsApp.ts

@@ -25,7 +25,7 @@ const GetDefaultWhatsApp = async ({
     where: { isDefault: true }
   });
 
-  if (!defaultWhatsapp) { 
+  if (!defaultWhatsapp && !ignoreNoWhatsappFound) {
     if (userId) {
       let whatsapps = await wbotByUserQueue({ userId, queueId });
 
@@ -53,13 +53,13 @@ const GetDefaultWhatsApp = async ({
           where: { status: "CONNECTED" }
         });
       }
-    } else { 
+    } else {
       defaultWhatsapp = await Whatsapp.findOne({
         where: { status: "CONNECTED", isOfficial: false }
       });
     }
-  }  
+  } 
- 
+
   if (!defaultWhatsapp && !ignoreNoWhatsappFound) { 
     throw new AppError("ERR_NO_DEF_WAPP_FOUND");
   }

backend/src/services/WbotServices/CheckIsValidContact.ts

@@ -24,16 +24,12 @@ const CheckIsValidContact = async (
     if (data?.isValid) {
       isValidNumber = data;
     }
-  }
+  } 
 
   try {
-    let _status: any;
+    if (!isValidNumber) { 
-
+   
-    if (!isValidNumber) {
+      const { data } = await axios.post(
-
-      console.log('kkkkkkkkkkkkkkkkkkkkkkkkkkkkk ')
-
-      const { data, status } = await axios.post(
         `${process.env.WHATS_NUMBER_VALIDATOR_URL}/api/validate`,
         { mobile: number },
         {
@@ -44,13 +40,9 @@ const CheckIsValidContact = async (
       );
 
       isValidNumber = data;
-      _status = status; 
     }
+ 
     if (ignoreThrow) return isValidNumber?.number;
-   
-  console.log('_status: ', _status)
-
-    if (_status && _status == 422) throw new AppError("ERR_NO_WAPP_FOUND");
 
     if (!isValidNumber || (isValidNumber && !isValidNumber.isValid)) {
       throw new AppError("invalidNumber");

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -98,7 +98,7 @@ import FindOrCreateTicketServiceBot from "../TicketServices/FindOrCreateTicketSe
 import ShowTicketService from "../TicketServices/ShowTicketService";
 import ShowQueuesByUser from "../UserServices/ShowQueuesByUser";
 import ListWhatsappQueuesByUserQueue from "../UserServices/ListWhatsappQueuesByUserQueue";
-import CreateContactService from "../ContactServices/CreateContactService";
+import CreateContactService from "../ContactServices/CreateContactService"
 
 var lst: any[] = getWhatsappIds();
 
@@ -318,14 +318,13 @@ const verifyQueue = async (
     selectedOption = 1;
     choosenQueue = queues[+selectedOption - 1];
   } else {
-    selectedOption = msg?.body;
+    selectedOption = msg.body;
 
-    if (selectedOption && selectedOption.trim().length > 0) {
+    //////////////// EXTRAIR APENAS O NÚMERO ///////////////////
-      //////////////// EXTRAIR APENAS O NÚMERO ///////////////////
+    selectedOption = selectedOption.replace(/[^1-9]/g, "");
-      selectedOption = selectedOption.replace(/[^1-9]/g, "");
+    ///////////////////////////////////
-      ///////////////////////////////////
+
-      choosenQueue = queues[+selectedOption - 1];
+    choosenQueue = queues[+selectedOption - 1];
-    }
   }
 
   if (choosenQueue) {
@@ -611,7 +610,7 @@ const handleMessage = async (
 
       return;
     }
-  }
+  } 
 
   if (!isValidMsg(msg)) {
     return;
@@ -781,33 +780,33 @@ const handleMessage = async (
       await verifyQueue(wbot, msg, ticket, contact);
     }
 
-    if (msg.type === "vcard") {
+      if (msg.type === "vcard") {
-      try {
+        try {
-        const array = msg.body.split("\n");
+          const array = msg.body.split("\n");
-        const obj = [];
+          const obj = [];
-        let contact = "";
+          let contact = "";
-        for (let index = 0; index < array.length; index++) {
+          for (let index = 0; index < array.length; index++) {
-          const v = array[index];
+            const v = array[index];
-          const values = v.split(":");
+            const values = v.split(":");
-          for (let ind = 0; ind < values.length; ind++) {
+            for (let ind = 0; ind < values.length; ind++) {
-            if (values[ind].indexOf("+") !== -1) {
+              if (values[ind].indexOf("+") !== -1) {
-              obj.push({ number: values[ind] });
+                obj.push({ number: values[ind] });
-            }
+              }
-            if (values[ind].indexOf("FN") !== -1) {
+              if (values[ind].indexOf("FN") !== -1) {
-              contact = values[ind + 1];
+                contact = values[ind + 1];
+              }
             }
           }
+          for await (const ob of obj) {
+            const cont = await CreateContactService({
+              name: contact,
+              number: ob.number.replace(/\D/g, "")
+            });
+          }
+        } catch (error) {
+          console.log(error);
         }
-        for await (const ob of obj) {
-          const cont = await CreateContactService({
-            name: contact,
-            number: ob.number.replace(/\D/g, "")
-          });
-        }
-      } catch (error) {
-        console.log(error);
       }
-    }
 
     const botInfo = await BotIsOnQueue("botqueue");
 
@@ -821,7 +820,7 @@ const handleMessage = async (
         ticket.status == "pending" ||
         ticket.status == "queueChoice")
     ) {
-      const filteredUsers = await findByContain("user:*", "name", msg?.body);
+      const filteredUsers = await findByContain("user:*", "name", msg?.body); 
 
       if (filteredUsers && filteredUsers.length > 0) {
         if (botInfo.isOnQueue) {

frontend/src/components/ContactModal/index.js

@@ -125,11 +125,11 @@ const ContactModal = ({ open, onClose, contactId, initialValues, onSave }) => {
 				}
 				handleClose()
 			}
-			toast.success(i18n.t("contactModal.success"))  
+			toast.success(i18n.t("contactModal.success")) 
+			setSaving(false)
 		} catch (err) {
 			toastError(err)
 		}
-		setSaving(false)
 	}
 
 	return (