NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-16 12:12:55 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1384 from leandrosroc/develop

Browse Source 
fix(api): modifica fetchChats para trazer mensagens de contatos não salvos
This commit is contained in:
Davidson Gomes 2025-04-30 06:15:42 -03:00 committed by GitHub
commit ccbd866e42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/api/services/channel.service.ts
View File

@ -513,7 +513,20 @@ export class ChannelStartupService {
contactFindManyArgs.skip = query.offset * (validPage - 1); contactFindManyArgs.skip = query.offset * (validPage - 1);
} }
return await this.prismaRepository.contact.findMany(contactFindManyArgs); const contacts = await this.prismaRepository.contact.findMany(contactFindManyArgs);
return contacts.map((contact) => {
const remoteJid = contact.remoteJid;
const isGroup = remoteJid.endsWith('@g.us');
const isSaved = !!contact.pushName || !!contact.profilePicUrl;
const type = isGroup ? 'group' : isSaved ? 'contact' : 'group_member';
return {
...contact,
isGroup,
isSaved,
type,
};
});
} }
public cleanMessageData(message: any) { public cleanMessageData(message: any) {
@ -682,13 +695,6 @@ export class ChannelStartupService {
: createJid(query.where?.remoteJid) : createJid(query.where?.remoteJid)
: null; : null;
const limit =
query.offset && !query.page
? Prisma.sql` LIMIT ${query.offset}`
: query.offset && query.page
? Prisma.sql` LIMIT ${query.offset} OFFSET ${((query.page as number) - 1) * query.offset}`
: Prisma.sql``;
const where = { const where = {
instanceId: this.instanceId, instanceId: this.instanceId,
}; };
@ -700,91 +706,93 @@ export class ChannelStartupService {
const timestampFilter = const timestampFilter =
query?.where?.messageTimestamp?.gte && query?.where?.messageTimestamp?.lte query?.where?.messageTimestamp?.gte && query?.where?.messageTimestamp?.lte
? Prisma.sql` ? Prisma.sql`
AND "Message"."messageTimestamp" >= ${Math.floor(new Date(query.where.messageTimestamp.gte).getTime() / 1000)} AND "Message"."messageTimestamp" >= ${Math.floor(new Date(query.where.messageTimestamp.gte).getTime() / 1000)}
AND "Message"."messageTimestamp" <= ${Math.floor(new Date(query.where.messageTimestamp.lte).getTime() / 1000)}` AND "Message"."messageTimestamp" <= ${Math.floor(new Date(query.where.messageTimestamp.lte).getTime() / 1000)}`
: Prisma.sql``; : Prisma.sql``;
const limit = query?.take ? Prisma.sql`LIMIT ${query.take}` : Prisma.sql``;
const offset = query?.skip ? Prisma.sql`OFFSET ${query.skip}` : Prisma.sql``;
const results = await this.prismaRepository.$queryRaw` const results = await this.prismaRepository.$queryRaw`
WITH rankedMessages AS ( WITH rankedMessages AS (
SELECT DISTINCT ON ("Contact"."remoteJid") SELECT DISTINCT ON ("Message"."key"->>'remoteJid')
"Contact"."id", "Contact"."id" as "contactId",
"Contact"."remoteJid", "Message"."key"->>'remoteJid' as "remoteJid",
"Contact"."pushName", COALESCE("Contact"."pushName", "Message"."pushName") as "pushName",
"Contact"."profilePicUrl", "Contact"."profilePicUrl",
COALESCE( COALESCE(
to_timestamp("Message"."messageTimestamp"::double precision), to_timestamp("Message"."messageTimestamp"::double precision),
"Contact"."updatedAt" "Contact"."updatedAt"
) as "updatedAt", ) as "updatedAt",
"Chat"."name" as "chatName", "Chat"."createdAt" as "windowStart",
"Chat"."createdAt" as "windowStart", "Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
"Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires", CASE WHEN "Chat"."createdAt" + INTERVAL '24 hours' > NOW() THEN true ELSE false END as "windowActive",
CASE "Message"."id" AS lastMessageId,
WHEN "Chat"."createdAt" + INTERVAL '24 hours' > NOW() THEN true "Message"."key" AS lastMessage_key,
ELSE false "Message"."pushName" AS lastMessagePushName,
END as "windowActive", "Message"."participant" AS lastMessageParticipant,
"Message"."id" AS lastMessageId, "Message"."messageType" AS lastMessageMessageType,
"Message"."key" AS lastMessage_key, "Message"."message" AS lastMessageMessage,
"Message"."pushName" AS lastMessagePushName, "Message"."contextInfo" AS lastMessageContextInfo,
"Message"."participant" AS lastMessageParticipant, "Message"."source" AS lastMessageSource,
"Message"."messageType" AS lastMessageMessageType, "Message"."messageTimestamp" AS lastMessageMessageTimestamp,
"Message"."message" AS lastMessageMessage, "Message"."instanceId" AS lastMessageInstanceId,
"Message"."contextInfo" AS lastMessageContextInfo, "Message"."sessionId" AS lastMessageSessionId,
"Message"."source" AS lastMessageSource, "Message"."status" AS lastMessageStatus
"Message"."messageTimestamp" AS lastMessageMessageTimestamp, FROM "Message"
"Message"."instanceId" AS lastMessageInstanceId, LEFT JOIN "Contact" ON "Contact"."remoteJid" = "Message"."key"->>'remoteJid' AND "Contact"."instanceId" = "Message"."instanceId"
"Message"."sessionId" AS lastMessageSessionId, LEFT JOIN "Chat" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid' AND "Chat"."instanceId" = "Message"."instanceId"
"Message"."status" AS lastMessageStatus WHERE "Message"."instanceId" = ${this.instanceId}
FROM "Contact" ${remoteJid ? Prisma.sql`AND "Message"."key"->>'remoteJid' = ${remoteJid}` : Prisma.sql``}
INNER JOIN "Message" ON "Message"."key"->>'remoteJid' = "Contact"."remoteJid" ${timestampFilter}
LEFT JOIN "Chat" ON "Chat"."remoteJid" = "Contact"."remoteJid" ORDER BY "Message"."key"->>'remoteJid', "Message"."messageTimestamp" DESC
AND "Chat"."instanceId" = "Contact"."instanceId" )
WHERE SELECT * FROM rankedMessages
"Contact"."instanceId" = ${this.instanceId} ORDER BY "updatedAt" DESC NULLS LAST
AND "Message"."instanceId" = ${this.instanceId} ${limit}
${remoteJid ? Prisma.sql`AND "Contact"."remoteJid" = ${remoteJid}` : Prisma.sql``} ${offset};
${timestampFilter}
ORDER BY
"Contact"."remoteJid",
"Message"."messageTimestamp" DESC
${limit}
)
SELECT * FROM rankedMessages
ORDER BY "updatedAt" DESC NULLS LAST;
`; `;
if (results && isArray(results) && results.length > 0) { if (results && isArray(results) && results.length > 0) {
const mappedResults = results.map((contact) => { const mappedResults = results.map((item) => {
const lastMessage = contact.lastMessageId const lastMessage = item.lastMessageId
? { ? {
id: contact.lastMessageId, id: item.lastMessageId,
key: contact.lastMessageKey, key: item.lastMessage_key,
pushName: contact.lastMessagePushName, pushName: item.lastMessagePushName,
participant: contact.lastMessageParticipant, participant: item.lastMessageParticipant,
messageType: contact.lastMessageMessageType, messageType: item.lastMessageMessageType,
message: contact.lastMessageMessage, message: item.lastMessageMessage,
contextInfo: contact.lastMessageContextInfo, contextInfo: item.lastMessageContextInfo,
source: contact.lastMessageSource, source: item.lastMessageSource,
messageTimestamp: contact.lastMessageMessageTimestamp, messageTimestamp: item.lastMessageMessageTimestamp,
instanceId: contact.lastMessageInstanceId, instanceId: item.lastMessageInstanceId,
sessionId: contact.lastMessageSessionId, sessionId: item.lastMessageSessionId,
status: contact.lastMessageStatus, status: item.lastMessageStatus,
} }
: undefined; : undefined;
return { return {
id: contact.id, id: item.contactId || null,
remoteJid: contact.remoteJid, remoteJid: item.remoteJid,
pushName: contact.pushName, pushName: item.pushName,
chatName: contact.chatName, profilePicUrl: item.profilePicUrl,
profilePicUrl: contact.profilePicUrl, updatedAt: item.updatedAt,
updatedAt: contact.updatedAt, windowStart: item.windowStart,
windowStart: contact.windowStart, windowExpires: item.windowExpires,
windowExpires: contact.windowExpires, windowActive: item.windowActive,
windowActive: contact.windowActive,
lastMessage: lastMessage ? this.cleanMessageData(lastMessage) : undefined, lastMessage: lastMessage ? this.cleanMessageData(lastMessage) : undefined,
unreadCount: 0,
isSaved: !!item.contactId,
}; };
}); });
if (query?.take && query?.skip) {
const skip = query.skip || 0;
const take = query.take || 20;
return mappedResults.slice(skip, skip + take);
}
return mappedResults; return mappedResults;
} }