From abe0b84b83d82915ffb4b932025d21c7840147be Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Fri, 25 Sep 2020 22:37:32 -0300
Subject: [PATCH] improvement: change ticket user after aceppting ticket

---
 backend/src/controllers/TicketController.ts                | 5 +++--
 backend/src/services/TicketServices/UpdateTicketService.ts | 5 ++++-
 frontend/src/components/MessagesList/index.js              | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts
index 7cf9510..f87726b 100644
--- a/backend/src/controllers/TicketController.ts
+++ b/backend/src/controllers/TicketController.ts
@@ -67,7 +67,7 @@ export const update = async (
   const { ticketId } = req.params;
   const ticketData: TicketData = req.body;
 
-  const { ticket, oldStatus } = await UpdateTicketService({
+  const { ticket, oldStatus, ticketUser } = await UpdateTicketService({
     ticketData,
     ticketId
   });
@@ -83,7 +83,8 @@ export const update = async (
 
   io.to(ticket.status).to(ticketId).emit("ticket", {
     action: "updateStatus",
-    ticket
+    ticket,
+    user: ticketUser
   });
 
   return res.status(200).json(ticket);
diff --git a/backend/src/services/TicketServices/UpdateTicketService.ts b/backend/src/services/TicketServices/UpdateTicketService.ts
index 0753d52..6fc9353 100644
--- a/backend/src/services/TicketServices/UpdateTicketService.ts
+++ b/backend/src/services/TicketServices/UpdateTicketService.ts
@@ -1,6 +1,7 @@
 import AppError from "../../errors/AppError";
 import Contact from "../../models/Contact";
 import Ticket from "../../models/Ticket";
+import User from "../../models/User";
 
 interface TicketData {
   status?: string;
@@ -14,6 +15,7 @@ interface Request {
 
 interface Response {
   ticket: Ticket;
+  ticketUser: User | null;
   oldStatus: string;
 }
 
@@ -44,8 +46,9 @@ const UpdateTicketService = async ({
     status,
     userId
   });
+  const ticketUser = await ticket.$get("user", { attributes: ["id", "name"] });
 
-  return { ticket, oldStatus };
+  return { ticket, oldStatus, ticketUser };
 };
 
 export default UpdateTicketService;
diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index f6852eb..a310c93 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -334,7 +334,7 @@ const MessagesList = () => {
 
 		socket.on("ticket", data => {
 			if (data.action === "updateStatus") {
-				setTicket(data.ticket);
+				setTicket({ ...data.ticket, user: data.user });
 			}
 
 			if (data.action === "delete") {