From edb4fa3b3e7b77de8b8bf60a175022b280467f23 Mon Sep 17 00:00:00 2001
From: Marlon Alves <nolramaf@hotmail.com>
Date: Wed, 3 Sep 2025 06:21:24 -0300
Subject: [PATCH] feat/force MessageGroupId

---
 src/api/integrations/event/sqs/sqs.controller.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/api/integrations/event/sqs/sqs.controller.ts b/src/api/integrations/event/sqs/sqs.controller.ts
index 49ffa64f..c92b849a 100644
--- a/src/api/integrations/event/sqs/sqs.controller.ts
+++ b/src/api/integrations/event/sqs/sqs.controller.ts
@@ -103,6 +103,7 @@ export class SqsController extends EventController implements EventControllerInt
     }
 
     if (this.sqs) {
+      const serverConfig = configService.get<HttpServer>('SERVER');
       const sqsConfig = configService.get<Sqs>('SQS');
 
       const we = event.replace(/[.-]/gm, '_').toUpperCase();
@@ -118,7 +119,6 @@ export class SqsController extends EventController implements EventControllerInt
       }
 
       if (Array.isArray(sqsEvents) && sqsEvents.includes(we)) {
-        const serverName = sqsConfig.GLOBAL_ENABLED ? configService.get<HttpServer>('SERVER').NAME : 'evolution';
         const prefixName = sqsConfig.GLOBAL_ENABLED ? sqsConfig.GLOBAL_PREFIX_NAME : instanceName;
         const eventFormatted =
           sqsConfig.GLOBAL_ENABLED && sqsConfig.GLOBAL_FORCE_SINGLE_QUEUE
@@ -132,7 +132,7 @@ export class SqsController extends EventController implements EventControllerInt
           instance: instanceName,
           dataType: 'json',
           data,
-          server: serverName,
+          server: serverConfig.NAME,
           server_url: serverUrl,
           date_time: dateTime,
           sender,
@@ -163,10 +163,11 @@ export class SqsController extends EventController implements EventControllerInt
           message.dataType = 's3';
         }
 
-        const isGlobalEnabled = configService.get<Sqs>('SQS').GLOBAL_ENABLED;
+        const messageGroupId = sqsConfig.GLOBAL_ENABLED ? `${serverConfig.NAME}-${instanceName}` : 'evolution';
+        const isGlobalEnabled = sqsConfig.GLOBAL_ENABLED;
         const params = {
           MessageBody: JSON.stringify(message),
-          MessageGroupId: serverName,
+          MessageGroupId: messageGroupId,
           QueueUrl: sqsUrl,
           ...(!isGlobalEnabled && {
             MessageDeduplicationId: `${instanceName}_${eventFormatted}_${Date.now()}`,
@@ -208,9 +209,7 @@ export class SqsController extends EventController implements EventControllerInt
 
       for (const event of events) {
         const normalizedEvent =
-          sqsConfig.GLOBAL_ENABLED && sqsConfig.GLOBAL_FORCE_SINGLE_QUEUE
-            ? 'singlequeue'
-            : event.toLowerCase();
+          sqsConfig.GLOBAL_ENABLED && sqsConfig.GLOBAL_FORCE_SINGLE_QUEUE ? 'singlequeue' : event.toLowerCase();
         if (eventsFinded.includes(normalizedEvent)) {
           this.logger.info(`A queue para o evento "${normalizedEvent}" já existe. Ignorando criação.`);
           continue;