chore: equations and adjustments for the new manager

src/api/services/channel.service.ts

@@ -1138,15 +1138,22 @@ export class ChannelStartupService {
   }
 
   public async fetchContacts(query: Query<Contact>) {
-    const remoteJid = query.where?.remoteJid.includes('@')
-      ? query.where?.remoteJid
-      : this.createJid(query.where?.remoteJid);
+    const remoteJid = query?.where?.remoteJid
+      ? query?.where?.remoteJid.includes('@')
+        ? query.where?.remoteJid
+        : this.createJid(query.where?.remoteJid)
+      : null;
+
+    const where = {
+      instanceId: this.instanceId,
+    };
+
+    if (remoteJid) {
+      where['remoteJid'] = remoteJid;
+    }
 
     return await this.prismaRepository.contact.findMany({
-      where: {
-        instanceId: this.instanceId,
-        remoteJid,
-      },
+      where,
     });
   }
 
@@ -1164,8 +1171,6 @@ export class ChannelStartupService {
         : this.createJid(keyFilters?.remoteJid)
       : null;
 
-    console.log(remoteJid);
-
     const count = await this.prismaRepository.message.count({
       where: {
         instanceId: this.instanceId,
@@ -1246,9 +1251,47 @@ export class ChannelStartupService {
     });
   }
 
-  public async fetchChats() {
-    return await this.prismaRepository.chat.findMany({
-      where: { instanceId: this.instanceId },
-    });
+  public async fetchChats(query: any) {
+    const remoteJid = query?.where?.remoteJid
+      ? query?.where?.remoteJid.includes('@')
+        ? query.where?.remoteJid
+        : this.createJid(query.where?.remoteJid)
+      : null;
+
+    let result;
+    if (remoteJid) {
+      result = await this.prismaRepository.$queryRaw`
+            SELECT 
+                "Chat"."id",
+                "Chat"."remoteJid",
+                "Chat"."labels",
+                "Chat"."createdAt",
+                "Chat"."updatedAt",
+                "Contact"."pushName",
+                "Contact"."profilePicUrl"
+            FROM "Chat"
+            LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
+            WHERE "Chat"."instanceId" = ${this.instanceId}
+            AND "Chat"."remoteJid" = ${remoteJid}
+            ORDER BY "Chat"."updatedAt" DESC
+        `;
+    } else {
+      result = await this.prismaRepository.$queryRaw`
+            SELECT 
+                "Chat"."id",
+                "Chat"."remoteJid",
+                "Chat"."labels",
+                "Chat"."createdAt",
+                "Chat"."updatedAt",
+                "Contact"."pushName",
+                "Contact"."profilePicUrl"
+            FROM "Chat"
+            LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
+            WHERE "Chat"."instanceId" = ${this.instanceId}
+            ORDER BY "Chat"."updatedAt" DESC
+        `;
+    }
+
+    return result;
   }
 }

src/api/services/channels/whatsapp.baileys.service.ts

@@ -416,6 +416,17 @@ export class BaileysStartupService extends ChannelStartupService {
       }
     }
 
+    if (connection === 'connecting') {
+      if (this.configService.get<Database>('DATABASE').ENABLED) {
+        await this.prismaRepository.instance.update({
+          where: { id: this.instanceId },
+          data: {
+            connectionStatus: 'connecting',
+          },
+        });
+      }
+    }
+
     if (connection === 'open') {
       this.instance.wuid = this.client.user.id.replace(/:\d+/, '');
       this.instance.profilePictureUrl = (await this.profilePicture(this.instance.wuid)).profilePictureUrl;

src/api/services/monitor.service.ts

@@ -79,6 +79,13 @@ export class WAMonitoringService {
         Sqs: true,
         Websocket: true,
         Setting: true,
+        _count: {
+          select: {
+            Message: true,
+            Contact: true,
+            Chat: true,
+          },
+        },
       },
     });