improvement: moved unreadMessages logic to model

This commit is contained in:
canove
2020-08-04 11:18:26 -03:00
parent 7a99abe543
commit 0b61e8391f
4 changed files with 17 additions and 55 deletions

View File

@@ -39,22 +39,6 @@ exports.index = async (req, res) => {
attributes: ["name", "number", "profilePicUrl"],
},
],
attributes: {
include: [
[
Sequelize.literal(`(
SELECT COUNT(*)
FROM Messages AS message
WHERE
message.ticketId = Ticket.id
AND
message.read = 0
)`),
"unreadMessages",
],
],
},
order: [["updatedAt", "DESC"]],
});
@@ -89,22 +73,6 @@ exports.update = async (req, res) => {
attributes: ["name", "number", "profilePicUrl"],
},
],
attributes: {
include: [
[
Sequelize.literal(`(
SELECT COUNT(*)
FROM Messages AS message
WHERE
message.ticketId = Ticket.id
AND
message.read = 0
)`),
"unreadMessages",
],
],
},
});
if (!ticket) {

View File

@@ -1,4 +1,5 @@
const Sequelize = require("sequelize");
const Message = require("./Message");
class Ticket extends Sequelize.Model {
static init(sequelize) {
@@ -6,6 +7,7 @@ class Ticket extends Sequelize.Model {
{
status: { type: Sequelize.STRING, defaultValue: "pending" },
userId: { type: Sequelize.INTEGER, defaultValue: null },
unreadMessages: { type: Sequelize.VIRTUAL },
lastMessage: { type: Sequelize.STRING },
},
{
@@ -13,6 +15,12 @@ class Ticket extends Sequelize.Model {
}
);
this.addHook("afterUpdate", async ticket => {
ticket.unreadMessages = await Message.count({
where: { ticketId: ticket.id, read: false },
});
});
return this;
}

View File

@@ -48,7 +48,7 @@ const verifyTicket = async contact => {
});
if (ticket) {
await ticket.update({ status: "open" });
await ticket.update({ status: "pending", userId: null });
}
}
@@ -120,8 +120,8 @@ const handleMessage = async (msg, ticket, contact) => {
const serializaedTicket = {
...ticket.dataValues,
unreadMessages: 1,
lastMessage: newMessage.body,
// unreadMessages: 1,
// lastMessage: newMessage.body,
contact: contact,
};