Skip to content

Commit 013fa9d

Browse files
committed
fix: join is considering instance id
1 parent a42bc98 commit 013fa9d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/api/services/channel.service.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,8 @@ export class ChannelStartupService {
655655
(ARRAY_AGG("Message"."sessionId" ORDER BY "Message"."messageTimestamp" DESC))[1] AS last_message_session_id,
656656
(ARRAY_AGG("Message"."status" ORDER BY "Message"."messageTimestamp" DESC))[1] AS last_message_status
657657
FROM "Chat"
658-
LEFT JOIN "Message" ON "Message"."messageType" != 'reactionMessage' and "Message"."key"->>'remoteJid' = "Chat"."remoteJid"
659-
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
658+
LEFT JOIN "Message" ON "Message"."messageType" != 'reactionMessage' and "Message"."key"->>'remoteJid' = "Chat"."remoteJid" AND "Chat"."instanceId" = "Message"."instanceId"
659+
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid" AND "Chat"."instanceId" = "Contact"."instanceId"
660660
WHERE
661661
"Chat"."instanceId" = ${this.instanceId}
662662
GROUP BY
@@ -690,8 +690,8 @@ export class ChannelStartupService {
690690
(ARRAY_AGG("Message"."sessionId" ORDER BY "Message"."messageTimestamp" DESC))[1] AS last_message_session_id,
691691
(ARRAY_AGG("Message"."status" ORDER BY "Message"."messageTimestamp" DESC))[1] AS last_message_status
692692
FROM "Chat"
693-
LEFT JOIN "Message" ON "Message"."messageType" != 'reactionMessage' and "Message"."key"->>'remoteJid' = "Chat"."remoteJid"
694-
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
693+
LEFT JOIN "Message" ON "Message"."messageType" != 'reactionMessage' and "Message"."key"->>'remoteJid' = "Chat"."remoteJid" AND "Chat"."instanceId" = "Message"."instanceId"
694+
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid" AND "Chat"."instanceId" = "Contact"."instanceId"
695695
WHERE
696696
"Chat"."instanceId" = ${this.instanceId} AND "Chat"."remoteJid" = ${remoteJid} and "Message"."messageType" != 'reactionMessage'
697697
GROUP BY

0 commit comments

Comments
 (0)