diff --git a/backend/src/controllers/ReportController.ts b/backend/src/controllers/ReportController.ts index 7f63d19..d67833f 100644 --- a/backend/src/controllers/ReportController.ts +++ b/backend/src/controllers/ReportController.ts @@ -229,7 +229,21 @@ export const reportMessagesUserByDateStartDateEnd = async (req: Request, res: Re const { userId, startDate, endDate } = req.query as IndexQuery - const data_query_messages = await ShowMessageReport(userId, startDate, endDate); + let data_query_messages = await ShowMessageReport(userId, startDate, endDate); + + for (var i = 0; i < data_query_messages.length; i++) { + + if (data_query_messages[i].fromMe) { + data_query_messages[i].fromMe = 'Atendente' + } + else { + data_query_messages[i].fromMe = 'Cliente' + } + + data_query_messages[i].id = (i+1) + + console.log('data_query_messages: ', data_query_messages[i]) + } return res.status(200).json(data_query_messages); diff --git a/backend/src/services/MessageServices/ShowMessageReport.ts b/backend/src/services/MessageServices/ShowMessageReport.ts index 69f80ed..78b1f9f 100644 --- a/backend/src/services/MessageServices/ShowMessageReport.ts +++ b/backend/src/services/MessageServices/ShowMessageReport.ts @@ -17,7 +17,7 @@ import { string } from "yup/lib/locale"; import Whatsapp from "../../models/Whatsapp"; //Report by user, startDate, endDate -const ShowMessageReport = async (id: string | number, startDate: string, endDate: string): Promise => { +const ShowMessageReport = async (id: string | number, startDate: string, endDate: string): Promise => { let where_clause_user = {} @@ -51,21 +51,21 @@ const ShowMessageReport = async (id: string | number, startDate: string, endDate const messages = await Message.findAll({ where: where_clause , - + raw: true, attributes: ['id', 'body', 'read', 'mediaType','fromMe', 'mediaUrl', [Sequelize.fn("DATE_FORMAT",Sequelize.col("Message.createdAt"),"%d/%m/%Y %H:%i:%s"),"createdAt"]], include: [ { model: Ticket, where: where_clause_user, - required:true, + required:true, attributes: ['id', 'status', 'statusChatEnd'], include: [ { - model: Contact, - attributes: ['name', 'number'] + model: Contact, + attributes: ['name', 'number'] }, { model: User,