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

improvement: show username on ticket header

Browse Source
This commit is contained in:
canove
2020-07-29 10:14:38 -03:00
parent c76ac84a76
commit a36bd8f5a6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/controllers/MessageController.js
View File

@@ -1,5 +1,6 @@
const Message = require("../models/Message"); const Message = require("../models/Message");
const Contact = require("../models/Contact"); const Contact = require("../models/Contact");
const User = require("../models/User");
const Ticket = require("../models/Ticket"); const Ticket = require("../models/Ticket");
const { getIO } = require("../libs/socket"); const { getIO } = require("../libs/socket");
@@ -52,6 +53,10 @@ exports.index = async (req, res, next) => {
include: "extraInfo", include: "extraInfo",
attributes: ["id", "name", "number", "profilePicUrl"], attributes: ["id", "name", "number", "profilePicUrl"],
}, },
{
model: User,
as: "user",
},
], ],
}); });

2
backend/src/models/Ticket.js
View File

@@ -18,7 +18,7 @@ class Ticket extends Sequelize.Model {
static associate(models) { static associate(models) {
this.belongsTo(models.Contact, { foreignKey: "contactId", as: "contact" }); 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" }); this.hasMany(models.Message, { foreignKey: "ticketId" });
} }
} }

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

@@ -524,7 +524,7 @@ const MessagesList = () => {
loading ? ( loading ? (
<Skeleton animation="wave" width={80} /> <Skeleton animation="wave" width={80} />
) : ( ) : (
`Atribuído á ${ticket.userId}` ticket.user && `Atribuído à: ${ticket.user.name}`
) )
} }
/> />