diff --git a/backend/src/controllers/MessageController.js b/backend/src/controllers/MessageController.js index 81ad5cb..24f2df6 100644 --- a/backend/src/controllers/MessageController.js +++ b/backend/src/controllers/MessageController.js @@ -1,5 +1,6 @@ const Message = require("../models/Message"); const Contact = require("../models/Contact"); +const User = require("../models/User"); const Ticket = require("../models/Ticket"); const { getIO } = require("../libs/socket"); @@ -52,6 +53,10 @@ exports.index = async (req, res, next) => { include: "extraInfo", attributes: ["id", "name", "number", "profilePicUrl"], }, + { + model: User, + as: "user", + }, ], }); diff --git a/backend/src/models/Ticket.js b/backend/src/models/Ticket.js index c489697..c541a8c 100644 --- a/backend/src/models/Ticket.js +++ b/backend/src/models/Ticket.js @@ -18,7 +18,7 @@ class Ticket extends Sequelize.Model { static associate(models) { this.belongsTo(models.Contact, { foreignKey: "contactId", as: "contact" }); - this.belongsTo(models.User, { foreignKey: "userId" }); + this.belongsTo(models.User, { foreignKey: "userId", as: "user" }); this.hasMany(models.Message, { foreignKey: "ticketId" }); } } diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js index a571d3f..3e2a497 100644 --- a/frontend/src/components/MessagesList/index.js +++ b/frontend/src/components/MessagesList/index.js @@ -524,7 +524,7 @@ const MessagesList = () => { loading ? ( ) : ( - `Atribuído á ${ticket.userId}` + ticket.user && `Atribuído à: ${ticket.user.name}` ) } />