Whatsapp padrão do usuário e vários tickets por contato

rtenorioh · Jun 28, 2022 · 930db47 · 930db47
1 parent b19c9c2
commit 930db47
Show file tree

Hide file tree

Showing 23 changed files with 209 additions and 69 deletions.
diff --git a/backend/src/controllers/ImportPhoneContactsController.ts b/backend/src/controllers/ImportPhoneContactsController.ts
@@ -2,7 +2,8 @@ import { Request, Response } from "express";
 import ImportContactsService from "../services/WbotServices/ImportContactsService";
 
 export const store = async (req: Request, res: Response): Promise<Response> => {
-  await ImportContactsService();
+  const userId:number = parseInt(req.user.id);
+  await ImportContactsService(userId);
 
   return res.status(200).json({ message: "contacts imported" });
-};
+};
diff --git a/backend/src/controllers/UserController.ts b/backend/src/controllers/UserController.ts
@@ -34,7 +34,7 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
     throw new AppError("ERR_USER_CREATION_COUNT", 403);
   }
 
-  const { email, password, name, profile, queueIds } = req.body;
+  const { email, password, name, profile, queueIds, whatsappId } = req.body;
 
   if (
     req.url === "/signup" &&
@@ -50,7 +50,8 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
     password,
     name,
     profile,
-    queueIds
+    queueIds,
+    whatsappId
   });
 
   const io = getIO();
@@ -83,7 +84,6 @@ export const update = async (
     throw new AppError("ERR_NO_PERMISSION", 403);
   }
 
-  //const { userId } = req.params;
   const userData = req.body;
 
   const user = await UpdateUserService({ userData, userId });

diff --git a/backend/src/helpers/CheckContactOpenTickets.ts b/backend/src/helpers/CheckContactOpenTickets.ts
@@ -2,14 +2,23 @@ import { Op } from "sequelize";
 import AppError from "../errors/AppError";
 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({
-    where: { contactId, status: { [Op.or]: ["open", "pending"] } }
+    where: { 
+      contactId, 
+      whatsappId, 
+      status: { 
+        [Op.or]: ["open", "pending"] 
+      } 
+    }
   });
 
   if (ticket) {
     throw new AppError("ERR_OTHER_OPEN_TICKET");
   }
 };
 
-export default CheckContactOpenTickets;
+export default CheckContactOpenTickets;
diff --git a/backend/src/helpers/GetDefaultWhatsApp.ts b/backend/src/helpers/GetDefaultWhatsApp.ts
@@ -1,7 +1,17 @@
 import AppError from "../errors/AppError";
 import Whatsapp from "../models/Whatsapp";
