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

improvement: change ticket user after aceppting ticket

Browse Source
This commit is contained in:
canove
2020-09-25 22:37:32 -03:00
parent 9d87522ad9
commit abe0b84b83
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/controllers/TicketController.ts
View File

@@ -67,7 +67,7 @@ export const update = async (
const { ticketId } = req.params; const { ticketId } = req.params;
const ticketData: TicketData = req.body; const ticketData: TicketData = req.body;
const { ticket, oldStatus } = await UpdateTicketService({ const { ticket, oldStatus, ticketUser } = await UpdateTicketService({
ticketData, ticketData,
ticketId ticketId
}); });
@@ -83,7 +83,8 @@ export const update = async (
io.to(ticket.status).to(ticketId).emit("ticket", { io.to(ticket.status).to(ticketId).emit("ticket", {
action: "updateStatus", action: "updateStatus",
ticket ticket,
user: ticketUser
}); });
return res.status(200).json(ticket); return res.status(200).json(ticket);

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

@@ -1,6 +1,7 @@
import AppError from "../../errors/AppError"; import AppError from "../../errors/AppError";
import Contact from "../../models/Contact"; import Contact from "../../models/Contact";
import Ticket from "../../models/Ticket"; import Ticket from "../../models/Ticket";
import User from "../../models/User";
interface TicketData { interface TicketData {
status?: string; status?: string;
@@ -14,6 +15,7 @@ interface Request {
interface Response { interface Response {
ticket: Ticket; ticket: Ticket;
ticketUser: User | null;
oldStatus: string; oldStatus: string;
} }
@@ -44,8 +46,9 @@ const UpdateTicketService = async ({
status, status,
userId userId
}); });
const ticketUser = await ticket.$get("user", { attributes: ["id", "name"] });
return { ticket, oldStatus }; return { ticket, oldStatus, ticketUser };
}; };
export default UpdateTicketService; export default UpdateTicketService;

2
frontend/src/components/MessagesList/index.js
View File

@@ -334,7 +334,7 @@ const MessagesList = () => {
socket.on("ticket", data => { socket.on("ticket", data => {
if (data.action === "updateStatus") { if (data.action === "updateStatus") {
setTicket(data.ticket); setTicket({ ...data.ticket, user: data.user });
} }
if (data.action === "delete") { if (data.action === "delete") {