From 65deab09b41bc8e60bda3aab642efea31a02caf1 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Sat, 24 Oct 2020 19:01:04 -0300
Subject: [PATCH] feat: update tickets list on transfer

---
 backend/src/controllers/TicketController.ts         |  7 +++----
 backend/src/controllers/UserController.ts           |  3 ---
 .../helpers/UpdateDeletedUserOpenTicketsStatus.ts   |  5 ++---
 .../services/TicketServices/UpdateTicketService.ts  | 13 ++++++++++---
 frontend/src/components/Ticket/index.js             |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts
index b1980c2..d90020d 100644
--- a/backend/src/controllers/TicketController.ts
+++ b/backend/src/controllers/TicketController.ts
@@ -76,14 +76,14 @@ export const update = async (
   const { ticketId } = req.params;
   const ticketData: TicketData = req.body;
 
-  const { ticket, oldStatus, ticketUser } = await UpdateTicketService({
+  const { ticket, oldStatus, oldUserId } = await UpdateTicketService({
     ticketData,
     ticketId
   });
 
   const io = getIO();
 
-  if (ticket.status !== oldStatus) {
+  if (ticket.status !== oldStatus || ticket.user?.id !== oldUserId) {
     io.to(oldStatus).emit("ticket", {
       action: "delete",
       ticketId: ticket.id
@@ -92,8 +92,7 @@ export const update = async (
 
   io.to(ticket.status).to("notification").to(ticketId).emit("ticket", {
     action: "updateStatus",
-    ticket,
-    user: ticketUser
+    ticket
   });
 
   return res.status(200).json(ticket);
diff --git a/backend/src/controllers/UserController.ts b/backend/src/controllers/UserController.ts
index e27669c..e1c8a19 100644
--- a/backend/src/controllers/UserController.ts
+++ b/backend/src/controllers/UserController.ts
@@ -16,9 +16,6 @@ type IndexQuery = {
 };
 
 export const index = async (req: Request, res: Response): Promise<Response> => {
-  if (req.user.profile !== "admin") {
-    throw new AppError("ERR_NO_PERMISSION", 403); // should be handled better.
-  }
   const { searchParam, pageNumber } = req.query as IndexQuery;
 
   const { users, count, hasMore } = await ListUsersService({
diff --git a/backend/src/helpers/UpdateDeletedUserOpenTicketsStatus.ts b/backend/src/helpers/UpdateDeletedUserOpenTicketsStatus.ts
index 60f8687..110ba03 100644
--- a/backend/src/helpers/UpdateDeletedUserOpenTicketsStatus.ts
+++ b/backend/src/helpers/UpdateDeletedUserOpenTicketsStatus.ts
@@ -8,7 +8,7 @@ const UpdateDeletedUserOpenTicketsStatus = async (
   tickets.forEach(async t => {
     const ticketId = t.id.toString();
 
-    const { ticket, oldStatus, ticketUser } = await UpdateTicketService({
+    const { ticket, oldStatus } = await UpdateTicketService({
       ticketData: { status: "pending" },
       ticketId
     });
@@ -23,8 +23,7 @@ const UpdateDeletedUserOpenTicketsStatus = async (
 
     io.to(ticket.status).to(ticketId).emit("ticket", {
       action: "updateStatus",
-      ticket,
-      user: ticketUser
+      ticket
     });
   });
 };
diff --git a/backend/src/services/TicketServices/UpdateTicketService.ts b/backend/src/services/TicketServices/UpdateTicketService.ts
index df42ac5..ed61b64 100644
--- a/backend/src/services/TicketServices/UpdateTicketService.ts
+++ b/backend/src/services/TicketServices/UpdateTicketService.ts
@@ -17,8 +17,8 @@ interface Request {
 
 interface Response {
   ticket: Ticket;
-  ticketUser: User | null;
   oldStatus: string;
+  oldUserId: number | undefined;
 }
 
 const UpdateTicketService = async ({
@@ -34,6 +34,11 @@ const UpdateTicketService = async ({
         model: Contact,
         as: "contact",
         attributes: ["id", "name", "number", "profilePicUrl"]
+      },
+      {
+        model: User,
+        as: "user",
+        attributes: ["id", "name"]
       }
     ]
   });
@@ -45,6 +50,7 @@ const UpdateTicketService = async ({
   await SetTicketMessagesAsRead(ticket);
 
   const oldStatus = ticket.status;
+  const oldUserId = ticket.user?.id;
 
   if (oldStatus === "closed") {
     await CheckContactOpenTickets(ticket.contact.id);
@@ -54,9 +60,10 @@ const UpdateTicketService = async ({
     status,
     userId
   });
-  const ticketUser = await ticket.$get("user", { attributes: ["id", "name"] });
 
-  return { ticket, oldStatus, ticketUser };
+  await ticket.reload();
+
+  return { ticket, oldStatus, oldUserId };
 };
 
 export default UpdateTicketService;
diff --git a/frontend/src/components/Ticket/index.js b/frontend/src/components/Ticket/index.js
index 1985b32..01eff14 100644
--- a/frontend/src/components/Ticket/index.js
+++ b/frontend/src/components/Ticket/index.js
@@ -101,7 +101,7 @@ const Ticket = () => {
 
 		socket.on("ticket", data => {
 			if (data.action === "updateStatus") {
-				setTicket({ ...data.ticket, user: data.user });
+				setTicket(data.ticket);
 			}
 
 			if (data.action === "delete") {