From ec7986420d946f82aa467242811b2e3379dde869 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Wed, 27 Mar 2024 13:21:39 -0300
Subject: [PATCH] rabbitmq

---
 src/libs/amqp.server.ts                   | 7 ++++---
 src/whatsapp/services/whatsapp.service.ts | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libs/amqp.server.ts b/src/libs/amqp.server.ts
index b76d2d10f..fc95b33c4 100644
--- a/src/libs/amqp.server.ts
+++ b/src/libs/amqp.server.ts
@@ -10,7 +10,6 @@ let amqpChannel: amqp.Channel | null = null;
 export const initAMQP = () => {
   return new Promise<void>((resolve, reject) => {
     const uri = configService.get<Rabbitmq>('RABBITMQ').URI;
-    const exchangeName = configService.get<Rabbitmq>('RABBITMQ').EXCHANGE_NAME ?? 'evolution_exchange';
     amqp.connect(uri, (error, connection) => {
       if (error) {
         reject(error);
@@ -23,6 +22,8 @@ export const initAMQP = () => {
           return;
         }
 
+        const exchangeName = 'evolution_exchange';
+
         channel.assertExchange(exchangeName, 'topic', {
           durable: true,
           autoDelete: false,
@@ -50,7 +51,7 @@ export const initQueues = (instanceName: string, events: string[]) => {
 
   queues.forEach((event) => {
     const amqp = getAMQP();
-    const exchangeName = configService.get<Rabbitmq>('RABBITMQ').EXCHANGE_NAME ?? instanceName;
+    const exchangeName = instanceName ?? 'evolution_exchange';
 
     amqp.assertExchange(exchangeName, 'topic', {
       durable: true,
@@ -80,7 +81,7 @@ export const removeQueues = (instanceName: string, events: string[]) => {
     return `${event.replace(/_/g, '.').toLowerCase()}`;
   });
 
-  const exchangeName = configService.get<Rabbitmq>('RABBITMQ').EXCHANGE_NAME ?? instanceName;
+  const exchangeName = instanceName ?? 'evolution_exchange';
 
   queues.forEach((event) => {
     const amqp = getAMQP();
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index f861df2db..29c58f6c6 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -13,7 +13,6 @@ import {
   Database,
   HttpServer,
   Log,
-  Rabbitmq,
   Sqs,
   Webhook,
   Websocket,
@@ -686,7 +685,7 @@ export class WAStartupService {
 
       if (amqp) {
         if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) {
-          const exchangeName = this.configService.get<Rabbitmq>('RABBITMQ').EXCHANGE_NAME ?? this.instanceName;
+          const exchangeName = this.instanceName ?? 'evolution_exchange';
 
           amqp.assertExchange(exchangeName, 'topic', {
             durable: true,