From cb7638146675633bcf926f267f9ddf9facbf882f Mon Sep 17 00:00:00 2001
From: Guilherme Gomes <guinomotec.dev@gmail.com>
Date: Tue, 27 May 2025 17:52:45 -0300
Subject: [PATCH] refactor: reorder parameters and simplify EvolutionBot DTO

This commit refines the EvolutionBot integration by reordering constructor parameters for consistency and removing unused properties from the EvolutionBotDto and EvolutionBotSettingDto classes. Key changes include:
- Adjusted the parameter order in the EvolutionBotService constructor for improved clarity.
- Streamlined the EvolutionBotDto and EvolutionBotSettingDto by eliminating unnecessary fields.

These updates enhance the maintainability and readability of the EvolutionBot integration.
---
 .../evolutionBot/dto/evolutionBot.dto.ts      | 28 -------------------
 .../services/evolutionBot.service.ts          | 16 +++++++----
 src/api/server.module.ts                      |  2 +-
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/src/api/integrations/chatbot/evolutionBot/dto/evolutionBot.dto.ts b/src/api/integrations/chatbot/evolutionBot/dto/evolutionBot.dto.ts
index 4ceb0c9a..dad8e559 100644
--- a/src/api/integrations/chatbot/evolutionBot/dto/evolutionBot.dto.ts
+++ b/src/api/integrations/chatbot/evolutionBot/dto/evolutionBot.dto.ts
@@ -1,38 +1,10 @@
-import { TriggerOperator, TriggerType } from '@prisma/client';
-
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class EvolutionBotDto extends BaseChatbotDto {
   apiUrl: string;
   apiKey: string;
-  enabled?: boolean;
-  expire?: number;
-  keywordFinish?: string | null;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
-  triggerType: TriggerType;
-  triggerOperator?: TriggerOperator;
-  triggerValue?: string;
-  ignoreJids?: any;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }
 
 export class EvolutionBotSettingDto extends BaseChatbotSettingDto {
-  expire?: number;
-  keywordFinish?: string | null;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
   botIdFallback?: string;
-  ignoreJids?: any;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }
diff --git a/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts b/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts
index edfba052..8f988991 100644
--- a/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts
+++ b/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts
@@ -2,7 +2,7 @@
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
 import { Integration } from '@api/types/wa.types';
-import { Auth, ConfigService, HttpServer } from '@config/env.config';
+import { ConfigService, HttpServer } from '@config/env.config';
 import { EvolutionBot, EvolutionBotSetting, IntegrationSession } from '@prisma/client';
 import { sendTelemetry } from '@utils/sendTelemetry';
 import axios from 'axios';
@@ -15,8 +15,8 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
 
   constructor(
     waMonitor: WAMonitoringService,
-    configService: ConfigService,
     prismaRepository: PrismaRepository,
+    configService: ConfigService,
     openaiService: OpenaiService,
   ) {
     super(waMonitor, prismaRepository, 'EvolutionBotService', configService);
@@ -65,12 +65,9 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
           const transcription = await this.openaiService.speechToText(msg, instance);
           if (transcription) {
             payload.query = transcription;
-          } else {
-            payload.query = '[Audio message could not be transcribed]';
           }
         } catch (err) {
           this.logger.error(`[EvolutionBot] Failed to transcribe audio: ${err}`);
-          payload.query = '[Audio message could not be transcribed]';
         }
       }
 
@@ -91,6 +88,13 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
         await instance.client.sendPresenceUpdate('composing', remoteJid);
       }
 
+      const endpoint = bot.apiUrl;
+
+      if (!endpoint) {
+        this.logger.error('No Evolution Bot endpoint defined');
+        return;
+      }
+
       let headers: any = {
         'Content-Type': 'application/json',
       };
@@ -102,7 +106,7 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
         };
       }
 
-      const response = await axios.post(bot.apiUrl, payload, {
+      const response = await axios.post(endpoint, payload, {
         headers,
       });
 
diff --git a/src/api/server.module.ts b/src/api/server.module.ts
index da29feda..385fe17b 100644
--- a/src/api/server.module.ts
+++ b/src/api/server.module.ts
@@ -126,7 +126,7 @@ export const typebotController = new TypebotController(typebotService, prismaRep
 const difyService = new DifyService(waMonitor, prismaRepository, configService, openaiService);
 export const difyController = new DifyController(difyService, prismaRepository, waMonitor);
 
-const evolutionBotService = new EvolutionBotService(waMonitor, configService, prismaRepository, openaiService);
+const evolutionBotService = new EvolutionBotService(waMonitor, prismaRepository, configService, openaiService);
 export const evolutionBotController = new EvolutionBotController(evolutionBotService, prismaRepository, waMonitor);
 
 const flowiseService = new FlowiseService(waMonitor, prismaRepository, configService, openaiService);