+import GetDefaultWhatsAppByUser from "./GetDefaultWhatsAppByUser";
+
+const GetDefaultWhatsApp = async (
+  userId?: number
+): Promise<Whatsapp> => {
+  if(userId) {
+    const whatsappByUser = await GetDefaultWhatsAppByUser(userId);
+    if(whatsappByUser !== null) {
+      return whatsappByUser;
+    }
+  }
 
-const GetDefaultWhatsApp = async (): Promise<Whatsapp> => {
   const defaultWhatsapp = await Whatsapp.findOne({
     where: { isDefault: true }
   });
@@ -13,4 +23,4 @@ const GetDefaultWhatsApp = async (): Promise<Whatsapp> => {
   return defaultWhatsapp;
 };
 
-export default GetDefaultWhatsApp;
+export default GetDefaultWhatsApp;
diff --git a/backend/src/helpers/GetDefaultWhatsAppByUser.ts b/backend/src/helpers/GetDefaultWhatsAppByUser.ts
@@ -0,0 +1,20 @@
+import User from "../models/User";
+import Whatsapp from "../models/Whatsapp";
+import { logger } from "../utils/logger";
+
+const GetDefaultWhatsAppByUser = async (
+  userId: number
+): Promise<Whatsapp | null> => {
+  const user = await User.findByPk(userId, {include: ["whatsapp"]});
+  if( user === null ) {
+    return null;
+  }
+
+  if(user.whatsapp !== null) {
+    logger.info(`Found whatsapp linked to user '${user.name}' is '${user.whatsapp.name}'.`);
+  }
+
+  return user.whatsapp;
+};
+
+export default GetDefaultWhatsAppByUser;
diff --git a/backend/src/helpers/GetTicketWbot.ts b/backend/src/helpers/GetTicketWbot.ts
@@ -5,7 +5,7 @@ import Ticket from "../models/Ticket";
 
 const GetTicketWbot = async (ticket: Ticket): Promise<Session> => {
   if (!ticket.whatsappId) {
-    const defaultWhatsapp = await GetDefaultWhatsApp();
+    const defaultWhatsapp = await GetDefaultWhatsApp(ticket.user.id);
 
     await ticket.$set("whatsapp", defaultWhatsapp);
   }
@@ -15,4 +15,4 @@ const GetTicketWbot = async (ticket: Ticket): Promise<Session> => {
   return wbot;
 };
 
-export default GetTicketWbot;
+export default GetTicketWbot;
diff --git a/backend/src/helpers/SerializeUser.ts b/backend/src/helpers/SerializeUser.ts
@@ -1,12 +1,14 @@
 import Queue from "../models/Queue";
 import User from "../models/User";
+import Whatsapp from "../models/Whatsapp";
 
 interface SerializedUser {
   id: number;
   name: string;
   email: string;
   profile: string;
   queues: Queue[];
+  whatsapp: Whatsapp;
 }
 
 export const SerializeUser = (user: User): SerializedUser => {
@@ -15,6 +17,7 @@ export const SerializeUser = (user: User): SerializedUser => {
     name: user.name,
     email: user.email,
     profile: user.profile,
-    queues: user.queues
+    queues: user.queues,
+    whatsapp: user.whatsapp
   };
-};
+};
diff --git a/backend/src/models/User.ts b/backend/src/models/User.ts
@@ -11,12 +11,15 @@ import {
   AutoIncrement,
   Default,
   HasMany,
-  BelongsToMany
+  BelongsToMany,
+  ForeignKey,
+  BelongsTo
 } from "sequelize-typescript";
 import { hash, compare } from "bcryptjs";
 import Ticket from "./Ticket";
 import Queue from "./Queue";
 import UserQueue from "./UserQueue";
+import Whatsapp from "./Whatsapp";
 
 @Table
 class User extends Model<User> {
@@ -45,6 +48,13 @@ class User extends Model<User> {
   @Column
   profile: string;
 
+  @ForeignKey(() => Whatsapp)
+  @Column
+  whatsappId: number;
+
+  @BelongsTo(() => Whatsapp)
+  whatsapp: Whatsapp;
+
   @CreatedAt
   createdAt: Date;
 
@@ -70,4 +80,4 @@ class User extends Model<User> {
   };
 }
 
-export default User;
+export default User;
diff --git a/backend/src/services/TicketServices/CreateTicketService.ts b/backend/src/services/TicketServices/CreateTicketService.ts
@@ -2,30 +2,39 @@ import AppError from "../../errors/AppError";
 import CheckContactOpenTickets from "../../helpers/CheckContactOpenTickets";
 import GetDefaultWhatsApp from "../../helpers/GetDefaultWhatsApp";
 import Ticket from "../../models/Ticket";
+import User from "../../models/User";
 import ShowContactService from "../ContactServices/ShowContactService";
 
 interface Request {
   contactId: number;
   status: string;
   userId: number;
+  queueId ?: number;
 }
 
 const CreateTicketService = async ({
   contactId,
   status,
-  userId
+  userId,
+  queueId
 }: Request): Promise<Ticket> => {
-  const defaultWhatsapp = await GetDefaultWhatsApp();
+  const defaultWhatsapp = await GetDefaultWhatsApp(userId);
 
-  await CheckContactOpenTickets(contactId);
+  await CheckContactOpenTickets(contactId, defaultWhatsapp.id);
 
   const { isGroup } = await ShowContactService(contactId);
 
+  if(queueId === undefined) {
+    const user = await User.findByPk(userId, { include: ["queues"]});
+    queueId = user?.queues.length === 1 ? user.queues[0].id : undefined;
+  }
+
   const { id }: Ticket = await defaultWhatsapp.$create("ticket", {
     contactId,
     status,
     isGroup,
-    userId
+    userId,
+    queueId
   });
 
   const ticket = await Ticket.findByPk(id, { include: ["contact"] });
@@ -37,4 +46,4 @@ const CreateTicketService = async ({
   return ticket;
 };
 
-export default CreateTicketService;
+export default CreateTicketService;
diff --git a/backend/src/services/TicketServices/FindOrCreateTicketService.ts b/backend/src/services/TicketServices/FindOrCreateTicketService.ts
@@ -1,5 +1,5 @@
 // import { subHours } from "date-fns";
-const add = require('date-fns/add')
+const add = require('date-fns/add');
 import { Op } from "sequelize";
 import Contact from "../../models/Contact";
 import Ticket from "../../models/Ticket";
@@ -17,7 +17,8 @@ const FindOrCreateTicketService = async (
       status: {
         [Op.or]: ["open", "pending"]
       },
-      contactId: groupContact ? groupContact.id : contact.id
+      contactId: groupContact ? groupContact.id : contact.id,
+      whatsappId: whatsappId
     }
   });
 
@@ -28,7 +29,8 @@ const FindOrCreateTicketService = async (
   if (!ticket && groupContact) {
     ticket = await Ticket.findOne({
       where: {
-        contactId: groupContact.id
+        contactId: groupContact.id,
+        whatsappId: whatsappId
       },
       order: [["updatedAt", "DESC"]]
     });
@@ -52,7 +54,8 @@ const FindOrCreateTicketService = async (
         updatedAt: {
           [Op.between]: [+add(new Date(), {seconds: timeCreateNewTicket}), +new Date()]
         },
-        contactId: contact.id
+        contactId: contact.id,
+        whatsappId: whatsappId
       },
       order: [["updatedAt", "DESC"]]
     });

diff --git a/backend/src/services/TicketServices/UpdateTicketService.ts b/backend/src/services/TicketServices/UpdateTicketService.ts
@@ -10,6 +10,7 @@ interface TicketData {
   status?: string;
   userId?: number;
   queueId?: number;
+  whatsappId?: number;
 }
 
 interface Request {
@@ -27,16 +28,20 @@ const UpdateTicketService = async ({
   ticketData,
   ticketId
 }: Request): Promise<Response> => {
-  const { status, userId, queueId } = ticketData;
+  const { status, userId, queueId, whatsappId } = ticketData;
 
   const ticket = await ShowTicketService(ticketId);
   await SetTicketMessagesAsRead(ticket);
 
+  if(whatsappId && ticket.whatsappId !== whatsappId) {
+    await CheckContactOpenTickets(ticket.contactId, whatsappId);
+  }
+
   const oldStatus = ticket.status;
   const oldUserId = ticket.user?.id;
 
   if (oldStatus === "closed") {
-    await CheckContactOpenTickets(ticket.contact.id);
+    await CheckContactOpenTickets(ticket.contact.id, ticket.whatsappId);
   }
 
   await ticket.update({
@@ -45,7 +50,11 @@ const UpdateTicketService = async ({
     userId
   });
 
-
+  if(whatsappId) {
+    await ticket.update({
+      whatsappId
+    });
+  }
 
   await ticket.reload();
 
@@ -58,8 +67,6 @@ const UpdateTicketService = async ({
     });
   }
 
-
-
   io.to(ticket.status)
     .to("notification")
     .to(ticketId.toString())
@@ -71,4 +78,4 @@ const UpdateTicketService = async ({
   return { ticket, oldStatus, oldUserId };
 };
 
-export default UpdateTicketService;
+export default UpdateTicketService;
diff --git a/backend/src/services/UserServices/CreateUserService.ts b/backend/src/services/UserServices/CreateUserService.ts
@@ -10,6 +10,7 @@ interface Request {
   name: string;
   queueIds?: number[];
   profile?: string;
+  whatsappId?: number;
 }
 
 interface Response {
@@ -24,7 +25,8 @@ const CreateUserService = async ({
   password,
   name,
   queueIds = [],
-  profile = "admin"
+  profile = "admin",
+  whatsappId
 }: Request): Promise<Response> => {
   const schema = Yup.object().shape({
     name: Yup.string().required().min(2),
@@ -56,18 +58,17 @@ const CreateUserService = async ({
       email,
       password,
       name,
-      profile
+      profile,
+      whatsappId: whatsappId ? whatsappId : null
     },
-    { include: ["queues"] }
+    { include: ["queues", "whatsapp"] }
   );
 
   await user.$set("queues", queueIds);
 
   await user.reload();
 
-  const serializedUser = SerializeUser(user);
-
-  return serializedUser;
+  return SerializeUser(user);
 };
 
-export default CreateUserService;
+export default CreateUserService;