merge changes, to merge the updated versions

Merge branch 'el_lojas_melhorias' of github.com:AdrianoRobson/projeto-hit into el_lojas_melhorias

backend/package.json

@@ -8,6 +8,7 @@
     "watch": "tsc -w",
     "start": "nodemon --expose-gc dist/server.js",
     "dev:server": "ts-node-dev --respawn --transpile-only --ignore node_modules src/server.ts",
+    "dev": "nodemon --exec npm run dev:server",
     "pretest": "NODE_ENV=test sequelize db:migrate && NODE_ENV=test sequelize db:seed:all",
     "test": "NODE_ENV=test jest",
     "posttest": "NODE_ENV=test sequelize db:migrate:undo:all"

backend/src/controllers/ReportController.ts

@@ -30,7 +30,6 @@ type IndexQuery = {
   queueId: string;
   pageNumber: string;
   userQueues: [];
-  isRemote: string;
 };
 
 type ReportOnQueue = {
@@ -303,19 +302,15 @@ export const reportService = async (
     throw new AppError("ERR_NO_PERMISSION", 403);
   }
 
-  const { startDate, endDate, queueId, isRemote } = req.query as IndexQuery;
+  const { startDate, endDate, queueId } = req.query as IndexQuery;
 
   console.log(
     `startDate: ${startDate} | endDate: ${endDate} | queueId: ${queueId}`
   );
 
-  console.log("IS REMOTE: ", isRemote);
-  console.log("isRemote: ", isRemote && isRemote == "true" ? true : false);
-
   const reportService = await ReportByNumberQueueService({
     startDate,
-    endDate,
-    isRemote: isRemote && isRemote == "true" ? true : false
+    endDate
   });
 
   return res.status(200).json({ reportService });
@@ -333,13 +328,12 @@ export const reportServiceByQueue = async (
     throw new AppError("ERR_NO_PERMISSION", 403);
   }
 
-  const { startDate, endDate, queueId, isRemote } = req.query as IndexQuery;
+  const { startDate, endDate, queueId } = req.query as IndexQuery;
 
   const reportService = await ReportByNumberQueueService({
     startDate,
     endDate,
-    queue: true,
-    isRemote: isRemote && isRemote == "true" ? true : false
+    queue: true
   });
 
   return res.status(200).json({ reportService });

backend/src/controllers/SettingController.ts

@@ -123,12 +123,11 @@ export const update = async (
     throw new AppError("ERR_NO_PERMISSION", 403);
   }
   const { settingKey: key } = req.params;
-  const { value, obj } = req.body;
+  const { value } = req.body;
 
   const setting = await UpdateSettingService({
     key,
-    value,
-    obj
+    value
   });
 
   if (key && key == "whatsaAppCloudApi") {

backend/src/controllers/TicketController.ts

@@ -75,11 +75,10 @@ import GetProfilePicUrl from "../services/WbotServices/GetProfilePicUrl";
 import CreateContactService from "../services/ContactServices/CreateContactService";
 import { botSendMessage } from "../services/WbotServices/wbotMessageListener";
 import WhatsappQueue from "../models/WhatsappQueue";
-import { del, get, set } from "../helpers/RedisClient";
+import { get } from "../helpers/RedisClient";
 import CountStatusChatEndService from "../services/StatusChatEndService/CountStatusChatEndService";
 import Queue from "../models/Queue";
 import StatusChatEnd from "../models/StatusChatEnd";
-import controllByNumber from "../helpers/controllByNumber";
 
 export const index = async (req: Request, res: Response): Promise<Response> => {
   const {
@@ -102,8 +101,7 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
     queueIds = JSON.parse(queueIdsStringified);
   }
 
-  const { tickets, count, hasMore, remoteTicketsControll } =
-    await ListTicketsService({
+  const { tickets, count, hasMore } = await ListTicketsService({
     searchParam,
     pageNumber,
     status,
@@ -116,9 +114,7 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
     searchParamContent
   });
 
-  return res
-    .status(200)
-    .json({ tickets, count, hasMore, remoteTicketsControll });
+  return res.status(200).json({ tickets, count, hasMore });
 };
 
 export const remoteTicketCreation = async (
@@ -236,8 +232,7 @@ export const remoteTicketCreation = async (
 
     const botInfo = await BotIsOnQueue("botqueue");
 
-    // ticket from queueChoice or bot
-    let ticket: any = await Ticket.findOne({
+    let ticket = await Ticket.findOne({
       where: {
         [Op.or]: [
           { contactId, status: "queueChoice" },
@@ -263,25 +258,7 @@ export const remoteTicketCreation = async (
       }
     }
 
-    ticket = await Ticket.findOne({
-      where: {
-        [Op.or]: [
-          { contactId, status: "pending" },
-          { contactId, status: "open" }
-        ]
-      }
-    });
-
-    if (ticket) {
-      console.log(
-        `THE CAMPAIGN TICKET WAS NOT CREATED BECAUSE THE TICKET IS PENDING OR OPEN`
-      );
-
-      return res.status(422).json({
-        msg: `The campaign ticket was not created because the number ${contact_to} already has a ticket open or pending`
-      });
-    }
-
+    if (!ticket) {
       ticket = await FindOrCreateTicketService(
         contact,
         whatsappId,
@@ -290,22 +267,8 @@ export const remoteTicketCreation = async (
         queueId,
         true
       );
-
-    // botSendMessage(ticket, `${msg}`);
-
-    await ticket.update({
-      lastMessage: msg
-    });
-
-    await set(
-      `remote:ticketId:${ticket.id}`,
-      JSON.stringify({
-        id: ticket.id,
-        createdAt: ticket.createdAt,
-        updatedAt: ticket.updatedAt,
-        whatsappId: ticket.whatsappId
-      })
-    );
+      botSendMessage(ticket, `${msg}`);
+    }
 
     const io = getIO();
     io.to(ticket.status).emit("ticket", {
@@ -313,19 +276,9 @@ export const remoteTicketCreation = async (
       ticket
     });
 
-    const obj = await controllByNumber();
-
-    if (obj?.tickets) {
-      io.emit("remoteTickesControll", {
-        action: "update",
-        tickets: obj.ticketIds
-      });
-    }
-
     console.log(
       `REMOTE TICKET CREATION FROM ENDPOINT | STATUS: 200 | MSG: success`
     );
-
     return res.status(200).json({ msg: "success" });
   }
 
@@ -695,7 +648,5 @@ export const remove = async (
     ticketId: +ticketId
   });
 
-  await del(`remote:ticketId:${ticketId}`);
-
   return res.status(200).json({ message: "ticket deleted" });
 };

backend/src/database/migrations/20240420115601-add-column-remoteDone-to-tickets.ts

@@ -1,15 +0,0 @@
-import { QueryInterface, DataTypes } from "sequelize";
-
-module.exports = {
-  up: (queryInterface: QueryInterface) => {
-    return queryInterface.addColumn("Tickets", "remoteDone", {
-      type: DataTypes.BOOLEAN,
-      allowNull: true,
-      defaultValue: false
-    });
-  },
-
-  down: (queryInterface: QueryInterface) => {
-    return queryInterface.removeColumn("Tickets", "remoteDone");
-  }
-};

backend/src/database/migrations/20240423193637-add-column-obj-to-settings.ts

@@ -1,14 +0,0 @@
-import { QueryInterface, DataTypes } from "sequelize";
-
-module.exports = {
-  up: (queryInterface: QueryInterface) => {
-    return queryInterface.addColumn("Settings", "obj", {
-      type: DataTypes.STRING,
-      allowNull: true
-    });
-  },
-
-  down: (queryInterface: QueryInterface) => {
-    return queryInterface.removeColumn("Settings", "obj");
-  }
-};

backend/src/database/seeds/20240416141716-add-enable-block-audio-video-media-settings.ts

@@ -6,8 +6,8 @@ module.exports = {
       "Settings",
       [
         {
-          key: "remoteTicketSendControll",
-          value: "true",
+          key: "blockAudioVideoMedia",
+          value: "disabled",
           createdAt: new Date(),
           updatedAt: new Date()
         }

backend/src/database/seeds/20240417151300-add-enable-waiting-time-tickets-settings.ts

@@ -0,0 +1,22 @@
+import { QueryInterface } from "sequelize";
+
+module.exports = {
+  up: (queryInterface: QueryInterface) => {
+    return queryInterface.bulkInsert(
+      "Settings",
+      [
+        {
+          key: "waitingTimeTickets",
+          value: "disabled",
+          createdAt: new Date(),
+          updatedAt: new Date()
+        }
+      ],
+      {}
+    );
+  },
+
+  down: (queryInterface: QueryInterface) => {
+    return queryInterface.bulkDelete("Settings", {});
+  }
+};

backend/src/database/seeds/20240417185331-add-enable-notification-transfer-queue.ts

@@ -0,0 +1,22 @@
+import { QueryInterface } from "sequelize";
+
+module.exports = {
+  up: (queryInterface: QueryInterface) => {
+    return queryInterface.bulkInsert(
+      "Settings",
+      [
+        {
+          key: "notificationTransferQueue",
+          value: "disabled",
+          createdAt: new Date(),
+          updatedAt: new Date()
+        }
+      ],
+      {}
+    );
+  },
+
+  down: (queryInterface: QueryInterface) => {
+    return queryInterface.bulkDelete("Settings", {});
+  }
+};

backend/src/helpers/AutoRemoteTickets.ts

@@ -1,78 +0,0 @@
-import { intervalToDuration } from "date-fns";
-import { del, get, set } from "./RedisClient";
-import { getIO } from "../libs/socket";
-import controllByNumber from "./controllByNumber";
-
-let timer: any;
-
-const AutoRemoteTickets = async () => {
-  try {
-    let obj: any = await controllByNumber();
-
-    if (!obj?.tickets) return;
-
-    for (const ticket of obj.tickets) {
-      if (!ticket.includes("messageDateTime")) continue;
-
-      let match = ticket.match(/"messageDateTime":("[^"]*")/);
-      let messageDateTime = match ? match[1] : null;
-      console.log("messageDateTime: ", messageDateTime);
-
-      match = ticket.match(/"whatsappId":(\d+)/);
-      let whatsappId = match ? match[1] : null;
-      console.log("whatsappId: ", whatsappId);
-
-      const whatsapp = await get({
-        key: `whatsapp:${whatsappId}`
-      });
-
-      match = whatsapp.match(/"number":"(\d+)"/);
-      let number = match ? match[1] : null;
-      console.log("number: ", number);
-
-      match = ticket.match(/"id":(\d+)/);
-      let ticketId = match ? match[1] : null;
-      console.log("ticketId: ", ticketId);
-
-      number = JSON.parse(number);
-      ticketId = JSON.parse(ticketId);
-
-      let timeDiff: any = intervalToDuration({
-        start: new Date(JSON.parse(messageDateTime)),
-        end: new Date()
-      });
-
-      console.log("______timeDiff: ", timeDiff);
-
-      if (timeDiff.seconds > 50) {
-        del(`remote:ticketId:${ticketId}`);
-
-        obj = await controllByNumber();
-
-        const io = getIO();
-        io.emit("remoteTickesControll", {
-          action: "update",
-          tickets: obj.ticketIds
-        });
-      }
-    }
-  } catch (error) {
-    console.log("There was an error on auto remote tickets service: ", error);
-  }
-};
-
-const schedule = async () => {
-  try {
-    clearInterval(timer);
-
-    await AutoRemoteTickets();
-  } catch (error) {
-    console.log("error on schedule: ", error);
-  } finally {
-    timer = setInterval(schedule, 5000);
-  }
-};
-
-timer = setInterval(schedule, 5000);
-
-export default schedule;

backend/src/helpers/RedisClient.ts

@@ -31,7 +31,6 @@ export async function get({ key, value, parse }: getData) {
   if (key.includes("*")) {
     const keys = await redis.keys(key);
     if (keys.length > 0) {
-      if (value) {
       for (const key of keys) {
         const val = await redis.get(key);
         if (val.includes(value)) {
@@ -39,15 +38,6 @@ export async function get({ key, value, parse }: getData) {
           return val;
         }
       }
-      } else {
-        let res: any[] = [];
-        for (const key of keys) {
-          const val = await redis.get(key);
-          if (parse) res.push(JSON.parse(val));
-          res.push(val);
-        }
-        return res;
-      }
     }
     return null;
   } else {

backend/src/helpers/controllByNumber.ts

@@ -1,41 +0,0 @@
-import { get, set } from "./RedisClient";
-
-async function controllByNumber() {
-  let tickets = await get({ key: "remote:ticketId*", parse: false }); 
-
-  if (!tickets) return { ticketIds: [], tickets: null };
-
-  let controll: any[] = [];
-
-  for (const ticket of tickets) {
-    let match = ticket.match(/"whatsappId":(\d+)/);
-    let whatsappId = match ? match[1] : null; 
-
-    const whatsapp = await get({
-      key: `whatsapp:${whatsappId}`
-    });
-
-    match = whatsapp.match(/"number":"(\d+)"/);
-    let number = match ? match[1] : null; 
-
-    match = ticket.match(/"id":(\d+)/);
-    let ticketId = match ? match[1] : null; 
-
-    number = JSON.parse(number);
-    ticketId = JSON.parse(ticketId); 
-
-    const index = controll.findIndex((c: any) => c.number == number);
-
-    if (index == -1) {
-      controll.push({ ticketId, number });
-    }
-  }
-
-  const ticketIds = controll.map((c: any) => c.ticketId); 
-
-  set(`remote:controll`, JSON.stringify(ticketIds));
-
-  return { ticketIds, tickets };
-}
-
-export default controllByNumber;

backend/src/models/Setting.ts

@@ -16,9 +16,6 @@ class Setting extends Model<Setting> {
   @Column
   value: string;
 
-  @Column
-  obj: string;
-
   @CreatedAt
   createdAt: Date;
 

backend/src/models/Ticket.ts

@@ -21,7 +21,7 @@ import User from "./User";
 import Whatsapp from "./Whatsapp";
 
 import SchedulingNotify from "./SchedulingNotify";
-import StatusChatEnd from "./StatusChatEnd";
+import StatusChatEnd from "./StatusChatEnd"
 
 @Table
 class Ticket extends Model<Ticket> {
@@ -47,10 +47,6 @@ class Ticket extends Model<Ticket> {
   @Column
   isRemote: boolean;
 
-  @Default(false)
-  @Column
-  remoteDone: boolean;
-
   @ForeignKey(() => StatusChatEnd)
   @Column
   statusChatEndId: number;

backend/src/routes/settingRoutes.ts

@@ -9,7 +9,7 @@ settingRoutes.get("/settings", SettingController.index);
 
 settingRoutes.get("/settings/ticket/:number", SettingController.ticketSettings);     
 
-// settingRoutes.get("/settings/:settingKey", isAuth, SettingsController.show);
+// routes.get("/settings/:settingKey", isAuth, SettingsController.show);
 
 settingRoutes.put(
   "/settings/ticket",

backend/src/server.ts

@@ -13,7 +13,6 @@ import { loadContactsCache } from "./helpers/ContactsCache";
 import { loadSchedulesCache } from "./helpers/SchedulingNotifyCache";
 import { delRestoreControllFile } from "./helpers/RestoreControll";
 import "./helpers/AutoCloseTickets";
-import "./helpers/AutoRemoteTickets"
 
 import "./helpers/SchedulingNotifySendMessage";
 import axios from "axios";
@@ -91,17 +90,6 @@ gracefulShutdown(server);
         const { phoneNumberId, id, greetingMessage } = whatsapps[i];
 
         if (phoneNumberId) {
-          // await set(
-          //   `whatsapp:${whatsapps[i].dataValues.id}`,
-          //   JSON.stringify({
-          //     number: whatsapps[i].dataValues.number,
-          //     id,
-          //     greetingMessage,
-          //     phoneNumberId
-          //   })
-          // );
-        }
-
           await set(
             `whatsapp:${whatsapps[i].dataValues.id}`,
             JSON.stringify({
@@ -111,6 +99,7 @@ gracefulShutdown(server);
               phoneNumberId
             })
           );
+        }
 
         if (phoneNumberId) {
           continue;

backend/src/services/MessageServices/CreateMessageService.ts

@@ -1,5 +1,4 @@
 import AppError from "../../errors/AppError";
-import { get, set } from "../../helpers/RedisClient";
 import { updateTicketCacheByTicketId } from "../../helpers/TicketCache";
 import { getIO } from "../../libs/socket";
 import Message from "../../models/Message";
@@ -23,7 +22,9 @@ interface Request {
 const CreateMessageService = async ({
   messageData
 }: Request): Promise<Message> => {  
+
   try {
+    
     await Message.upsert(messageData);
 
     const message = await Message.findByPk(messageData.id, {
@@ -46,28 +47,6 @@ const CreateMessageService = async ({
       throw new Error("ERR_CREATING_MESSAGE");
     }
 
-    //////////////////// SETTINGS ///////////////////////////
-    let ticketRemote = await get({
-      key: `remote:ticketId:${message.ticket.id}`
-    });
-
-    if (ticketRemote && !ticketRemote.includes("messageDateTime")) {
-      ticketRemote = JSON.parse(ticketRemote);
-
-      ticketRemote = {
-        ...ticketRemote,
-        ...{ messageDateTime: message.createdAt }
-      };
-
-      const ticket = await Ticket.findByPk(message.ticket.id);
-      ticket?.update({ remoteDone: true });
-
-      console.log('MESSAGE SERVICE: XXXXXXXXXXXXXXXXXXXXXXX')
-
-      set(`remote:ticketId:${message.ticket.id}`, JSON.stringify(ticketRemote));
-    }
-    //////////////////////////////////////////////////////////
-
     if (message.ticket.status != "queueChoice") { 
       await updateTicketCacheByTicketId(message.ticket.id, {
         lastMessage: message.body,

backend/src/services/ReportServices/ReportByNumberQueueService.ts

@@ -15,17 +15,14 @@ interface Request {
   startDate: string | number;
   endDate: string;
   queue?: boolean;
-  isRemote?: boolean;
 }
 
 const ReportByNumberQueueService = async ({
   startDate,
   endDate,
-  queue = false,
-  isRemote = false
+  queue = false
 }: Request): Promise<any[]> => {
   let reportServiceData: any[] = [];
-  const includeIsRemote = isRemote ? "t.isRemote = true AND" : "";
 
   const whatsapps = await Whatsapp.findAll();
 
@@ -33,11 +30,6 @@ const ReportByNumberQueueService = async ({
     for (const whatsapp of whatsapps) {
       const { id, name, number } = whatsapp;
 
-      let startedByClient: any;
-      let avgChatWaitingTime: any;
-      let pendingChat: any;
-      let closedChat: any;
-
       if (
         !number ||
         reportServiceData.findIndex((w: any) => w?.number == number) != -1
@@ -53,16 +45,15 @@ const ReportByNumberQueueService = async ({
         JOIN Messages m ON t.id = m.ticketId 
         JOIN Whatsapps w ON t.whatsappId = w.id
         JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999' 
+        WHERE DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999' 
         AND m.createdAt = (SELECT MIN(createdAt) FROM Messages WHERE ticketId = t.id) 
         AND m.fromAgent = 1 
         AND w.number = ${number};`,
         { type: QueryTypes.SELECT }
       );
 
-      if (!isRemote) {
       // CHAT STARTED BY CLIENT
-        startedByClient = await sequelize.query(
+      const startedByClient: any = await sequelize.query(
         `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -74,25 +65,9 @@ const ReportByNumberQueueService = async ({
         AND w.number = ${number};`,
         { type: QueryTypes.SELECT }
       );
-      } else {
-        // CHAT RESPONSE BY CLIENT
-        startedByClient = await sequelize.query(
-          `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-        FROM Tickets t 
-        JOIN Messages m ON t.id = m.ticketId 
-        JOIN Whatsapps w ON t.whatsappId = w.id
-        JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-        AND m.createdAt = (SELECT MAX(createdAt) FROM Messages WHERE ticketId = t.id) 
-        AND m.fromMe = 0 
-        AND w.number = ${number};`,
-          { type: QueryTypes.SELECT }
-        );
-      }
 
-      if (!isRemote) {
       // CHAT CLOSED
-        closedChat = await sequelize.query(
+      const closedChat: any = await sequelize.query(
         `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -103,23 +78,9 @@ const ReportByNumberQueueService = async ({
         AND w.number = ${number};`,
         { type: QueryTypes.SELECT }
       );
-      } else {
-        // CHAT CLOSED
-        closedChat = await sequelize.query(
-          `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-        FROM Tickets t  
-        JOIN Whatsapps w ON t.whatsappId = w.id
-        JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(t.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-        AND t.status = 'closed' 
-        AND w.number = ${number};`,
-          { type: QueryTypes.SELECT }
-        );
-      }
 
-      if (!isRemote) {
       // CHAT WAINTING TIME
-        avgChatWaitingTime = await sequelize.query(
+      const avgChatWaitingTime: any = await sequelize.query(
         `
         SELECT  TIME_FORMAT(
         SEC_TO_TIME( 
@@ -158,11 +119,9 @@ const ReportByNumberQueueService = async ({
         WAITING_TIME;`,
         { type: QueryTypes.SELECT }
       );
-      }
 
-      if (!isRemote) {
       // CHAT PENDING
-        pendingChat = await sequelize.query(
+      const pendingChat: any = await sequelize.query(
         `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -174,39 +133,21 @@ const ReportByNumberQueueService = async ({
 
         { type: QueryTypes.SELECT }
       ); 
-      } else {
-        // CHAT PENDING REMOTE
-        pendingChat = await sequelize.query(
-          `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-        FROM Tickets t  
-        JOIN Whatsapps w ON t.whatsappId = w.id
-        JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(t.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-        AND t.status = 'pending' 
-        AND w.number = ${number};`,
-
-          { type: QueryTypes.SELECT }
-        );
-      }
  
       reportServiceData.push({
         id,
         name,
         number,
         startedByAgent: startedByAgent[0]?.ticket_count,
-        startedByClient: startedByClient ? startedByClient[0]?.ticket_count : 0,
+        startedByClient: startedByClient[0]?.ticket_count,
         closedChat: closedChat[0]?.ticket_count,
-        avgChatWaitingTime: avgChatWaitingTime ? avg(avgChatWaitingTime) : 0,
+        avgChatWaitingTime: avg(avgChatWaitingTime),
         pendingChat: pendingChat[0]?.ticket_count
       });
     }
   } else {
     for (const whatsapp of whatsapps) {
       const { id, name, number } = whatsapp;
-      let startedByClient: any;
-      let avgChatWaitingTime: any;
-      let pendingChat: any;
-      let closedChat: any;
 
       if (
         !number ||
@@ -231,16 +172,15 @@ const ReportByNumberQueueService = async ({
         JOIN Messages m ON t.id = m.ticketId 
         JOIN Whatsapps w ON t.whatsappId = w.id
         JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999' 
+        WHERE DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999' 
         AND m.createdAt = (SELECT MIN(createdAt) FROM Messages WHERE ticketId = t.id) 
         AND m.fromAgent = 1 
         AND q.id = ${q.id};`,
           { type: QueryTypes.SELECT }
         );
 
-        if (!isRemote) {
         // CHAT STARTED BY CLIENT
-          startedByClient = await sequelize.query(
+        const startedByClient: any = await sequelize.query(
           `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -252,25 +192,9 @@ const ReportByNumberQueueService = async ({
         AND q.id = ${q.id};`,
           { type: QueryTypes.SELECT }
         );
-        } else {
-          // CHAT RESPONSE BY CLIENT
-          startedByClient = await sequelize.query(
-            `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-        FROM Tickets t 
-        JOIN Messages m ON t.id = m.ticketId 
-        JOIN Whatsapps w ON t.whatsappId = w.id
-        JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(m.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-        AND m.createdAt = (SELECT MAX(createdAt) FROM Messages WHERE ticketId = t.id) 
-        AND m.fromMe = 0 
-        AND q.id = ${q.id};`,
-            { type: QueryTypes.SELECT }
-          );
-        }
 
-        if (!isRemote) {
         // CHAT CLOSED
-           closedChat = await sequelize.query(
+        const closedChat: any = await sequelize.query(
           `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -281,24 +205,9 @@ const ReportByNumberQueueService = async ({
        AND q.id = ${q.id};`,
           { type: QueryTypes.SELECT }
         );
-        }
-        else{
-          // CHAT CLOSED REMOTE
-          closedChat = await sequelize.query(
-            `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-            FROM Tickets t  
-            JOIN Whatsapps w ON t.whatsappId = w.id
-            JOIN Queues q ON q.id = t.queueId
-            WHERE ${includeIsRemote} DATE(t.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-            AND t.status = 'closed' 
-            AND q.id = ${q.id};`,
-            { type: QueryTypes.SELECT }
-          );
-        }
 
-        if (!isRemote) {
         // CHAT WAINTING TIME
-          avgChatWaitingTime = await sequelize.query(
+        const avgChatWaitingTime: any = await sequelize.query(
           `SELECT TIME_FORMAT(
         SEC_TO_TIME(
              TIMESTAMPDIFF(
@@ -335,11 +244,9 @@ const ReportByNumberQueueService = async ({
         WAITING_TIME;`,
           { type: QueryTypes.SELECT }
         );
-        }
 
-        if (!isRemote) {
         // CHAT PENDING
-          pendingChat = await sequelize.query(
+        const pendingChat: any = await sequelize.query(
           `SELECT COUNT(DISTINCT t.id) AS ticket_count       
         FROM Tickets t 
         JOIN Messages m ON t.id = m.ticketId 
@@ -351,20 +258,6 @@ const ReportByNumberQueueService = async ({
 
           { type: QueryTypes.SELECT }
         ); 
-        } else {
-          // CHAT PENDING REMOTE
-          pendingChat = await sequelize.query(
-            `SELECT COUNT(DISTINCT t.id) AS ticket_count       
-        FROM Tickets t  
-        JOIN Whatsapps w ON t.whatsappId = w.id
-        JOIN Queues q ON q.id = t.queueId
-        WHERE ${includeIsRemote} DATE(t.createdAt) BETWEEN '${startDate} 00:00:00.000000' AND '${endDate} 23:59:59.999999'  
-        AND t.status = 'pending' 
-        AND q.id = ${q.id};`,
-
-            { type: QueryTypes.SELECT }
-          );
-        }
 
         reportServiceData.push({
           id,
@@ -373,11 +266,9 @@ const ReportByNumberQueueService = async ({
           queueName: q.name,
           queueColor: q.color,
           startedByAgent: startedByAgent[0]?.ticket_count,
-          startedByClient: startedByClient
-            ? startedByClient[0]?.ticket_count
-            : 0,
+          startedByClient: startedByClient[0]?.ticket_count,
           closedChat: closedChat[0]?.ticket_count,
-          avgChatWaitingTime: avgChatWaitingTime ? avg(avgChatWaitingTime) : 0,
+          avgChatWaitingTime: avg(avgChatWaitingTime),
           pendingChat: pendingChat[0]?.ticket_count
         });
       }
@@ -392,23 +283,23 @@ export default ReportByNumberQueueService;
 function avg(avgChatWaitingTime: any) {
   let waitingAVG: any = avgChatWaitingTime
     .filter((t: any) => t?.WAITING_TIME)
-    .map((t: any) => t.WAITING_TIME);
+    .map((t: any) => t.WAITING_TIME)
 
   if (waitingAVG.length > 0) {
-    let midIndex = Math.floor((0 + waitingAVG.length) / 2);
+    let midIndex = Math.floor((0 + waitingAVG.length) / 2)
 
     if (waitingAVG.length % 2 == 1) {
-      waitingAVG = waitingAVG[midIndex];
+      waitingAVG = waitingAVG[midIndex]
     } else {
       waitingAVG = calculateAverageTime(
         waitingAVG[midIndex - 1],
         waitingAVG[midIndex]
-      );
+      )
     }
   } else {
-    waitingAVG = 0;
+    waitingAVG = 0
   }
-  return waitingAVG;
+  return waitingAVG
 }
 
 function calculateAverageTime(time1: string, time2: string) {

backend/src/services/SettingServices/UpdateSettingService.ts

@@ -4,15 +4,12 @@ import Setting from "../../models/Setting";
 interface Request {
   key: string;
   value: string;
-  obj?: string;
 }
 
 const UpdateSettingService = async ({
   key,
-  value,
-  obj
+  value
 }: Request): Promise<Setting | undefined> => {
-  console.log("key: ", key, " | value: ", value, " | obj: ", obj);
 
   try {
     const setting = await Setting.findOne({
@@ -23,16 +20,12 @@ const UpdateSettingService = async ({
       throw new AppError("ERR_NO_SETTING_FOUND", 404);
     }
 
-    if (obj) {
-      obj = JSON.stringify(obj);
-    }
-    await setting.update({ value, obj });
-
-    await setting.reload();
+    await setting.update({ value });
 
     return setting;
+
   } catch (error: any) {
-    console.error("===> Error on UpdateSettingService.ts file: \n", error);
+    console.error('===> Error on UpdateSettingService.ts file: \n', error)
     throw new AppError(error.message);
   }
 };

backend/src/services/TicketServices/ListTicketsService.ts

@@ -20,7 +20,6 @@ import ListTicketServiceCache from "./ListTicketServiceCache";
 import { searchTicketCache, loadTicketsCache } from "../../helpers/TicketCache";
 import { getWbot } from "../../libs/wbot";
 import User from "../../models/User";
-import { get } from "../../helpers/RedisClient";
 
 interface Request {
   searchParam?: string;
@@ -39,7 +38,6 @@ interface Response {
   tickets: Ticket[];
   count: number;
   hasMore: boolean;
-  remoteTicketsControll?: object[];
 }
 
 const ListTicketsService = async ({
@@ -232,7 +230,7 @@ const ListTicketsService = async ({
 
   console.log("kkkkkkkkk limit: ", limit);
 
-  let { count, rows: tickets } = await Ticket.findAndCountAll({
+  const { count, rows: tickets } = await Ticket.findAndCountAll({
     where: whereCondition,
     include: includeCondition,
     distinct: true,
@@ -243,13 +241,10 @@ const ListTicketsService = async ({
 
   const hasMore = count > offset + tickets.length;
 
-  const ticketIds = await get({ key: `remote:controll`, parse: true });   
-  
   return {
     tickets,
     count,
-    hasMore,
-    remoteTicketsControll: ticketIds ? ticketIds : []
+    hasMore
   };
 };
 

backend/src/services/TicketServices/UpdateTicketService.ts

@@ -10,7 +10,7 @@ import { createOrUpdateTicketCache } from "../../helpers/TicketCache";
 import AppError from "../../errors/AppError";
 import sendWhatsAppMessageSocket from "../../helpers/SendWhatsappMessageSocket";
 import BotIsOnQueue from "../../helpers/BotIsOnQueue";
-import { del, deleteObject, get, set } from "../../helpers/RedisClient";
+import { deleteObject } from "../../helpers/RedisClient";
 var flatten = require("flat");
 
 interface TicketData {
@@ -71,23 +71,6 @@ const UpdateTicketService = async ({
       await CheckContactOpenTickets(ticket.contact.id, ticket.whatsappId);
     }
 
-    if (status == "closed") {
-      del(`remote:ticketId:${ticket.id}`);
-
-      let ticketsIds = await get({ key: `remote:controll`, parse: true });
-      const index = ticketsIds.findIndex((t: any) => t == ticket.id);
-
-      console.log("ticketsIds 1: ", ticketsIds);
-
-      if (index != -1) {
-        ticketsIds.splice(index, 1);
-
-        console.log("ticketsIds 2: ", ticketsIds);
-
-        set(`remote:controll`, JSON.stringify(ticketsIds));
-      }
-    }
-
     await ticket.update({
       status,
       queueId,

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -94,8 +94,7 @@ import {
   findByContain,
   findObject,
   get,
-  getSimple,
-  set
+  getSimple
 } from "../../helpers/RedisClient";
 import FindOrCreateTicketServiceBot from "../TicketServices/FindOrCreateTicketServiceBot";
 import ShowTicketService from "../TicketServices/ShowTicketService";
@@ -170,7 +169,7 @@ const verifyMediaMessage = async (
   if (!media) {
     throw new Error("ERR_WAPP_DOWNLOAD_MEDIA");
   }
-
+  let mediaAuthorized = true;
   let messageData = {
     id: msg.id.id,
     ticketId: ticket.id,
@@ -184,7 +183,9 @@ const verifyMediaMessage = async (
     phoneNumberId: msg?.phoneNumberId,
     fromAgent: false
   };
-
+  if(messageData.mediaType === 'video' || messageData.mediaType === 'audio' && getSettingValue('blockAudioVideoMedia')?.value === 'enabled'){
+    mediaAuthorized = false;
+  }
   if (msg?.fromMe) {
     messageData = { ...messageData, fromAgent: true };
   }
@@ -199,7 +200,7 @@ const verifyMediaMessage = async (
         body: media.filename
       };
     }
-
+    if(mediaAuthorized){
       try {
         await writeFileAsync(
           join(__dirname, "..", "..", "..", "..", "..", "public", media.filename),
@@ -211,11 +212,24 @@ const verifyMediaMessage = async (
           logger.error(`There was an error: wbotMessageLitener.ts: ${err}`);
         }
     }
-
+  }
+  if(mediaAuthorized){
     await ticket.update({ lastMessage: msg.body || media.filename });
     const newMessage = await CreateMessageService({ messageData });
-
     return newMessage;
+  }else{
+    if (ticket.status !== "queueChoice") { 
+    botSendMessage(
+      ticket,
+      `Atenção! Mensagem ignorada, tipo de mídia não suportado.`
+      );
+    }
+      messageData.body = `Mensagem de *${messageData.mediaType}* ignorada, tipo de mídia não suportado.`;
+      messageData.mediaUrl = '';
+      await ticket.update({ lastMessage: `Mensagem de *${messageData.mediaType}* ignorada, tipo de mídia não suportado.`});
+      const newMessage = await CreateMessageService({ messageData });
+      console.log(`--------->>> Mensagem do tipo: ${messageData.mediaType}, ignorada!`)
+  }
 };
 
 // const verifyMediaMessage = async (
@@ -413,13 +427,15 @@ const verifyQueue = async (
     }
 
     let body = "";
-
+    const io = getIO();
     if (botOptions.length > 0) {
       body = `\u200e${choosenQueue.greetingMessage}\n\n${botOptions}\n${final_message.msg}`;
     } else {
       body = `\u200e${choosenQueue.greetingMessage}`;
     }
 
+    io.emit('notifyPeding', {data: {ticket, queue: choosenQueue}});
+
     sendWhatsAppMessageSocket(ticket, body);
   } else {
     //test del transfere o  atendimento se entrar na ura infinita
@@ -767,6 +783,9 @@ const handleMessage = async (
     if (getSettingValue("oneContactChatWithManyWhats")?.value == "disabled") {
       // Para responder para o cliente pelo mesmo whatsapp que ele enviou a mensagen
       if (wbot.id != ticket.whatsappId) {
+        // console.log('PARA RESPONDER PELO MEMOS WHATSAPP wbot.id: ', wbot.id, ' | wbot.status: ', wbot.status)
+        // console.log('WHATSAPP STATUS ticket.whatsappId: ', ticket.whatsappId)
+
         try {
           await ticket.update({ whatsappId: wbot.id });
         } catch (error: any) {

frontend/src/components/MessageInput/index.js

@@ -43,7 +43,6 @@ import { TabTicketContext } from "../../context/TabTicketHeaderOption/TabTicketH
 import ModalTemplate from "../ModalTemplate"
 
 import { render } from '@testing-library/react'
-import { countTicketMsgContext } from "../../context/CountTicketMsgProvider/CountTicketMsgProvider"
 
 const Mp3Recorder = new MicRecorder({ bitRate: 128 })
 
@@ -209,12 +208,10 @@ const useStyles = makeStyles((theme) => ({
   },
 }))
 
-const MessageInput = ({ ticketStatus, ticketLastMessage, ticketIsRemote }) => {
+const MessageInput = ({ ticketStatus }) => {
 
   const { tabOption, setTabOption } = useContext(TabTicketContext)
 
-  const { countTicketMsg, setCountTicketMsg } = useContext(countTicketMsgContext)
-
   const classes = useStyles()
   const { ticketId } = useParams()
 
@@ -236,21 +233,11 @@ const MessageInput = ({ ticketStatus, ticketLastMessage, ticketIsRemote }) => {
 
   const isRun = useRef(false)
 
+
   useEffect(() => {
     inputRef.current.focus()
   }, [replyingMessage])
 
-
-  useEffect(() => {
-
-    if (ticketIsRemote && countTicketMsg === 0 && ticketLastMessage && ticketLastMessage.trim().length > 0) {
-      setInputMessage(ticketLastMessage)
-    }
-    else {
-      setInputMessage("")
-    }
-  }, [countTicketMsg, ticketIsRemote, ticketLastMessage])
-
   useEffect(() => {
     inputRef.current.focus()
     return () => {
@@ -365,8 +352,6 @@ const MessageInput = ({ ticketStatus, ticketLastMessage, ticketIsRemote }) => {
         setTemplates(data.data)
       }
 
-      setCountTicketMsg(1)
-
     } catch (err) {
       toastError(err)
     }

frontend/src/components/MessagesList/index.js

@@ -34,7 +34,6 @@ import whatsBackground from "../../assets/wa-background.png"
 
 import api from "../../services/api"
 import toastError from "../../errors/toastError"
-import { CountTicketMsgProvider, countTicketMsgContext } from "../../context/CountTicketMsgProvider/CountTicketMsgProvider"
 
 const useStyles = makeStyles((theme) => ({
   messagesListWrapper: {
@@ -329,8 +328,6 @@ const MessagesList = ({ ticketId, isGroup }) => {
 
   const { user } = useContext(AuthContext)
 
-  const { setCountTicketMsg } = useContext(countTicketMsgContext)
-
   useEffect(() => {
     dispatch({ type: "RESET" })
     setPageNumber(1)
@@ -412,11 +409,6 @@ const MessagesList = ({ ticketId, isGroup }) => {
           })
 
           if (currentTicketId.current === ticketId) {
-
-            if (data?.messages) {
-              setCountTicketMsg(data.messages.length)
-            }
-
             dispatch({ type: "LOAD_MESSAGES", payload: data.messages })
             setHasMore(data.hasMore)
             setLoading(false)

frontend/src/components/NotificationsPopOver/index.js

@@ -20,6 +20,9 @@ import useTickets from "../../hooks/useTickets"
 import alertSound from "../../assets/sound.mp3"
 import { AuthContext } from "../../context/Auth/AuthContext"
 
+import api from "../../services/api";
+import toastError from "../../errors/toastError";
+
 const useStyles = makeStyles(theme => ({
 	tabContainer: {
 		overflowY: "auto",
@@ -83,7 +86,7 @@ const NotificationsPopOver = () => {
 	const historyRef = useRef(history)
 
 	const { handleLogout } = useContext(AuthContext)
-
+	const [settings, setSettings] = useState([]);
 	// const [lastRef] = useState(+history.location.pathname.split("/")[2])
 
 
@@ -110,7 +113,22 @@ const NotificationsPopOver = () => {
 		ticketIdRef.current = ticketIdUrl
 	}, [ticketIdUrl])
 
+	useEffect(() => {
+		const fetchSession = async () => {
+		  try {
+			const { data } = await api.get('/settings')
+			setSettings(data.settings)
+		  } catch (err) {
+			toastError(err)
+		  }
+		}
+		fetchSession()
+	  }, [])
 
+	  const getSettingValue = (key) => {
+		const { value } = settings.find((s) => s.key === key)
+		return value
+	  }
 
 	useEffect(() => {
 
@@ -255,18 +273,22 @@ const NotificationsPopOver = () => {
 
 				if (shouldNotNotificate) return
 
-
-
 				handleNotifications(data)
 			}
 		})
 
+		socket.on('notifyPeding', data =>{
+			if(settings?.length > 0 && getSettingValue('notificationTransferQueue') === 'enabled') handleNotifications("", data);
+		});
+
 		return () => {
 			socket.disconnect()
 		}
-	}, [user])
+	}, [user, settings])
 
-	const handleNotifications = data => {
+    const handleNotifications = (data, notify) => {
+		let isQueue = false;
+		if(!notify){
 			const { message, contact, ticket } = data
 
 			const options = {
@@ -297,7 +319,34 @@ const NotificationsPopOver = () => {
 				}
 				return [notification, ...prevState]
 			})
+		}else{
+			user.queues.forEach(queue =>{
+				if(queue.id === notify.data?.queue?.id){
+					isQueue = true;
+				}
+			})
+			if(!isQueue){
+				return;
+			}else {
+				const notification = new Notification(`${i18n.t("tickets.notification.messagePeding")} ${notify.data?.queue?.name}`);
+				notification.onclick = e => {
+					e.preventDefault()
+					window.focus()
+					historyRef.current.push(`/tickets`)
+				}
 
+				setDesktopNotifications(prevState => {
+					const notfiticationIndex = prevState.findIndex(
+						n => n.tag === notification.tag
+					)
+					if (notfiticationIndex !== -1) {
+						prevState[notfiticationIndex] = notification
+						return [...prevState]
+					}
+					return [notification, ...prevState]
+				})
+			}
+		}		
 		soundAlertRef.current()
 	}
 

frontend/src/components/Ticket/index.js

@@ -16,7 +16,6 @@ import MessagesList from "../MessagesList"
 import api from "../../services/api"
 import { ReplyMessageProvider } from "../../context/ReplyingMessage/ReplyingMessageContext"
 import toastError from "../../errors/toastError"
-import { CountTicketMsgProvider } from "../../context/CountTicketMsgProvider/CountTicketMsgProvider"
 
 const drawerWidth = 320
 
@@ -193,21 +192,11 @@ const Ticket = () => {
           </div>
         </TicketHeader>
         <ReplyMessageProvider>
-
-          <CountTicketMsgProvider>
-
           <MessagesList
             ticketId={ticketId}
             isGroup={ticket.isGroup}
-            />
-
-            <MessageInput
-              ticketStatus={ticket.status}
-              ticketLastMessage={ticket?.lastMessage}
-              ticketIsRemote={ticket?.isRemote} />
-
-          </CountTicketMsgProvider>
-
+          ></MessagesList>
+          <MessageInput ticketStatus={ticket.status} />
         </ReplyMessageProvider>
       </Paper>
       <ContactDrawer

frontend/src/components/TicketListItem/index.js

@@ -22,7 +22,6 @@ import MarkdownWrapper from "../MarkdownWrapper"
 import { Tooltip } from "@material-ui/core"
 import { AuthContext } from "../../context/Auth/AuthContext"
 import toastError from "../../errors/toastError"
-import openSocket from 'socket.io-client'
 
 const useStyles = makeStyles(theme => ({
 	ticket: {
@@ -102,15 +101,13 @@ const useStyles = makeStyles(theme => ({
 	},
 }))
 
-const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
+const TicketListItem = ({ ticket }) => {
 	const classes = useStyles()
 	const history = useHistory()
 	const [loading, setLoading] = useState(false)
 	const { ticketId } = useParams()
 	const isMounted = useRef(true)
-	const { user, getSettingValue } = useContext(AuthContext)
-	const [_remoteTicketsControll, setRemoteTicketsControll] = useState([])
-	const [_settings, setSettings] = useState(null)
+	const { user } = useContext(AuthContext)
 
 	useEffect(() => {
 		return () => {
@@ -118,14 +115,6 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 		}
 	}, [])
 
-	useEffect(() => {
-		setSettings(settings)
-	}, [settings])
-
-	useEffect(() => {
-		setRemoteTicketsControll(remoteTicketsControll)
-	}, [remoteTicketsControll, settings])
-
 	const handleAcepptTicket = async id => {
 		setLoading(true)
 		try {
@@ -142,6 +131,8 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 			setLoading(false)
 		}
 
+
+
 		history.push(`/tickets/${id}`)
 	}
 
@@ -149,46 +140,8 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 		history.push(`/tickets/${id}`)
 	}
 
-
-	useEffect(() => {
-		const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
-
-		socket.on('remoteTickesControll', (data) => {
-			console.log('REMOTE TICKETS CONTROLL UPDATE2: ', data.tickets)
-			if (data.action === 'update') {
-				setRemoteTicketsControll(data.tickets)
-			}
-		})
-
-
-		socket.on('settings', (data) => {
-			if (data.action === 'update') {
-				setSettings((prevState) => {
-					const aux = [...prevState]
-					const settingIndex = aux.findIndex((s) => s.key === data.setting.key)
-					aux[settingIndex].value = data.setting.value
-					return aux
-				})
-			}
-		})
-
-
-		return () => {
-			socket.disconnect()
-		}
-	}, [])
-
 	return (
 		<React.Fragment key={ticket.id}>
-			<Tooltip
-				arrow
-				placement="right"
-				title={
-					(ticket?.isRemote && ticket?.remoteDone && ticket.status === 'pending') ? "Mensagem de campanha enviada" : (ticket?.isRemote && ticket.status === 'pending') ? "Mensagem de campanha ainda não enviada" :
-						""
-				}
-
-			>
 			<ListItem
 				dense
 				button
@@ -200,11 +153,6 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 				className={clsx(classes.ticket, {
 					[classes.pendingTicket]: ticket.status === "pending",
 				})}
-
-					style={((ticket.status === "open" || ticket.status === "closed") && ticket?.isRemote) ? {
-						border: (ticket.status === "open" || ticket.status === "closed") ? "1px solid rgba(121,123,127,0.9)" : "1px solid transparent",
-					} : {}}
-
 			>
 				<Tooltip
 					arrow
@@ -290,51 +238,28 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 					}
 				/>
 				{ticket.status === "pending" && (
-
-
 					<ButtonWithSpinner
-							// color="primary"
-
-							{...((ticket?.isRemote) ?
-								((settings &&
-									settings.length > 0 &&
-									getSettingValue('remoteTicketSendControll') &&
-									getSettingValue('remoteTicketSendControll') === 'enabled') && !ticket?.remoteDone && !_remoteTicketsControll?.includes(+ticket.id)) ?
-									{ style: { backgroundColor: "rgba(121,123,127,0.5)", color: "white" } } :
-									{ style: { backgroundColor: "rgba(121,123,127,0.9)", color: "white" } } :
-
-								{ color: "primary" })}
-
+						color="primary"
 						variant="contained"
-
-							disabled={true ? ((settings &&
-								settings.length > 0 &&
-								getSettingValue('remoteTicketSendControll') &&
-								getSettingValue('remoteTicketSendControll') === 'enabled') && ticket?.isRemote && !ticket?.remoteDone && !_remoteTicketsControll?.includes(+ticket.id)) : false}
-
 						className={classes.acceptButton}
 						size="small"
 						loading={loading}
 						onClick={e => handleAcepptTicket(ticket.id)}
 					>
-
+						{/* {i18n.t("ticketsList.buttons.accept")} */}
 						<>
-								{(ticket?.isRemote && !ticket?.remoteDone) ? (
+							{/* {i18n.t("ticketsList.buttons.accept")}<br />CAMPANHA */}
+
+							{ticket?.isRemote ? (
 								<>{i18n.t("ticketsList.buttons.accept")}<br />CAMPANHA</>
 							) : (
 								<>{i18n.t("ticketsList.buttons.accept")}</>
 							)}
 
 						</>
-
 					</ButtonWithSpinner>
-
-
-
 				)}
-
 			</ListItem>
-			</Tooltip>
 			<Divider variant="inset" component="li" />
 		</React.Fragment>
 	)

frontend/src/components/TicketsList/index.js

@@ -15,7 +15,6 @@ import { i18n } from "../../translate/i18n"
 import { AuthContext } from "../../context/Auth/AuthContext"
 
 import { SearchTicketContext } from "../../context/SearchTicket/SearchTicket"
-import { Divider } from "@material-ui/core"
 
 const useStyles = makeStyles(theme => ({
 	ticketsListWrapper: {
@@ -182,18 +181,10 @@ const TicketsList = (props) => {
 	const classes = useStyles()
 	const [pageNumber, setPageNumber] = useState(1)
 	const [ticketsList, dispatch] = useReducer(reducer, [])
-	const { user, setting, } = useContext(AuthContext)
+	const { user } = useContext(AuthContext)
 
 	const { searchTicket } = useContext(SearchTicketContext)
 
-	const [_remoteTicketsControll, setRemoteTicketsControll] = useState([])
-
-	const [settings, setSettings] = useState([])
-
-	useEffect(() => {
-		setSettings(setting)
-	}, [setting])
-
 	useEffect(() => {
 
 		dispatch({ type: "RESET" })
@@ -201,7 +192,7 @@ const TicketsList = (props) => {
 
 	}, [status, searchParam, searchParamContent, showAll, selectedQueueIds, searchTicket])
 
-	let { tickets, hasMore, loading, remoteTicketsControll } = useTickets({
+	const { tickets, hasMore, loading } = useTickets({
 		pageNumber,
 		searchParam,
 		searchParamContent,
@@ -212,11 +203,6 @@ const TicketsList = (props) => {
 		unlimited: status === 'open' ? "all" : "false"
 	})
 
-
-	useEffect(() => {
-		setRemoteTicketsControll(remoteTicketsControll)
-	}, [remoteTicketsControll])
-
 	useEffect(() => {
 
 		if (!status && !searchParam) return
@@ -315,27 +301,6 @@ const TicketsList = (props) => {
 			}
 		})
 
-
-		socket.on('remoteTickesControll', (data) => {
-			console.log('REMOTE TICKETS CONTROLL UPDATE 1: ', data.tickets)
-			if (data.action === 'update') {
-				setRemoteTicketsControll(data.tickets)
-			}
-		})
-
-
-		socket.on('settings', (data) => {
-			if (data.action === 'update') {
-				setSettings((prevState) => {
-					const aux = [...prevState]
-					const settingIndex = aux.findIndex((s) => s.key === data.setting.key)
-					aux[settingIndex].value = data.setting.value
-					return aux
-				})
-			}
-		})
-
-
 		return () => {
 			socket.disconnect()
 		}
@@ -389,7 +354,7 @@ const TicketsList = (props) => {
 					) : (
 						<>
 							{ticketsList.map(ticket => (
-								<TicketListItem ticket={ticket} key={ticket.id} remoteTicketsControll={_remoteTicketsControll} settings={settings} />
+								<TicketListItem ticket={ticket} key={ticket.id} />
 							))}
 						</>
 					)}

frontend/src/components/TicketsManager/index.js

@@ -33,6 +33,9 @@ import { Button } from "@material-ui/core";
 import { TabTicketContext } from "../../context/TabTicketHeaderOption/TabTicketHeaderOption";
 
 import { SearchTicketContext } from "../../context/SearchTicket/SearchTicket";
+import useTickets from "../../hooks/useTickets"
+import api from "../../services/api";
+import toastError from "../../errors/toastError";
 
 const useStyles = makeStyles((theme) => ({
   ticketsWrapper: {
@@ -157,6 +160,10 @@ const TicketsManager = () => {
 
   const [openTooltipSearch, setOpenTooltipSearch] = useState(false)
 
+  const [waitingTime, setWaitingTime] = useState('00:00');
+  const [tickets, setTickets] = useState([]);
+  const [settings, setSettings] = useState([])
+
   let searchTimeout;
   let searchContentTimeout;
 
@@ -178,6 +185,76 @@ const TicketsManager = () => {
 
   }, [tab, setTabOption]);
 
+  useEffect(() => {
+    const fetchSession = async () => {
+      try {
+        const { data } = await api.get('/settings')
+        setSettings(data.settings)
+      } catch (err) {
+        toastError(err)
+      }
+    }
+    fetchSession()
+  }, [])
+
+  const getSettingValue = (key) => {
+    const { value } = settings.find((s) => s.key === key)
+    return value
+  }
+
+  const fetchTickets = async () =>{
+      try {
+        const { data } = await api.get("/tickets", {
+        params: {
+          status: 'pending',
+          queueIds: JSON.stringify(selectedQueueIds)          
+        },
+      });
+      setTickets(data.tickets);
+    } catch (err) {
+      toastError(err);
+    }
+  
+  }
+  useEffect(() => {
+    if(settings?.length > 0 && getSettingValue('waitingTimeTickets') === 'enabled') {
+      fetchTickets();
+    
+      const intervalId = setInterval(fetchTickets, 7000); 
+
+      return () => {
+        clearInterval(intervalId);
+      };
+    }
+  }, [selectedQueueIds, settings]);
+
+  useEffect(() => {    
+    const calculateAverageTime = () => {      
+      if(tickets.length > 0){
+        const now = new Date();
+        const differenceTime = tickets?.map(ticket => {
+          const updatedAt = new Date(ticket.updatedAt);
+          const difference = now - updatedAt; 
+        return difference;
+      });
+      const sumDifferences = differenceTime.reduce((total, difference) => total + difference, 0);
+      const averageTimeMilliseconds = sumDifferences / tickets?.length;
+      let hours = Math.floor(averageTimeMilliseconds / 3600000);
+      const minutes = Math.floor((averageTimeMilliseconds % 3600000) / 60000);
+      
+      let days = hours >= 24 ? parseInt(hours/24) : '';
+      
+      if(days != '') hours = hours - (24*days);
+      
+      const averageTimeFormated = `${days != '' ? `${days}d ` : days}${hours.toString().padStart(2, '0')}h${minutes.toString().padStart(2, '0')}`;
+      
+      return averageTimeFormated;
+    }else return '00:00';
+    }  
+    
+    setWaitingTime(calculateAverageTime());
+  },[tickets]);
+  
   useEffect(() => {
 
     // clearTimeout(searchContentTimeout);
@@ -203,7 +280,7 @@ const TicketsManager = () => {
 
   useEffect(() => {
 
-
+    //console.log(selectedQueueIds);
     if (tabOption === 'open') {
 
       setTabOption('')
@@ -448,7 +525,17 @@ const TicketsManager = () => {
               </Badge>
             }
             value={"pending"}
-          />
+          />{
+            (settings?.length > 0 && getSettingValue('waitingTimeTickets') === 'enabled') &&
+            <span style={{display: 'flex', alignItems: 'center', flexDirection:'column', justifyContent: 'flex-start'}}>
+              <label style ={{color: 'red',fontWeight: 'bold', padding: '.1rem', fontSize: '8px', textAlign:'center', margin:'0'}}>
+              <i>ESPERA</i>
+              </label>
+            <label style={{color: 'gray',fontWeight: 'bold', padding: '.1rem', textDecoration: 'underline', fontSize: '13px'}}>
+              {waitingTime}
+              </label>
+          </span>
+          }
         </Tabs>
         <Paper className={classes.ticketsWrapper}>
           <TicketsList

frontend/src/context/CountTicketMsgProvider/CountTicketMsgProvider.js

@@ -1,17 +0,0 @@
-import React, { useState, createContext } from "react"
-
-const countTicketMsgContext = createContext()
-
-
-const CountTicketMsgProvider = ({ children }) => {
-
-    const [countTicketMsg, setCountTicketMsg] = useState(0)
-
-    return (
-        <countTicketMsgContext.Provider value={{ countTicketMsg, setCountTicketMsg }}>
-            {children}
-        </countTicketMsgContext.Provider>
-    )
-}
-
-export { countTicketMsgContext, CountTicketMsgProvider }

frontend/src/hooks/useTickets/index.js

@@ -1,7 +1,7 @@
-import { useState, useEffect } from "react"
-import toastError from "../../errors/toastError"
+import { useState, useEffect } from "react";
+import toastError from "../../errors/toastError";
 
-import api from "../../services/api"
+import api from "../../services/api";
 
 const useTickets = ({
 	searchParam,
@@ -15,16 +15,16 @@ const useTickets = ({
 	unlimited,
 	tab
 }) => {
-	const [loading, setLoading] = useState(true)
-	const [hasMore, setHasMore] = useState(false)
-	const [tickets, setTickets] = useState([])
-	const [remoteTicketsControll, setRemoteTicketsControll] = useState([])
+	const [loading, setLoading] = useState(true);
+	const [hasMore, setHasMore] = useState(false);
+	const [tickets, setTickets] = useState([]);
+
 
 
 
 	useEffect(() => {
 
-		setLoading(true)
+		setLoading(true);
 		const delayDebounceFn = setTimeout(() => {
 			const fetchTickets = async () => {
 				try {
@@ -45,26 +45,24 @@ const useTickets = ({
 							withUnreadMessages,
 							unlimited
 						},
-					}) 
+					});
 
-					setTickets(data.tickets)
-					setHasMore(data.hasMore)
-					setLoading(false) 
 
-					if (data?.remoteTicketsControll) {
-						setRemoteTicketsControll(data.remoteTicketsControll.map(t => +t))
-					}
 
 
+					setTickets(data.tickets);
+					setHasMore(data.hasMore);
+					setLoading(false);
+
 
 				} catch (err) {
-					setLoading(false)
-					toastError(err)
+					setLoading(false);
+					toastError(err);
 				}
-			}
-			fetchTickets()
-		}, 500)
-		return () => clearTimeout(delayDebounceFn)
+			};
+			fetchTickets();
+		}, 500);
+		return () => clearTimeout(delayDebounceFn);
 	}, [
 		searchParam,
 		searchParamContent,
@@ -76,9 +74,9 @@ const useTickets = ({
 		withUnreadMessages,
 		tab,
 		unlimited
-	])
+	]);
 
-	return { tickets, loading, hasMore, remoteTicketsControll }
-}
+	return { tickets, loading, hasMore };
+};
 
-export default useTickets
+export default useTickets;

frontend/src/pages/Report/index.js

@@ -11,7 +11,7 @@ import { AuthContext } from "../../context/Auth/AuthContext"
 import { Can } from "../../components/Can"
 import FormControlLabel from "@mui/material/FormControlLabel"
 import Checkbox from '@mui/material/Checkbox'
-import { Button, Tooltip } from "@material-ui/core"
+import { Button } from "@material-ui/core"
 import ReportModal from "../../components/ReportModal"
 import ReportModalType from "../../components/ReportModalType"
 import MaterialTable from 'material-table'
@@ -237,6 +237,7 @@ let columnsData = [
   { title: `${i18n.t("reports.listColumns.column1_9")}`, field: 'statusChatEnd' },
   { title: `Espera`, field: 'waiting_time' },
   { title: `Mensagens`, field: 'messagesToFilter', searchable: true, hidden: true },
+  { title: `Link`, field: 'link', searchable: false, hidden: true, export: true },
 ]  
 
 let columnsDataSuper = [
@@ -252,6 +253,7 @@ let columnsDataSuper = [
   { title: `${i18n.t("reports.listColumns.column1_9")}`, field: 'statusChatEnd' },
   { title: `Espera`, field: 'waiting_time' },
   { title: `Mensagens`, field: 'messagesToFilter', searchable: true, hidden: true },
+  { title: `Link`, field: 'link', searchable: false, hidden: true, export: true },
 ]
 
 
@@ -299,7 +301,6 @@ const Report = () => {
   const [csvFile, setCsvFile] = useState()
   const [selectedValue, setSelectedValue] = useState('created')
   const [checked, setChecked] = useState(true)
-  const [checkedRemote, setCheckedRemote] = useState(false)
   const [queues, setQueues] = useState([])
   const [queueId, setQueue] = useState(null)
 
@@ -377,9 +378,9 @@ const Report = () => {
             const tickets = data.tickets.map(ticket => ({
               ...ticket,
               messagesToFilter: ticket.messages.map(message => message.body).join(' '),
+              link: `${process.env.REACT_APP_FRONTEND_URL}/tickets/${ticket.id}`
             }))
             dispatchQ({ type: "LOAD_QUERY", payload: tickets })
-            // console.log(tickets)
             setHasMore(data.hasMore)
             setTotalCountTickets(data.count)
             setLoading(false)
@@ -396,13 +397,15 @@ const Report = () => {
 
           }
           else if (reportOption === '3') {
-            const dataQuery = await api.get("/reports/services/numbers", { params: { startDate, endDate, isRemote: checkedRemote }, })
+            const dataQuery = await api.get("/reports/services/numbers", { params: { startDate, endDate }, })
 
             dispatchQ({ type: "RESET" })
             dispatchQ({ type: "LOAD_QUERY", payload: dataQuery?.data?.reportService })
           }
           else if (reportOption === '4') {
-            const dataQuery = await api.get("/reports/services/queues", { params: { startDate, endDate, isRemote: checkedRemote }, })
+            const dataQuery = await api.get("/reports/services/queues", { params: { startDate, endDate }, })
+
+            console.log(' dataQuery?.data?.reportService: ', dataQuery?.data?.reportService)
 
             dispatchQ({ type: "RESET" })
             dispatchQ({ type: "LOAD_QUERY", payload: dataQuery?.data?.reportService })
@@ -418,7 +421,7 @@ const Report = () => {
     }, 500)
     return () => clearTimeout(delayDebounceFn)
 
-  }, [userId, queueId, checked, checkedRemote, startDate, endDate, reportOption, pageNumberTickets, totalCountTickets, selectedValue])
+  }, [userId, queueId, checked, startDate, endDate, reportOption, pageNumberTickets, totalCountTickets, selectedValue])
 
 
   const handleCheckBoxChange = (value) => {
@@ -680,6 +683,7 @@ const Report = () => {
 
 
   const renderSwitch = (param) => {
+    if(userA.profile !== 'supervisor'){
       switch (param) {
         case 'empty':
           return (
@@ -730,16 +734,13 @@ const Report = () => {
           return (<><span>WAITING...</span></>)
       }
     }
+  }
 
 
   const handleChange = (event) => {
     setChecked(event.target.checked)
   }
 
-  const handleChangeRemote = (event) => {
-    setCheckedRemote(event.target.checked)
-  }
-
   return (
 
     <Can
@@ -785,35 +786,6 @@ const Report = () => {
                   </label>
                 </div>
               }
-              {(reportOption === '3' || reportOption === '4') &&
-                <div>
-
-                  <Tooltip
-                    arrow
-                    placement="top"
-                    title="Todos os tickets incluindo os criados remotamente"
-
-                  ><label>
-                      normal
-                    </label>
-                  </Tooltip>
-
-                  <Switch
-                    checked={checkedRemote}
-                    onChange={handleChangeRemote}
-                    inputProps={{ 'aria-label': 'controlled' }}
-                  />
-                  <Tooltip
-                    arrow
-                    placement="top"
-                    title="Apenas tickets criados remotamente"
-
-                  ><label>
-                      remoto
-                    </label>
-                  </Tooltip>
-                </div>
-              }
 
 
 
@@ -871,7 +843,7 @@ const Report = () => {
                 <>
                   <MTable data={query}
                     columns={userA.profile !== 'supervisor' ? columnsData : columnsDataSuper}
-                    hasChild={true}
+                    hasChild={userA.profile !== 'supervisor' ? true :false}
                     removeClickRow={false}
 
                     handleScroll={handleScroll}
@@ -991,7 +963,7 @@ const Report = () => {
 
                   title={i18n.t("reports.listTitles.title4_1")}
                   columns={
-                    !checkedRemote ? [
+                    [
                       { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
                       { title: 'Conversas iniciadas', field: 'startedByAgent', },
                       { title: 'Conversas recebidas', field: 'startedByClient' },
@@ -999,14 +971,6 @@ const Report = () => {
                       { title: `Tempo médio de espera`, field: 'avgChatWaitingTime' },
                       { title: 'Aguardando', field: 'pendingChat' }
 
-                    ] :
-                      [
-                        { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
-                        { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                        { title: 'Conversas respondidas', field: 'startedByClient' },
-                        { title: `Conversas finalizadas`, field: 'closedChat' },
-                        { title: 'Aguardando', field: 'pendingChat' }
-
                     ]
                   }
                   data={dataRows}
@@ -1043,7 +1007,7 @@ const Report = () => {
 
                   title={i18n.t("reports.listTitles.title5_1")}
                   columns={
-                    !checkedRemote ? [
+                    [
 
                       { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
                       {
@@ -1063,27 +1027,6 @@ const Report = () => {
                       { title: `Tempo médio de espera`, field: 'avgChatWaitingTime' },
                       { title: 'Aguardando', field: 'pendingChat' }
 
-                    ] :
-
-                      [
-
-                        { title: 'Unidade', field: 'name', cellStyle: { whiteSpace: 'nowrap' }, },
-                        {
-                          title: 'Fila', field: 'queueName',
-                          cellStyle: (evt, rowData) => {
-                            return {
-                              whiteSpace: 'nowrap',
-                              backgroundColor: rowData?.queueColor || 'inherit',
-                              color: 'white'
-                            }
-                          }
-
-                        },
-                        { title: 'Conversas iniciadas', field: 'startedByAgent', },
-                        { title: 'Conversas respondidas', field: 'startedByClient' },
-                        { title: `Conversas finalizadas`, field: 'closedChat' },
-                        { title: 'Aguardando', field: 'pendingChat' }
-
                     ]
                   }
                   data={dataRows}

frontend/src/pages/Settings/index.js

@@ -12,38 +12,13 @@ import api from '../../services/api'
 import { i18n } from '../../translate/i18n.js'
 import toastError from '../../errors/toastError'
 
-import TextField from '@material-ui/core/TextField'
-import Button from '@material-ui/core/Button'
-
-
 //--------
 import { AuthContext } from '../../context/Auth/AuthContext'
 
 import { Can } from '../../components/Can'
-import { boolean } from 'yup'
 
 // import Button from "@material-ui/core/Button";
 
-const IntegerInput = ({ value, onChange }) => {
-  const handleChange = (event) => {
-    const inputValue = event.target.value
-    // Only allow digits 0-9
-    if (/^\d{0,3}$/.test(inputValue)) {
-      onChange(inputValue)
-    }
-  }
-
-  return (
-    <TextField
-      type="text"
-      variant="outlined"
-      value={value}
-      onChange={handleChange}
-      style={{ marginRight: '10px' }}
-    />
-  )
-}
-
 const useStyles = makeStyles((theme) => ({
   root: {
     display: 'flex',
@@ -73,48 +48,11 @@ const Settings = () => {
 
   const [settings, setSettings] = useState([])
 
-
-  const [number1, setNumber1] = useState('')
-  const [number2, setNumber2] = useState('')
-
-  const handleNumber1Change = (value) => {
-    setNumber1(value)
-  }
-
-  const handleNumber2Change = (value) => {
-    setNumber2(value)
-  }
-
-  const handleGetValues = () => {
-    let e = {
-      target: {
-        value: 'enabled', name: 'remoteTicketSendControll', obj: (number1.trim().length > 0 && number2.trim().length > 0) ? { seconds1: number1, seconds2: number2 } : null
-      }
-    }
-
-    handleChangeSetting(e)
-  }
-
-
   useEffect(() => {
     const fetchSession = async () => {
       try {
         const { data } = await api.get('/settings')
-        console.log('data.settings: ', data.settings)
         setSettings(data.settings)
-
-        if (data?.settings) {
-          let { obj } = data.settings.find((s) => s.key === 'remoteTicketSendControll')
-
-          if (!obj) return
-
-          obj = JSON.parse(obj)
-          console.log('SETTING obj: ', obj)
-
-          setNumber1(obj.seconds1)
-          setNumber2(obj.seconds2)
-        }
-
       } catch (err) {
         toastError(err)
       }
@@ -122,7 +60,6 @@ const Settings = () => {
     fetchSession()
   }, [])
 
-
   useEffect(() => {
     const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
 
@@ -144,6 +81,9 @@ const Settings = () => {
     }
   }, [])
 
+  // useEffect(() => {
+  //   console.log('------> settings: ', settings)
+  // }, [settings])
 
   const handleChangeSetting = async (e) => {
     const selectedValue = e.target.value
@@ -152,7 +92,6 @@ const Settings = () => {
     try {
       await api.put(`/settings/${settingKey}`, {
         value: selectedValue,
-        // obj: e.target?.obj ? e.target.obj : null
       })
 
       if (settingKey === 'farewellMessageByQueue' &&
@@ -178,20 +117,12 @@ const Settings = () => {
     }
   }
 
-  const getSettingValue = (key, _obj = false) => {
-    const { value, obj } = settings.find((s) => s.key === key)
-
-    if (_obj)
-      return obj
+  const getSettingValue = (key) => {
+    const { value } = settings.find((s) => s.key === key)
 
     return value
   }
 
-  const isSaveDisabled = (settings &&
-    settings.length > 0 &&
-    getSettingValue('remoteTicketSendControll') === 'disabled')
-
-
   return (
     <Can
       role={user.profile}
@@ -515,57 +446,10 @@ const Settings = () => {
             </Container>
           </div>
 
-          <div className={classes.root}>
-            <Container className={classes.container} maxWidth="sm">
-              <Paper className={classes.paper}>
-                <Typography variant="body1">
-                  Controle de envio de mensagem de ticket remoto por numero
-                </Typography>
-
-                <Select
-                  margin="dense"
-                  variant="outlined"
-                  native
-                  id="remoteTicketSendControll-setting"
-                  name="remoteTicketSendControll"
-                  value={
-                    settings &&
-                    settings.length > 0 &&
-                    getSettingValue('remoteTicketSendControll')
-                  }
-                  className={classes.settingOption}
-                  onChange={handleChangeSetting}
-                >
-                  <option value="enabled">Ativado</option>
-                  <option value="disabled">Desativado</option>
-                </Select>
-              </Paper>
-              {/* <Paper>
-                <div style={{ padding: '10px', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                  <h3>Tempo aleatorio em segundos</h3>
-
-                  <div style={{ marginBottom: '20px', display: 'flex' }}>
-                    <IntegerInput title="Number 1" value={number1} onChange={handleNumber1Change} />
-                    <IntegerInput title="Number 2" value={number2} onChange={handleNumber2Change} />
-                    <Button variant="contained" color="primary" onClick={handleGetValues} disabled={
-                      (isSaveDisabled) ? true : false
-                    }>
-                      Save
-                    </Button>
-                  </div>
-
-                </div>
-              </Paper> */}
-
-            </Container>
-          </div>
-
         </div>
       )}
     />
   )
 }
 
-
-
 export default Settings