cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-20 04:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ open more than one ticket per user as long as it is using another whatsapp

Browse Source
This commit is contained in:
Ricardo Paes
2022-02-23 11:21:11 -03:00
parent afb5d68602
commit acd628028e
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/helpers/CheckContactOpenTickets.ts
View File

@@ -2,9 +2,12 @@ import { Op } from "sequelize";
import AppError from "../errors/AppError"; import AppError from "../errors/AppError";
import Ticket from "../models/Ticket"; import Ticket from "../models/Ticket";
const CheckContactOpenTickets = async (contactId: number): Promise<void> => { const CheckContactOpenTickets = async (
contactId: number,
whatsappId: number
): Promise<void> => {
const ticket = await Ticket.findOne({ const ticket = await Ticket.findOne({
where: { contactId, status: { [Op.or]: ["open", "pending"] } } where: { contactId, whatsappId, status: { [Op.or]: ["open", "pending"] } }
}); });
if (ticket) { if (ticket) {

2
backend/src/services/TicketServices/CreateTicketService.ts
View File

@@ -17,7 +17,7 @@ const CreateTicketService = async ({
}: Request): Promise<Ticket> => { }: Request): Promise<Ticket> => {
const defaultWhatsapp = await GetDefaultWhatsApp(userId); const defaultWhatsapp = await GetDefaultWhatsApp(userId);
await CheckContactOpenTickets(contactId); await CheckContactOpenTickets(contactId, defaultWhatsapp.id);
const { isGroup } = await ShowContactService(contactId); const { isGroup } = await ShowContactService(contactId);

9
backend/src/services/TicketServices/FindOrCreateTicketService.ts
View File

@@ -15,7 +15,8 @@ const FindOrCreateTicketService = async (
status: { status: {
[Op.or]: ["open", "pending"] [Op.or]: ["open", "pending"]
}, },
contactId: groupContact ? groupContact.id : contact.id contactId: groupContact ? groupContact.id : contact.id,
whatsappId: whatsappId
} }
}); });
@@ -26,7 +27,8 @@ const FindOrCreateTicketService = async (
if (!ticket && groupContact) { if (!ticket && groupContact) {
ticket = await Ticket.findOne({ ticket = await Ticket.findOne({
where: { where: {
contactId: groupContact.id contactId: groupContact.id,
whatsappId: whatsappId
}, },
order: [["updatedAt", "DESC"]] order: [["updatedAt", "DESC"]]
}); });
@@ -46,7 +48,8 @@ const FindOrCreateTicketService = async (
updatedAt: { updatedAt: {
[Op.between]: [+subHours(new Date(), 2), +new Date()] [Op.between]: [+subHours(new Date(), 2), +new Date()]
}, },
contactId: contact.id contactId: contact.id,
whatsappId: whatsappId
}, },
order: [["updatedAt", "DESC"]] order: [["updatedAt", "DESC"]]
}); });

2
backend/src/services/TicketServices/UpdateTicketService.ts
View File

@@ -36,7 +36,7 @@ const UpdateTicketService = async ({
const oldUserId = ticket.user?.id; const oldUserId = ticket.user?.id;
if (oldStatus === "closed") { if (oldStatus === "closed") {
await CheckContactOpenTickets(ticket.contact.id); await CheckContactOpenTickets(ticket.contact.id, ticket.whatsappId);
} }
await ticket.update({ await ticket.update({