diff --git a/backend/src/controllers/MessageController.ts b/backend/src/controllers/MessageController.ts index a574cac..4c33aef 100644 --- a/backend/src/controllers/MessageController.ts +++ b/backend/src/controllers/MessageController.ts @@ -1,5 +1,4 @@ import { Request, Response } from "express"; -// import { getIO } from "../libs/socket"; import { Message as WbotMessage } from "whatsapp-web.js"; import SetTicketMessagesAsRead from "../helpers/SetTicketMessagesAsRead"; @@ -11,16 +10,6 @@ import ShowTicketService from "../services/TicketServices/ShowTicketService"; import SendWhatsAppMedia from "../services/WbotServices/SendWhatsAppMedia"; import SendWhatsAppMessage from "../services/WbotServices/SendWhatsAppMessage"; -// import Sequelize from "sequelize"; -// import { MessageMedia } from "whatsapp-web.js"; -// import Message from "../models/Message"; -// import Contact from "../models/Contact"; -// import User from "../models/User"; -// import Whatsapp from "../models/Whatsapp"; - -// import Ticket from "../models/Ticket"; -// import { getWbot } from "../libs/wbot"; - type IndexQuery = { searchParam: string; pageNumber: string; diff --git a/backend/src/controllers/WhatsAppController.ts b/backend/src/controllers/WhatsAppController.ts index bc8a414..f0726f4 100644 --- a/backend/src/controllers/WhatsAppController.ts +++ b/backend/src/controllers/WhatsAppController.ts @@ -1,5 +1,7 @@ import { Request, Response } from "express"; import { getIO } from "../libs/socket"; +import { initWbot } from "../libs/wbot"; +import wbotMessageListener from "../services/WbotServices/wbotMessageListener"; import CreateWhatsAppService from "../services/WhatsappService/CreateWhatsAppService"; import DeleteWhatsAppService from "../services/WhatsappService/DeleteWhatsAppService"; @@ -34,12 +36,12 @@ export const store = async (req: Request, res: Response): Promise => { // return res.status(400).json({ error: "Cannot create whatsapp session." }); // } - // initWbot(whatsapp) - // .then(() => { - // wbotMessageListener(whatsapp); - // wbotMonitor(whatsapp); - // }) - // .catch(err => console.log(err)); + initWbot(whatsapp) + .then(() => { + wbotMessageListener(whatsapp); + // wbotMonitor(whatsapp); + }) + .catch(err => console.log(err)); const io = getIO(); io.emit("whatsapp", { diff --git a/backend/src/controllersOld/ContactController.js b/backend/src/controllersOld/ContactController.js deleted file mode 100644 index 49a352a..0000000 --- a/backend/src/controllersOld/ContactController.js +++ /dev/null @@ -1,170 +0,0 @@ -const Sequelize = require("sequelize"); -const { Op } = require("sequelize"); - -const Contact = require("../models/Contact"); -const Whatsapp = require("../models/Whatsapp"); -const ContactCustomField = require("../models/ContactCustomField"); - -const { getIO } = require("../libs/socket"); -const { getWbot } = require("../libs/wbot"); - -exports.index = async (req, res) => { - const { searchParam = "", pageNumber = 1 } = req.query; - - const whereCondition = { - [Op.or]: [ - { - name: Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("name")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - }, - { number: { [Op.like]: `%${searchParam}%` } } - ] - }; - - let limit = 20; - let offset = limit * (pageNumber - 1); - - const { count, rows: contacts } = await Contact.findAndCountAll({ - where: whereCondition, - limit, - offset, - order: [["createdAt", "DESC"]] - }); - - const hasMore = count > offset + contacts.length; - - return res.json({ contacts, count, hasMore }); -}; - -exports.store = async (req, res) => { - const defaultWhatsapp = await Whatsapp.findOne({ - where: { default: true } - }); - - if (!defaultWhatsapp) { - return res - .status(404) - .json({ error: "No default WhatsApp found. Check Connection page." }); - } - - const wbot = getWbot(defaultWhatsapp); - const io = getIO(); - const newContact = req.body; - - try { - const isValidNumber = await wbot.isRegisteredUser( - `${newContact.number}@c.us` - ); - if (!isValidNumber) { - return res - .status(400) - .json({ error: "The suplied number is not a valid Whatsapp number" }); - } - } catch (err) { - console.log(err); - return res.status(500).json({ - error: "Could not check whatsapp contact. Check connection page." - }); - } - - const profilePicUrl = await wbot.getProfilePicUrl( - `${newContact.number}@c.us` - ); - - const contact = await Contact.create( - { ...newContact, profilePicUrl }, - { - include: "extraInfo" - } - ); - - io.emit("contact", { - action: "create", - contact: contact - }); - - return res.status(200).json(contact); -}; - -exports.show = async (req, res) => { - const { contactId } = req.params; - - const contact = await Contact.findByPk(contactId, { - include: "extraInfo", - attributes: ["id", "name", "number", "email"] - }); - - if (!contact) { - return res.status(404).json({ error: "No contact found with this id." }); - } - - return res.status(200).json(contact); -}; - -exports.update = async (req, res) => { - const io = getIO(); - - const updatedContact = req.body; - - const { contactId } = req.params; - - const contact = await Contact.findByPk(contactId, { - include: "extraInfo" - }); - - if (!contact) { - return res.status(404).json({ error: "No contact found with this ID" }); - } - - if (updatedContact.extraInfo) { - await Promise.all( - updatedContact.extraInfo.map(async info => { - await ContactCustomField.upsert({ ...info, contactId: contact.id }); - }) - ); - - await Promise.all( - contact.extraInfo.map(async oldInfo => { - let stillExists = updatedContact.extraInfo.findIndex( - info => info.id === oldInfo.id - ); - - if (stillExists === -1) { - await ContactCustomField.destroy({ where: { id: oldInfo.id } }); - } - }) - ); - } - - await contact.update(updatedContact); - - io.emit("contact", { - action: "update", - contact: contact - }); - - return res.status(200).json(contact); -}; - -exports.delete = async (req, res) => { - const io = getIO(); - const { contactId } = req.params; - - const contact = await Contact.findByPk(contactId); - - if (!contact) { - return res.status(404).json({ error: "No contact found with this ID" }); - } - - await contact.destroy(); - - io.emit("contact", { - action: "delete", - contactId: contactId - }); - - return res.status(200).json({ message: "Contact deleted" }); -}; diff --git a/backend/src/controllersOld/ImportPhoneContactsController.js b/backend/src/controllersOld/ImportPhoneContactsController.js deleted file mode 100644 index b24ee0d..0000000 --- a/backend/src/controllersOld/ImportPhoneContactsController.js +++ /dev/null @@ -1,38 +0,0 @@ -const Contact = require("../models/Contact"); -const Whatsapp = require("../models/Whatsapp"); -const { getIO } = require("../libs/socket"); -const { getWbot, initWbot } = require("../libs/wbot"); - -exports.store = async (req, res, next) => { - const defaultWhatsapp = await Whatsapp.findOne({ - where: { default: true }, - }); - - if (!defaultWhatsapp) { - return res - .status(404) - .json({ error: "No default WhatsApp found. Check Connection page." }); - } - - const io = getIO(); - const wbot = getWbot(defaultWhatsapp); - - let phoneContacts; - - try { - phoneContacts = await wbot.getContacts(); - } catch (err) { - console.log(err); - return res.status(500).json({ - error: "Could not check whatsapp contact. Check connection page.", - }); - } - - await Promise.all( - phoneContacts.map(async ({ number, name }) => { - await Contact.create({ number, name }); - }) - ); - - return res.status(200).json({ message: "contacts imported" }); -}; diff --git a/backend/src/controllersOld/MessageController.js b/backend/src/controllersOld/MessageController.js deleted file mode 100644 index a34cd3f..0000000 --- a/backend/src/controllersOld/MessageController.js +++ /dev/null @@ -1,203 +0,0 @@ -const Message = require("../models/Message"); -const Contact = require("../models/Contact"); -const User = require("../models/User"); -const Whatsapp = require("../models/Whatsapp"); - -const Ticket = require("../models/Ticket"); -const { getIO } = require("../libs/socket"); -const { getWbot } = require("../libs/wbot"); -const Sequelize = require("sequelize"); - -const { MessageMedia } = require("whatsapp-web.js"); - -const setMessagesAsRead = async ticket => { - const io = getIO(); - const wbot = getWbot(ticket.whatsappId); - - await Message.update( - { read: true }, - { - where: { - ticketId: ticket.id, - read: false - } - } - ); - - try { - await wbot.sendSeen(`${ticket.contact.number}@c.us`); - } catch (err) { - console.log( - "Could not mark messages as read. Maybe whatsapp session disconnected?" - ); - } - - io.to("notification").emit("ticket", { - action: "updateUnread", - ticketId: ticket.id - }); -}; - -exports.index = async (req, res, next) => { - const { ticketId } = req.params; - const { searchParam = "", pageNumber = 1 } = req.query; - - const whereCondition = { - body: Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("body")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - }; - - const limit = 20; - const offset = limit * (pageNumber - 1); - - const ticket = await Ticket.findByPk(ticketId, { - include: [ - { - model: Contact, - as: "contact", - include: "extraInfo", - attributes: ["id", "name", "number", "profilePicUrl"] - }, - { - model: User, - as: "user" - } - ] - }); - - if (!ticket) { - return res.status(404).json({ error: "No ticket found with this ID" }); - } - - await setMessagesAsRead(ticket); - - const ticketMessages = await ticket.getMessages({ - where: whereCondition, - limit, - offset, - order: [["createdAt", "DESC"]] - }); - - const count = await ticket.countMessages(); - - const serializedMessages = ticketMessages.map(message => { - return { - ...message.dataValues, - mediaUrl: `${ - message.mediaUrl - ? `${process.env.BACKEND_URL}:${process.env.PROXY_PORT}/public/${message.mediaUrl}` - : "" - }` - }; - }); - - const hasMore = count > offset + ticketMessages.length; - - return res.json({ - messages: serializedMessages.reverse(), - ticket, - count, - hasMore - }); -}; - -exports.store = async (req, res, next) => { - const io = getIO(); - - const { ticketId } = req.params; - const message = req.body; - const media = req.file; - let sentMessage; - - const ticket = await Ticket.findByPk(ticketId, { - include: [ - { - model: Contact, - as: "contact", - attributes: ["number", "name", "profilePicUrl"] - } - ] - }); - - if (!ticket) { - return res.status(404).json({ error: "No ticket found with this ID" }); - } - - if (!ticket.whatsappId) { - const defaultWhatsapp = await Whatsapp.findOne({ - where: { default: true } - }); - - if (!defaultWhatsapp) { - return res - .status(404) - .json({ error: "No default WhatsApp found. Check Connection page." }); - } - - await ticket.setWhatsapp(defaultWhatsapp); - } - - const wbot = getWbot(ticket.whatsappId); - - try { - if (media) { - const newMedia = MessageMedia.fromFilePath(req.file.path); - - message.mediaUrl = req.file.filename; - if (newMedia.mimetype) { - message.mediaType = newMedia.mimetype.split("/")[0]; - } else { - message.mediaType = "other"; - } - - sentMessage = await wbot.sendMessage( - `${ticket.contact.number}@c.us`, - newMedia - ); - - await ticket.update({ lastMessage: message.mediaUrl }); - } else { - sentMessage = await wbot.sendMessage( - `${ticket.contact.number}@c.us`, - message.body - ); - await ticket.update({ lastMessage: message.body }); - } - } catch (err) { - console.log( - "Could not create whatsapp message. Is session details valid? " - ); - } - - if (sentMessage) { - message.id = sentMessage.id.id; - const newMessage = await ticket.createMessage(message); - - const serialziedMessage = { - ...newMessage.dataValues, - mediaUrl: `${ - message.mediaUrl - ? `${process.env.BACKEND_URL}:${process.env.PROXY_PORT}/public/${message.mediaUrl}` - : "" - }` - }; - - io.to(ticketId).to("notification").emit("appMessage", { - action: "create", - message: serialziedMessage, - ticket: ticket, - contact: ticket.contact - }); - - await setMessagesAsRead(ticket); - - return res.status(200).json({ newMessage, ticket }); - } - - return res - .status(500) - .json({ error: "Cannot sent whatsapp message. Check connection page." }); -}; diff --git a/backend/src/controllersOld/SessionController.js b/backend/src/controllersOld/SessionController.js deleted file mode 100644 index fdf1977..0000000 --- a/backend/src/controllersOld/SessionController.js +++ /dev/null @@ -1,32 +0,0 @@ -const jwt = require("jsonwebtoken"); -const authConfig = require("../config/auth"); - -const User = require("../models/User"); - -exports.store = async (req, res, next) => { - const { email, password } = req.body; - - const user = await User.findOne({ where: { email: email } }); - if (!user) { - return res.status(404).json({ error: "No user found with this email" }); - } - - if (!(await user.checkPassword(password))) { - return res.status(401).json({ error: "Password does not match" }); - } - - const token = jwt.sign( - { email: user.email, userId: user.id }, - authConfig.secret, - { - expiresIn: authConfig.expiresIn - } - ); - - return res.status(200).json({ - token: token, - username: user.name, - profile: user.profile, - userId: user.id - }); -}; diff --git a/backend/src/controllersOld/SettingController.js b/backend/src/controllersOld/SettingController.js deleted file mode 100644 index 045a0ee..0000000 --- a/backend/src/controllersOld/SettingController.js +++ /dev/null @@ -1,39 +0,0 @@ -const Setting = require("../models/Setting"); -const { getIO } = require("../libs/socket"); - -exports.index = async (req, res) => { - if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can access this route." }); - } - - const settings = await Setting.findAll(); - - return res.status(200).json(settings); -}; - -exports.update = async (req, res) => { - if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can access this route." }); - } - - const io = getIO(); - const { settingKey } = req.params; - const setting = await Setting.findByPk(settingKey); - - if (!setting) { - return res.status(404).json({ error: "No setting found with this ID" }); - } - - await setting.update(req.body); - - io.emit("settings", { - action: "update", - setting, - }); - - return res.status(200).json(setting); -}; diff --git a/backend/src/controllersOld/TicketController.js b/backend/src/controllersOld/TicketController.js deleted file mode 100644 index fcd379c..0000000 --- a/backend/src/controllersOld/TicketController.js +++ /dev/null @@ -1,185 +0,0 @@ -const Sequelize = require("sequelize"); -const { startOfDay, endOfDay, parseISO } = require("date-fns"); - -const Ticket = require("../models/Ticket"); -const Contact = require("../models/Contact"); -const Message = require("../models/Message"); -const Whatsapp = require("../models/Whatsapp"); - -const { getIO } = require("../libs/socket"); - -exports.index = async (req, res) => { - const { - pageNumber = 1, - status = "", - date = "", - searchParam = "", - showAll - } = req.query; - - const userId = req.user.id; - - const limit = 20; - const offset = limit * (pageNumber - 1); - - let includeCondition = [ - { - model: Contact, - as: "contact", - attributes: ["name", "number", "profilePicUrl"] - } - ]; - - let whereCondition = { userId: userId }; - - if (showAll === "true") { - whereCondition = {}; - } - - if (status) { - whereCondition = { - ...whereCondition, - status: status - }; - } - - if (searchParam) { - includeCondition = [ - ...includeCondition, - { - model: Message, - as: "messages", - attributes: ["id", "body"], - where: { - body: Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("body")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - }, - required: false, - duplicating: false - } - ]; - - whereCondition = { - [Sequelize.Op.or]: [ - { - "$contact.name$": Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("name")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - }, - { "$contact.number$": { [Sequelize.Op.like]: `%${searchParam}%` } }, - { - "$message.body$": Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("body")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - } - ] - }; - } - - if (date) { - whereCondition = { - ...whereCondition, - createdAt: { - [Sequelize.Op.between]: [ - startOfDay(parseISO(date)), - endOfDay(parseISO(date)) - ] - } - }; - } - - const { count, rows: tickets } = await Ticket.findAndCountAll({ - where: whereCondition, - distinct: true, - include: includeCondition, - limit, - offset, - order: [["updatedAt", "DESC"]] - }); - - const hasMore = count > offset + tickets.length; - - return res.status(200).json({ count, tickets, hasMore }); -}; - -exports.store = async (req, res) => { - const io = getIO(); - - const defaultWhatsapp = await Whatsapp.findOne({ - where: { default: true } - }); - - if (!defaultWhatsapp) { - return res - .status(404) - .json({ error: "No default WhatsApp found. Check Connection page." }); - } - - const ticket = await defaultWhatsapp.createTicket(req.body); - - const contact = await ticket.getContact(); - - const serializaedTicket = { ...ticket.dataValues, contact: contact }; - - io.to("notification").emit("ticket", { - action: "create", - ticket: serializaedTicket - }); - - return res.status(200).json(ticket); -}; - -exports.update = async (req, res) => { - const io = getIO(); - const { ticketId } = req.params; - - const ticket = await Ticket.findByPk(ticketId, { - include: [ - { - model: Contact, - as: "contact", - attributes: ["name", "number", "profilePicUrl"] - } - ] - }); - - if (!ticket) { - return res.status(404).json({ error: "No ticket found with this ID" }); - } - - await ticket.update(req.body); - - io.to("notification").emit("ticket", { - action: "updateStatus", - ticket: ticket - }); - - return res.status(200).json(ticket); -}; - -exports.delete = async (req, res) => { - const io = getIO(); - const { ticketId } = req.params; - - const ticket = await Ticket.findByPk(ticketId); - - if (!ticket) { - return res.status(400).json({ error: "No ticket found with this ID" }); - } - - await ticket.destroy(); - - io.to("notification").emit("ticket", { - action: "delete", - ticketId: ticket.id - }); - - return res.status(200).json({ message: "ticket deleted" }); -}; diff --git a/backend/src/controllersOld/UserController.js b/backend/src/controllersOld/UserController.js deleted file mode 100644 index 06fd1a1..0000000 --- a/backend/src/controllersOld/UserController.js +++ /dev/null @@ -1,181 +0,0 @@ -const Sequelize = require("sequelize"); -const Yup = require("yup"); -const { Op } = require("sequelize"); - -const User = require("../models/User"); -const Setting = require("../models/Setting"); - -const { getIO } = require("../libs/socket"); - -exports.index = async (req, res) => { - if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can access this route." }); - } - - const { searchParam = "", pageNumber = 1 } = req.query; - - const whereCondition = { - [Op.or]: [ - { - name: Sequelize.where( - Sequelize.fn("LOWER", Sequelize.col("name")), - "LIKE", - "%" + searchParam.toLowerCase() + "%" - ) - }, - { email: { [Op.like]: `%${searchParam.toLowerCase()}%` } } - ] - }; - - let limit = 20; - let offset = limit * (pageNumber - 1); - - const { count, rows: users } = await User.findAndCountAll({ - attributes: ["name", "id", "email", "profile"], - where: whereCondition, - limit, - offset, - order: [["createdAt", "DESC"]] - }); - - const hasMore = count > offset + users.length; - - return res.status(200).json({ users, count, hasMore }); -}; - -export default async (req, res, next) => { - console.log(req.url); - const schema = Yup.object().shape({ - name: Yup.string().required().min(2), - email: Yup.string() - .email() - .required() - .test( - "Check-email", - "An user with this email already exists", - async value => { - const userFound = await User.findOne({ where: { email: value } }); - return !Boolean(userFound); - } - ), - password: Yup.string().required().min(5) - }); - - if (req.url === "/signup") { - const { value: userCreation } = await Setting.findByPk("userCreation"); - - if (userCreation === "disabled") { - return res - .status(403) - .json({ error: "User creation is disabled by administrator." }); - } - } else if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can create users." }); - } - - try { - await schema.validate(req.body); - } catch (err) { - return res.status(400).json({ error: err.message }); - } - - const io = getIO(); - - const { name, id, email, profile } = await User.create(req.body); - - io.emit("user", { - action: "create", - user: { name, id, email, profile } - }); - - return res.status(201).json({ message: "User created!", userId: id }); -}; - -exports.show = async (req, res) => { - const { userId } = req.params; - - const user = await User.findByPk(userId, { - attributes: ["id", "name", "email", "profile"] - }); - - if (!user) { - res.status(400).json({ error: "No user found with this id." }); - } - - return res.status(200).json(user); -}; - -exports.update = async (req, res) => { - const schema = Yup.object().shape({ - name: Yup.string().min(2), - email: Yup.string().email(), - password: Yup.string() - }); - - if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can edit users." }); - } - - await schema.validate(req.body); - - const io = getIO(); - const { userId } = req.params; - - const user = await User.findByPk(userId, { - attributes: ["name", "id", "email", "profile"] - }); - - if (!user) { - res.status(404).json({ error: "No user found with this id." }); - } - - if (user.profile === "admin" && req.body.profile === "user") { - const adminUsers = await User.count({ where: { profile: "admin" } }); - if (adminUsers <= 1) { - return res - .status(403) - .json({ error: "There must be at leat one admin user." }); - } - } - - await user.update(req.body); - - io.emit("user", { - action: "update", - user: user - }); - - return res.status(200).json(user); -}; - -exports.delete = async (req, res) => { - const io = getIO(); - const { userId } = req.params; - - const user = await User.findByPk(userId); - - if (!user) { - res.status(400).json({ error: "No user found with this id." }); - } - - if (req.user.profile !== "admin") { - return res - .status(403) - .json({ error: "Only administrators can edit users." }); - } - - await user.destroy(); - - io.emit("user", { - action: "delete", - userId: userId - }); - - return res.status(200).json({ message: "User deleted" }); -}; diff --git a/backend/src/controllersOld/WhatsAppController.js b/backend/src/controllersOld/WhatsAppController.js deleted file mode 100644 index 6abf373..0000000 --- a/backend/src/controllersOld/WhatsAppController.js +++ /dev/null @@ -1,141 +0,0 @@ -const Yup = require("yup"); -const Whatsapp = require("../models/Whatsapp"); -const { getIO } = require("../libs/socket"); -const { getWbot, initWbot, removeWbot } = require("../libs/wbot"); -const wbotMessageListener = require("../services/wbotMessageListener"); -const wbotMonitor = require("../services/wbotMonitor"); - -exports.index = async (req, res) => { - const whatsapps = await Whatsapp.findAll(); - - return res.status(200).json(whatsapps); -}; - -exports.store = async (req, res) => { - const schema = Yup.object().shape({ - name: Yup.string().required().min(2), - default: Yup.boolean() - .required() - .test( - "Check-default", - "Only one default whatsapp is permited", - async value => { - if (value === true) { - const whatsappFound = await Whatsapp.findOne({ - where: { default: true } - }); - return !Boolean(whatsappFound); - } else return true; - } - ) - }); - - try { - await schema.validate(req.body); - } catch (err) { - return res.status(400).json({ error: err.message }); - } - - const io = getIO(); - - const whatsapp = await Whatsapp.create(req.body); - - if (!whatsapp) { - return res.status(400).json({ error: "Cannot create whatsapp session." }); - } - - initWbot(whatsapp) - .then(() => { - wbotMessageListener(whatsapp); - wbotMonitor(whatsapp); - }) - .catch(err => console.log(err)); - - io.emit("whatsapp", { - action: "update", - whatsapp: whatsapp - }); - - return res.status(200).json(whatsapp); -}; - -exports.show = async (req, res) => { - const { whatsappId } = req.params; - const whatsapp = await Whatsapp.findByPk(whatsappId); - - if (!whatsapp) { - return res.status(200).json({ message: "Session not found" }); - } - - return res.status(200).json(whatsapp); -}; - -exports.update = async (req, res) => { - const { whatsappId } = req.params; - - const schema = Yup.object().shape({ - name: Yup.string().required().min(2), - default: Yup.boolean() - .required() - .test( - "Check-default", - "Only one default whatsapp is permited", - async value => { - if (value === true) { - const whatsappFound = await Whatsapp.findOne({ - where: { default: true } - }); - if (whatsappFound) { - return !(whatsappFound.id !== +whatsappId); - } else { - return true; - } - } else return true; - } - ) - }); - - try { - await schema.validate(req.body); - } catch (err) { - return res.status(400).json({ error: err.message }); - } - - const io = getIO(); - - const whatsapp = await Whatsapp.findByPk(whatsappId); - - if (!whatsapp) { - return res.status(404).json({ message: "Whatsapp not found" }); - } - - await whatsapp.update(req.body); - - io.emit("whatsapp", { - action: "update", - whatsapp: whatsapp - }); - - return res.status(200).json({ message: "Whatsapp updated" }); -}; - -exports.delete = async (req, res) => { - const io = getIO(); - const { whatsappId } = req.params; - - const whatsapp = await Whatsapp.findByPk(whatsappId); - - if (!whatsapp) { - return res.status(404).json({ message: "Whatsapp not found" }); - } - - await whatsapp.destroy(); - removeWbot(whatsapp.id); - - io.emit("whatsapp", { - action: "delete", - whatsappId: whatsapp.id - }); - - return res.status(200).json({ message: "Whatsapp deleted." }); -}; diff --git a/backend/src/controllersOld/WhatsAppSessionController.js b/backend/src/controllersOld/WhatsAppSessionController.js deleted file mode 100644 index 0bee528..0000000 --- a/backend/src/controllersOld/WhatsAppSessionController.js +++ /dev/null @@ -1,32 +0,0 @@ -// const Whatsapp = require("../models/Whatsapp"); -// const { getIO } = require("../libs/socket"); -// const { getWbot, initWbot, removeWbot } = require("../libs/wbot"); -// const wbotMessageListener = require("../services/wbotMessageListener"); -// const wbotMonitor = require("../services/wbotMonitor"); - -// exports.show = async (req, res) => { -// const { whatsappId } = req.params; -// const dbSession = await Whatsapp.findByPk(whatsappId); - -// if (!dbSession) { -// return res.status(200).json({ message: "Session not found" }); -// } - -// return res.status(200).json(dbSession); -// }; - -// exports.delete = async (req, res) => { -// const { whatsappId } = req.params; - -// const dbSession = await Whatsapp.findByPk(whatsappId); - -// if (!dbSession) { -// return res.status(404).json({ message: "Session not found" }); -// } - -// const wbot = getWbot(dbSession.id); - -// wbot.logout(); - -// return res.status(200).json({ message: "Session disconnected." }); -// }; diff --git a/backend/src/helpers/SetTicketMessagesAsRead.ts b/backend/src/helpers/SetTicketMessagesAsRead.ts index b78cdd1..c6bbff9 100644 --- a/backend/src/helpers/SetTicketMessagesAsRead.ts +++ b/backend/src/helpers/SetTicketMessagesAsRead.ts @@ -1,11 +1,9 @@ import { getIO } from "../libs/socket"; -import { getWbot } from "../libs/wbot"; import Message from "../models/Message"; import Ticket from "../models/Ticket"; +import GetTicketWbot from "./GetTicketWbot"; const SetTicketMessagesAsRead = async (ticket: Ticket): Promise => { - const wbot = getWbot(ticket.whatsappId); - await Message.update( { read: true }, { @@ -17,6 +15,7 @@ const SetTicketMessagesAsRead = async (ticket: Ticket): Promise => { ); try { + const wbot = await GetTicketWbot(ticket); await wbot.sendSeen(`${ticket.contact.number}@c.us`); } catch (err) { console.log( diff --git a/backend/src/modelsOld/Contact.js b/backend/src/modelsOld/Contact.js deleted file mode 100644 index 6187477..0000000 --- a/backend/src/modelsOld/Contact.js +++ /dev/null @@ -1,29 +0,0 @@ -const Sequelize = require("sequelize"); - -class Contact extends Sequelize.Model { - static init(sequelize) { - super.init( - { - name: { type: Sequelize.STRING }, - number: { type: Sequelize.STRING, allowNull: false, unique: true }, - email: { type: Sequelize.STRING, allowNull: false, defaultValue: "" }, - profilePicUrl: { type: Sequelize.STRING } - }, - { - sequelize - } - ); - - return this; - } - - static associate(models) { - this.hasMany(models.Ticket, { foreignKey: "contactId", as: "contact" }); - this.hasMany(models.ContactCustomField, { - foreignKey: "contactId", - as: "extraInfo" - }); - } -} - -module.exports = Contact; diff --git a/backend/src/modelsOld/ContactCustomField.js b/backend/src/modelsOld/ContactCustomField.js deleted file mode 100644 index 3819cbb..0000000 --- a/backend/src/modelsOld/ContactCustomField.js +++ /dev/null @@ -1,26 +0,0 @@ -const Sequelize = require("sequelize"); - -class ContactCustomField extends Sequelize.Model { - static init(sequelize) { - super.init( - { - name: { type: Sequelize.STRING }, - value: { type: Sequelize.STRING } - }, - { - sequelize - } - ); - - return this; - } - - static associate(models) { - this.belongsTo(models.Contact, { - foreignKey: "contactId", - as: "extraInfo" - }); - } -} - -module.exports = ContactCustomField; diff --git a/backend/src/modelsOld/Message.js b/backend/src/modelsOld/Message.js deleted file mode 100644 index bf4fbb5..0000000 --- a/backend/src/modelsOld/Message.js +++ /dev/null @@ -1,35 +0,0 @@ -const Sequelize = require("sequelize"); - -class Message extends Sequelize.Model { - static init(sequelize) { - super.init( - { - ack: { type: Sequelize.INTEGER, defaultValue: 0 }, - read: { type: Sequelize.BOOLEAN, defaultValue: false }, - fromMe: { type: Sequelize.BOOLEAN, defaultValue: false }, - body: { type: Sequelize.TEXT }, - mediaUrl: { type: Sequelize.STRING }, - mediaType: { type: Sequelize.STRING }, - createdAt: { - type: Sequelize.DATE(6), - allowNull: false - }, - updatedAt: { - type: Sequelize.DATE(6), - allowNull: false - } - }, - { - sequelize - } - ); - - return this; - } - - static associate(models) { - this.belongsTo(models.Ticket, { foreignKey: "ticketId", as: "messages" }); - } -} - -module.exports = Message; diff --git a/backend/src/modelsOld/Setting.js b/backend/src/modelsOld/Setting.js deleted file mode 100644 index fe4168a..0000000 --- a/backend/src/modelsOld/Setting.js +++ /dev/null @@ -1,24 +0,0 @@ -const Sequelize = require("sequelize"); - -class Setting extends Sequelize.Model { - static init(sequelize) { - super.init( - { - key: { - type: Sequelize.STRING, - primaryKey: true, - allowNull: false, - unique: true, - }, - value: { type: Sequelize.TEXT, allowNull: false }, - }, - { - sequelize, - } - ); - - return this; - } -} - -module.exports = Setting; diff --git a/backend/src/modelsOld/Ticket.js b/backend/src/modelsOld/Ticket.js deleted file mode 100644 index bcff844..0000000 --- a/backend/src/modelsOld/Ticket.js +++ /dev/null @@ -1,50 +0,0 @@ -const Sequelize = require("sequelize"); -const Message = require("./Message"); - -class Ticket extends Sequelize.Model { - static init(sequelize) { - super.init( - { - status: { type: Sequelize.STRING, defaultValue: "pending" }, - userId: { type: Sequelize.INTEGER, defaultValue: null }, - unreadMessages: { type: Sequelize.VIRTUAL }, - lastMessage: { type: Sequelize.STRING } - }, - { - sequelize - } - ); - - this.addHook("afterFind", async result => { - if (result && result.length > 0) { - await Promise.all( - result.map(async ticket => { - ticket.unreadMessages = await Message.count({ - where: { ticketId: ticket.id, read: false } - }); - }) - ); - } - }); - - this.addHook("beforeUpdate", async ticket => { - ticket.unreadMessages = await Message.count({ - where: { ticketId: ticket.id, read: false } - }); - }); - - return this; - } - - static associate(models) { - this.belongsTo(models.Contact, { foreignKey: "contactId", as: "contact" }); - this.belongsTo(models.User, { foreignKey: "userId", as: "user" }); - this.belongsTo(models.Whatsapp, { - foreignKey: "whatsappId", - as: "whatsapp" - }); - this.hasMany(models.Message, { foreignKey: "ticketId", as: "messages" }); - } -} - -module.exports = Ticket; diff --git a/backend/src/modelsOld/User.js b/backend/src/modelsOld/User.js deleted file mode 100644 index 6617b6c..0000000 --- a/backend/src/modelsOld/User.js +++ /dev/null @@ -1,32 +0,0 @@ -const Sequelize = require("sequelize"); -const bcrypt = require("bcryptjs"); - -class User extends Sequelize.Model { - static init(sequelize) { - super.init( - { - name: { type: Sequelize.STRING }, - password: { type: Sequelize.VIRTUAL }, - profile: { type: Sequelize.STRING, defaultValue: "admin" }, - passwordHash: { type: Sequelize.STRING }, - email: { type: Sequelize.STRING } - }, - { - sequelize - } - ); - - this.addHook("beforeSave", async user => { - if (user.password) { - user.passwordHash = await bcrypt.hash(user.password, 8); - } - }); - return this; - } - - checkPassword(password) { - return bcrypt.compare(password, this.passwordHash); - } -} - -module.exports = User; diff --git a/backend/src/modelsOld/Whatsapp.js b/backend/src/modelsOld/Whatsapp.js deleted file mode 100644 index bf63e0c..0000000 --- a/backend/src/modelsOld/Whatsapp.js +++ /dev/null @@ -1,32 +0,0 @@ -const Sequelize = require("sequelize"); - -class Whatsapp extends Sequelize.Model { - static init(sequelize) { - super.init( - { - session: { type: Sequelize.TEXT }, - qrcode: { type: Sequelize.TEXT }, - name: { type: Sequelize.STRING, unique: true, allowNull: false }, - status: { type: Sequelize.STRING }, - battery: { type: Sequelize.STRING }, - plugged: { type: Sequelize.BOOLEAN }, - default: { - type: Sequelize.BOOLEAN, - defaultValue: false, - allowNull: false - } - }, - { - sequelize - } - ); - - return this; - } - - static associate(models) { - this.hasMany(models.Ticket, { foreignKey: "whatsappId", as: "tickets" }); - } -} - -module.exports = Whatsapp; diff --git a/backend/src/server.ts b/backend/src/server.ts index ec6b241..c040e55 100644 --- a/backend/src/server.ts +++ b/backend/src/server.ts @@ -6,16 +6,13 @@ import cors from "cors"; import multer from "multer"; import * as Sentry from "@sentry/node"; +import "./database"; import uploadConfig from "./config/upload"; import AppError from "./errors/AppError"; import routes from "./routes"; import { initIO } from "./libs/socket"; -import "./database"; import { initWbot } from "./libs/wbot"; -// import path from "path"; - -// const wbotMessageListener = require("./services/wbotMessageListener"); // const wbotMonitor = require("./services/wbotMonitor"); import Whatsapp from "./models/Whatsapp"; import wbotMessageListener from "./services/WbotServices/wbotMessageListener"; diff --git a/backend/src/services/WbotServices/SendWhatsAppMedia.ts b/backend/src/services/WbotServices/SendWhatsAppMedia.ts index 4495e4d..424200f 100644 --- a/backend/src/services/WbotServices/SendWhatsAppMedia.ts +++ b/backend/src/services/WbotServices/SendWhatsAppMedia.ts @@ -15,14 +15,12 @@ const SendWhatsAppMedia = async ({ const newMedia = MessageMedia.fromFilePath(media.path); - const mediaUrl = media.filename; - const sentMessage = await wbot.sendMessage( `${ticket.contact.number}@c.us`, newMedia ); - await ticket.update({ lastMessage: mediaUrl }); + await ticket.update({ lastMessage: media.filename }); return sentMessage; };