Merge pull request #1012 from yousseefspires/fix/chats-messages

Add unique in Chat by instance/remotejid
EvolutionAPI · Nov 21, 2024 · d5a7e03 · d5a7e03
2 parents 52b6b61 + f6ccd58
commit d5a7e03
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/prisma/mysql-schema.prisma b/prisma/mysql-schema.prisma
@@ -127,6 +127,7 @@ model Chat {
   unreadMessages Int       @default(0)
   @@index([instanceId])
   @@index([remoteJid])
+  @@unique([instanceId, remoteJid]) 
 }
 
 model Contact {

diff --git a/prisma/postgresql-schema.prisma b/prisma/postgresql-schema.prisma
@@ -127,6 +127,7 @@ model Chat {
   unreadMessages Int       @default(0)
   @@index([instanceId])
   @@index([remoteJid])
+  @@unique([remoteJid, instanceId])
 }
 
 model Contact {

diff --git a/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts b/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
@@ -1147,9 +1147,14 @@ export class BaileysStartupService extends ChannelStartupService {
 
             this.sendDataWebhook(Events.CHATS_UPSERT, [chatToInsert]);
             if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
-              await this.prismaRepository.chat.create({
-                data: chatToInsert,
-              });
+                try {
+                  await this.prismaRepository.chat.create({
+                    data: chatToInsert,
+                  });
+                }
+                catch(error){
+                  console.log(`Chat insert record ignored: ${chatToInsert.remoteJid} - ${chatToInsert.instanceId}`);
+                }
             }
           }
 
@@ -1483,9 +1488,14 @@ export class BaileysStartupService extends ChannelStartupService {
 
             this.sendDataWebhook(Events.CHATS_UPSERT, [chatToInsert]);
             if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
-              await this.prismaRepository.chat.create({
-                data: chatToInsert,
-              });
+              try {
+                await this.prismaRepository.chat.create({
+                  data: chatToInsert,
+                });
+              }
+              catch(error){
+                console.log(`Chat insert record ignored: ${chatToInsert.remoteJid} - ${chatToInsert.instanceId}`);
+              }
             }
           }
         }