bug fix: delete instance - Closes #149

code-chat-br · Sep 4, 2024 · 75b0801 · 75b0801
1 parent 9a73494
commit 75b0801
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
@@ -207,13 +207,14 @@ export class InstanceController {
   }
 
   public async deleteInstance({ instanceName }: InstanceDto, force?: boolean) {
-    const stateConn = await this.connectionState({ instanceName });
-    if (stateConn?.state === 'open') {
+    const instance = this.waMonitor.waInstances.get(instanceName);
+    if (instance && instance.getInstance()?.status?.state === 'open') {
       throw new BadRequestException([
         'Deletion failed',
         'The instance needs to be disconnected',
       ]);
     }
+
     const del = await this.instanceService.deleteInstance({ instanceName }, force);
     del['deletedAt'] = new Date();
     return del;

diff --git a/src/whatsapp/services/instance.service.ts b/src/whatsapp/services/instance.service.ts
@@ -219,7 +219,7 @@ export class InstanceService {
         ];
       }
 
-      delete this.waMonitor.waInstances[instance.instanceName];
+      this.waMonitor.waInstances.delete(instance.instanceName);
 
       return await this.repository.instance.delete({
         where: { name: instance.instanceName },