From 55e83ff8fcb5c198cb988bf2094dfb6549ad98ed Mon Sep 17 00:00:00 2001 From: adriano Date: Mon, 5 Sep 2022 13:36:42 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20de=20bug=20quando=20o=20us?= =?UTF-8?q?uario=20clicar=20no=20botao=20retornar=20o=20atendimento=20para?= =?UTF-8?q?=20a=20fila?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/controllers/TicketController.ts | 32 ++++++++++++--------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts index e68af61..a127959 100644 --- a/backend/src/controllers/TicketController.ts +++ b/backend/src/controllers/TicketController.ts @@ -50,7 +50,7 @@ import CountTicketService from "../services/TicketServices/CountTicketService"; import CountTicketsByUserQueue from "../services/UserServices/CountTicketsByUserQueue"; import ShowUserService from "../services/UserServices/ShowUserService"; -export const index = async (req: Request, res: Response): Promise => { +export const index = async (req: Request, res: Response): Promise => { const { pageNumber, @@ -61,7 +61,7 @@ export const index = async (req: Request, res: Response): Promise => { queueIds: queueIdsStringified, withUnreadMessages, unlimited - } = req.query as IndexQuery; + } = req.query as IndexQuery; const userId = req.user.id; @@ -104,7 +104,7 @@ export const store = async (req: Request, res: Response): Promise => { console.log('TICKET QUEUE CHOICE !!!!!!!') } else { - ticket = await CreateTicketService({ contactId, status, userId }); + ticket = await CreateTicketService({ contactId, status, userId }); } const io = getIO(); @@ -143,14 +143,14 @@ export const show = async (req: Request, res: Response): Promise => { }; -export const count = async (req: Request, res: Response): Promise => { +export const count = async (req: Request, res: Response): Promise => { - type indexQ = { status: string; date?: string; }; - const {status, date} = req.query as IndexQuery + type indexQ = { status: string; date?: string; }; + const { status, date } = req.query as IndexQuery - const ticketCount = await CountTicketService(status, date); + const ticketCount = await CountTicketService(status, date); - return res.status(200).json(ticketCount); + return res.status(200).json(ticketCount); }; @@ -237,15 +237,19 @@ export const update = async (req: Request, res: Response): Promise => ticketId }); - const dateToday = splitDateTime(new Date(format(new Date(), 'yyyy-MM-dd HH:mm:ss', { locale: ptBR }))) - TicketEmiterSumOpenClosedByUser(ticketData.userId.toString(), dateToday.fullDate, dateToday.fullDate) + if (ticketData.userId) { + + const dateToday = splitDateTime(new Date(format(new Date(), 'yyyy-MM-dd HH:mm:ss', { locale: ptBR }))) + TicketEmiterSumOpenClosedByUser(ticketData.userId.toString(), dateToday.fullDate, dateToday.fullDate) + + } ticket2 = ticket } - + if (userOldInfo) { @@ -255,13 +259,13 @@ export const update = async (req: Request, res: Response): Promise => // console.log('FECHOU...') - TicketEmiterSumOpenClosedByUser(userOldInfo.userId.toString(), dateToday.fullDate, dateToday.fullDate) - + TicketEmiterSumOpenClosedByUser(userOldInfo.userId.toString(), dateToday.fullDate, dateToday.fullDate) + } } - + return res.status(200).json(ticket2); };