From 1b79ce1a554adfb4c06c40b71bd246c89ea96b62 Mon Sep 17 00:00:00 2001 From: adriano Date: Wed, 21 Jun 2023 14:22:23 -0300 Subject: [PATCH] Fazendo ajuste para diferenciar o whastapp pelo numero --- backend/src/helpers/CheckContactOpenTickets.ts | 18 +++++++++++++++++- .../TicketServices/CreateTicketService.ts | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/backend/src/helpers/CheckContactOpenTickets.ts b/backend/src/helpers/CheckContactOpenTickets.ts index 4739606..52c6700 100644 --- a/backend/src/helpers/CheckContactOpenTickets.ts +++ b/backend/src/helpers/CheckContactOpenTickets.ts @@ -1,13 +1,29 @@ import { Op } from "sequelize"; import AppError from "../errors/AppError"; import Ticket from "../models/Ticket"; +import ListWhatsAppsNumber from "../services/WhatsappService/ListWhatsAppsNumber"; const CheckContactOpenTickets = async (contactId: number | string, whatsappId: number | string): Promise => { + + // let whats = await ListWhatsAppsNumber(whatsappId) + + // console.log('----> whats: ', whats) + const ticket = await Ticket.findOne({ - where: { contactId, whatsappId, status: { [Op.or]: ["open", "pending"] } } + // where: { contactId, whatsappId, status: { [Op.or]: ["open", "pending"] } } + + where: { + [Op.and]: [ + { contactId: contactId }, + { whatsappId: whatsappId }, + { status: { [Op.or]: ["open", "pending"] } }, + ] + } }); + console.log('>>>>>>>>>>>>>> ticket: ', (JSON.parse(JSON.stringify(ticket)))) + if (ticket) { throw new AppError("ERR_OTHER_OPEN_TICKET"); } diff --git a/backend/src/services/TicketServices/CreateTicketService.ts b/backend/src/services/TicketServices/CreateTicketService.ts index 34eef8f..bfa6576 100644 --- a/backend/src/services/TicketServices/CreateTicketService.ts +++ b/backend/src/services/TicketServices/CreateTicketService.ts @@ -55,6 +55,8 @@ const CreateTicketService = async ({ console.log('matchingQueue: ', matchingQueue) const queueId = matchingQueue ? matchingQueue.queueId : undefined + console.log('contactId, defaultWhatsapp.id: ',contactId, defaultWhatsapp.id) + await CheckContactOpenTickets(contactId, defaultWhatsapp.id); const { isGroup } = await ShowContactService(contactId);