fix(#45): ajuste no módulo de campanha para exibir as sessões correta…

…mente. fix: implementado checagem de "auth" para evitar erros no cliclo de vida da autenticação do socket.
ldurans · Nov 14, 2022 · 007c016 · 007c016
1 parent 66912d5
commit 007c016
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 165 deletions.
diff --git a/backend/src/controllers/CampaignController.ts b/backend/src/controllers/CampaignController.ts
@@ -141,7 +141,7 @@ export const startCampaign = async (
     campaignId,
     tenantId,
     options: {
-      delay: 15000
+      delay: 2000
     }
   });
 

diff --git a/backend/src/jobs/SendMessageWhatsappCampaign.ts b/backend/src/jobs/SendMessageWhatsappCampaign.ts
@@ -22,11 +22,8 @@ export default {
       const wbot = getWbot(data.whatsappId);
       let message = {} as WbotMessage;
       if (data.mediaUrl) {
-        const customPath = join(__dirname, "..", "..", "..", "public");
-        const mediaPath = join(
-          process.env.PATH_OFFLINE_MEDIA || customPath,
-          data.mediaName
-        );
+        const customPath = join(__dirname, "..", "..", "public");
+        const mediaPath = join(customPath, data.mediaName);
         const newMedia = MessageMedia.fromFilePath(mediaPath);
         message = await wbot.sendMessage(`${data.number}@c.us`, newMedia, {
           sendAudioAsVoice: true,

diff --git a/backend/src/libs/socketChat/Chat.ts b/backend/src/libs/socketChat/Chat.ts
@@ -447,6 +447,8 @@ events.getOpenChatWindows = (socket: Socket) => {
 };
 
 function register(socket: Socket): void {
+  if (!socket?.user?.tenantId) return;
+
   events.onSetUserIdle(socket);
   events.onSetUserActive(socket);
   events.onUpdateUsers(socket);

diff --git a/backend/src/services/CampaignServices/StartCampaignService.ts b/backend/src/services/CampaignServices/StartCampaignService.ts
@@ -8,7 +8,10 @@ import {
   getDay,
   addDays,
   differenceInSeconds,
-  startOfDay
+  startOfDay,
+  isAfter,
+  isBefore,
+  differenceInDays
 } from "date-fns";
 import { zonedTimeToUtc } from "date-fns-tz";
 import Campaign from "../../models/Campaign";
@@ -66,34 +69,57 @@ const mountMessageData = (
 
 const nextDayHoursValid = (date: Date) => {
   let dateVerify = date;
-  const isValidHour = isWithinInterval(dateVerify, {
-    start: parse("08:00", "HH:mm", new Date()),
-    end: parse("18:00", "HH:mm", new Date())
-  });
+  const dateNow = new Date();
+  const diffDays = differenceInDays(dateVerify, new Date());
+  // se dia for menor que o atual
+  if (diffDays < 0) {
+    dateVerify = addDays(dateVerify, diffDays * -1);
+  }
 
-  if (!isValidHour) {
-    dateVerify = setHours(dateVerify, 8);
+  // se a hora for menor que a atual ao programar a campanha
+  if (dateVerify.getTime() < dateNow.getTime()) {
+    dateVerify = setMinutes(
+      setHours(dateVerify, dateNow.getHours()),
+      dateNow.getMinutes()
+    );
   }
 
-  // Se a data da programação for mario que a
-  // data atual, pular para o proximo dia.
-  if (dateVerify.getTime() < new Date().getTime()) {
-    dateVerify = addDays(dateVerify, 1);
+  const start = parse("08:00", "HH:mm", dateVerify);
+  const end = parse("20:00", "HH:mm", dateVerify);
+
+  const isValidHour = isWithinInterval(dateVerify, { start, end });
+
+  const isDateBefore = isBefore(start, dateVerify);
+  const isDateAfter = isAfter(end, dateVerify);
+
+  // fora do intervalo e menor que a hora inicial
+  if (!isValidHour && isDateBefore) {
+    dateVerify = setMinutes(setHours(dateVerify, 8), 30);
   }
 
-  const isValidDay = getDay(dateVerify) !== 0 && getDay(dateVerify) !== 6;
-
-  if (!isValidDay) {
-    // Se for domingo add 1 dia para segunda
-    if (getDay(dateVerify) === 0) {
-      dateVerify = addDays(dateVerify, 1);
-    }
-    // SE for Sabado add 2 dias para segunda
-    if (getDay(dateVerify) === 6) {
-      dateVerify = addDays(dateVerify, 2);
-    }
+  // fora do intervalo, maior que a hora final e no mesmo dia
+  if (!isValidHour && isDateAfter && diffDays === 0) {
+    dateVerify = addDays(setHours(dateVerify, 8), 1);
   }
 
+  // fora do intervalo, maior que a hora final e dia diferente
+  if (!isValidHour && isDateAfter && diffDays > 0) {
+    dateVerify = setHours(dateVerify, 8);
+  }
+
+  // const isValidDay = getDay(dateVerify) !== 0 && getDay(dateVerify) !== 6;
+
+  // if (!isValidDay) {
+  //   // Se for domingo add 1 dia para segunda
+  //   if (getDay(dateVerify) === 0) {
+  //     dateVerify = addDays(dateVerify, 1);
+  //   }
+  //   // SE for Sabado add 2 dias para segunda
+  //   if (getDay(dateVerify) === 6) {
+  //     dateVerify = addDays(dateVerify, 2);
+  //   }
+  // }
+
   return dateVerify;
 };
 
@@ -132,7 +158,7 @@ const StartCampaignService = async ({
     throw new AppError("ERR_CAMPAIGN_CONTACTS_NOT_EXISTS", 404);
   }
 
-  const timeDelay = options?.delay || 15000;
+  const timeDelay = options?.delay || 5000;
   let dateDelay = setHours(
     setMinutes(zonedTimeToUtc(campaign.start, "America/Sao_Paulo"), 30),
     8

diff --git a/backend/src/services/ChatFlowServices/BuildSendMessageService.ts b/backend/src/services/ChatFlowServices/BuildSendMessageService.ts
@@ -111,13 +111,13 @@ const BuildSendMessageService = async ({
         lastMessageAt: new Date().getTime()
       });
 
-      global.rabbitWhatsapp.publishInQueue(
-        `whatsapp::${tenantId}`,
-        JSON.stringify({
-          ...messageCreated.toJSON(),
-          contact: ticket.contact.toJSON()
-        })
-      );
+      // global.rabbitWhatsapp.publishInQueue(
+      //   `whatsapp::${tenantId}`,
+      //   JSON.stringify({
+      //     ...messageCreated.toJSON(),
+      //     contact: ticket.contact.toJSON()
+      //   })
+      // );
 
       socketEmit({
         tenantId,
@@ -157,13 +157,13 @@ const BuildSendMessageService = async ({
         answered: true
       });
 
-      global.rabbitWhatsapp.publishInQueue(
-        `whatsapp::${tenantId}`,
-        JSON.stringify({
-          ...messageCreated.toJSON(),
-          contact: ticket.contact.toJSON()
-        })
-      );
+      // global.rabbitWhatsapp.publishInQueue(
+      //   `whatsapp::${tenantId}`,
+      //   JSON.stringify({
+      //     ...messageCreated.toJSON(),
+      //     contact: ticket.contact.toJSON()
+      //   })
+      // );
 
       socketEmit({
         tenantId,