Accept multiple tickets from same contact (on different connections)

ticketz-oss · Jul 6, 2024 · 48fc4ac · 48fc4ac
1 parent 65cde63
commit 48fc4ac
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/backend/src/services/TicketServices/FindOrCreateTicketService.ts b/backend/src/services/TicketServices/FindOrCreateTicketService.ts
@@ -25,7 +25,7 @@ const FindOrCreateTicketService = async (
         [Op.or]: ["open", "pending"]
       },
       contactId: groupContact ? groupContact.id : contact.id,
-      companyId
+      whatsappId
     },
     order: [["id", "DESC"]]
   });
@@ -37,7 +37,8 @@ const FindOrCreateTicketService = async (
   if (!ticket && groupContact) {
     ticket = await Ticket.findOne({
       where: {
-        contactId: groupContact.id
+        contactId: groupContact.id,
+        whatsappId
       },
       order: [["updatedAt", "DESC"]]
     });
@@ -69,7 +70,8 @@ const FindOrCreateTicketService = async (
         updatedAt: {
           [Op.between]: [+subHours(new Date(), 2), +new Date()]
         },
-        contactId: contact.id
+        contactId: contact.id,
+        whatsappId
       },
       order: [["updatedAt", "DESC"]]
     });
@@ -106,8 +108,6 @@ const FindOrCreateTicketService = async (
       whatsappId,
       userId: ticket.userId
     });
-  } else {
-    await ticket.update({ whatsappId });
   }
 
   ticket = await ShowTicketService(ticket.id, companyId);