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

fix: unreadMessages not showing on notifications popover after refresh

Browse Source
This commit is contained in:
canove
2021-01-13 20:10:05 -03:00
parent 2c2a39ee1f
commit d8605f04b8
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/services/TicketServices/ListTicketsService.ts
View File

@@ -5,7 +5,7 @@ import Ticket from "../../models/Ticket";
import Contact from "../../models/Contact";
import Message from "../../models/Message";
import Queue from "../../models/Queue";
// import ShowUserService from "../UserServices/ShowUserService";
import ShowUserService from "../UserServices/ShowUserService";
interface Request {
searchParam?: string;
@@ -117,18 +117,14 @@ const ListTicketsService = async ({
}
if (withUnreadMessages === "true") {
includeCondition = [
...includeCondition,
{
model: Message,
as: "messages",
attributes: [],
where: {
read: false,
fromMe: false
}
}
];
const user = await ShowUserService(userId);
const userQueueIds = user.queues.map(queue => queue.id);
whereCondition = {
[Op.or]: [{ userId }, { status: "pending" }],
queueId: { [Op.or]: [userQueueIds, null] },
unreadMessages: { [Op.gt]: 0 }
};
}
const limit = 20;