fix: Ajuste no tratamento do horário de atendimento > Necessário que …

…o usuário para a sincronização do timezone no servidor e banco de dados, atualmente isso não é suportado pela aplicação. fix #87 Regras de horário de atendimento
ldurans · Dec 19, 2022 · f5500d4 · f5500d4
1 parent 2ec563b
commit f5500d4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/backend/src/services/InstagramBotServices/handleRealtimeReceive.ts b/backend/src/services/InstagramBotServices/handleRealtimeReceive.ts
@@ -6,6 +6,7 @@ import {
 import { IgApiClientMQTT, MessageSyncMessageWrapper } from "instagram_mqtt";
 import VerifyStepsChatFlowTicket from "../ChatFlowServices/VerifyStepsChatFlowTicket";
 import FindOrCreateTicketService from "../TicketServices/FindOrCreateTicketService";
+import verifyBusinessHours from "../WbotServices/helpers/VerifyBusinessHours";
 import ShowWhatsAppService from "../WhatsappService/ShowWhatsAppService";
 import InstagramVerifyContact from "./InstagramVerifyContact";
 import VerifyMediaMessage from "./InstagramVerifyMediaMessage";
@@ -22,7 +23,6 @@ const handleRealtimeReceive = async (
   ctx: MessageSyncMessageWrapper | any,
   instaBot: Session
 ) => {
-  console.log(ctx);
   const channel = await ShowWhatsAppService({ id: instaBot.id });
   const threadData = await instaBot.feed
     .directThread({ thread_id: ctx.message.thread_id, oldest_cursor: "" })
@@ -64,13 +64,13 @@ const handleRealtimeReceive = async (
     ticket
   );
 
-  // await verifyBusinessHours(
-  //   {
-  //     fromMe,
-  //     timestamp: message.date
-  //   },
-  //   ticket
-  // );
+  await verifyBusinessHours(
+    {
+      fromMe,
+      timestamp: ctx.message.timestamp / 1000 // adequar horário node
+    },
+    ticket
+  );
 };
 
 export default handleRealtimeReceive;
diff --git a/backend/src/services/MessengerChannelServices/MessengerHandleMessage.ts b/backend/src/services/MessengerChannelServices/MessengerHandleMessage.ts
@@ -8,6 +8,7 @@ import MessengerVerifyMediaMessage from "./MessengerVerifyMediaMessage";
 import VerifyStepsChatFlowTicket from "../ChatFlowServices/VerifyStepsChatFlowTicket";
 import MessengerMarkRead from "./MessengerMarkRead";
 import MessengerShowChannel from "./MessengerShowChannel";
+import verifyBusinessHours from "../WbotServices/helpers/VerifyBusinessHours";
 
 // eslint-disable-next-line consistent-return
 const getMessageType = (message: any) => {
@@ -81,7 +82,7 @@ const MessengerHandleMessage = async (
         }
         await VerifyStepsChatFlowTicket(msgData, ticket);
 
-        // await verifyBusinessHours(msgData, ticket);
+        await verifyBusinessHours(msgData, ticket);
         resolve();
       } catch (error) {
         logger.error(error);

diff --git a/backend/src/services/TbotServices/HandleMessageTelegram.ts b/backend/src/services/TbotServices/HandleMessageTelegram.ts
@@ -31,7 +31,7 @@ const HandleMessage = async (ctx: Context, tbot: Session): Promise<void> => {
   const messageData = {
     ...message,
     // compatibilizar timestamp com js
-    timestamp: +message.timestamp * 1000
+    timestamp: +message.date * 1000
   };
 
   const contact = await VerifyContact(ctx, channel.tenantId);

diff --git a/backend/src/services/TbotServices/tbotMessageListener.ts b/backend/src/services/TbotServices/tbotMessageListener.ts
@@ -11,7 +11,6 @@ const tbotMessageListener = (tbot: Session): void => {
   });
 
   tbot.on("edited_message", async ctx => {
-    console.log("edited_message", ctx);
     HandleMessageTelegram(ctx, tbot);
 
     // HandleMessageTelegram(ctx, tbot);

diff --git a/backend/src/services/WbotServices/StartAllWhatsAppsSessions.ts b/backend/src/services/WbotServices/StartAllWhatsAppsSessions.ts
@@ -27,7 +27,7 @@ export const StartAllWhatsAppsSessions = async (): Promise<void> => {
             type: "whatsapp"
           },
           status: {
-            [Op.notIn]: ["DESTROYED", "qrcode"]
+            [Op.notIn]: ["DISCONNECTED", "qrcode"]
             // "DISCONNECTED"
           }
         }

diff --git a/backend/src/services/WbotServices/helpers/HandleMessage.ts b/backend/src/services/WbotServices/helpers/HandleMessage.ts
@@ -12,7 +12,7 @@ import IsValidMsg from "./IsValidMsg";
 import VerifyContact from "./VerifyContact";
 import VerifyMediaMessage from "./VerifyMediaMessage";
 import VerifyMessage from "./VerifyMessage";
-// import verifyBusinessHours from "./VerifyBusinessHours";
+import verifyBusinessHours from "./VerifyBusinessHours";
 import VerifyStepsChatFlowTicket from "../../ChatFlowServices/VerifyStepsChatFlowTicket";
 import Queue from "../../../libs/Queue";
 // import isMessageExistsService from "../../MessageServices/isMessageExistsService";
@@ -118,7 +118,7 @@ const HandleMessage = async (
           });
         }
 
-        // await verifyBusinessHours(msg, ticket);
+        await verifyBusinessHours(msg, ticket);
         resolve();
       } catch (err) {
         logger.error(err);