Merge tag '1.4.7' into develop

* Fixed error return bug
* Fixed problem of getting message when deleting message in chatwoot
* Change in error return pattern

Author: DavidsonGomes

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Fixed error return bug
 * Fixed problem of getting message when deleting message in chatwoot
+* Change in error return pattern
 
 # 1.4.6 (2023-07-26 17:54)
 

src/exceptions/400.exception.ts

@@ -2,7 +2,6 @@ import { HttpStatus } from '../whatsapp/routers/index.router';
 
 export class BadRequestException {
   constructor(...objectError: any[]) {
-    console.log('BadRequestException', objectError);
     throw {
       status: HttpStatus.BAD_REQUEST,
       error: 'Bad Request',

src/main.ts

@@ -14,68 +14,77 @@ import { HttpStatus, router } from './whatsapp/routers/index.router';
 import { waMonitor } from './whatsapp/whatsapp.module';
 
 function initWA() {
-  waMonitor.loadInstance();
+    waMonitor.loadInstance();
 }
 
 function bootstrap() {
-  const logger = new Logger('SERVER');
-  const app = express();
-
-  app.use(
-    cors({
-      origin(requestOrigin, callback) {
-        const { ORIGIN } = configService.get<Cors>('CORS');
-        !requestOrigin ? (requestOrigin = '*') : undefined;
-        if (ORIGIN.indexOf(requestOrigin) !== -1) {
-          return callback(null, true);
-        }
-        return callback(new Error('Not allowed by CORS'));
-      },
-      methods: [...configService.get<Cors>('CORS').METHODS],
-      credentials: configService.get<Cors>('CORS').CREDENTIALS,
-    }),
-    urlencoded({ extended: true, limit: '136mb' }),
-    json({ limit: '136mb' }),
-    compression(),
-  );
-
-  app.set('view engine', 'hbs');
-  app.set('views', join(ROOT_DIR, 'views'));
-  app.use(express.static(join(ROOT_DIR, 'public')));
-
-  app.use('/', router);
-
-  app.use(
-    (err: Error, req: Request, res: Response, next: NextFunction) => {
-      if (err) {
-        return res.status(err['status'] || 500).json(err);
-      }
-
-      next();
-    },
-    (req: Request, res: Response, next: NextFunction) => {
-      const { method, url } = req;
-
-      res.status(HttpStatus.NOT_FOUND).json({
-        status: HttpStatus.NOT_FOUND,
-        message: `Cannot ${method.toUpperCase()} ${url}`,
-        error: 'Not Found',
-      });
-
-      next();
-    },
-  );
-
-  const httpServer = configService.get<HttpServer>('SERVER');
-
-  ServerUP.app = app;
-  const server = ServerUP[httpServer.TYPE];
-
-  server.listen(httpServer.PORT, () => logger.log(httpServer.TYPE.toUpperCase() + ' - ON: ' + httpServer.PORT));
-
-  initWA();
-
-  onUnexpectedError();
+    const logger = new Logger('SERVER');
+    const app = express();
+
+    app.use(
+        cors({
+            origin(requestOrigin, callback) {
+                const { ORIGIN } = configService.get<Cors>('CORS');
+                !requestOrigin ? (requestOrigin = '*') : undefined;
+                if (ORIGIN.indexOf(requestOrigin) !== -1) {
+                    return callback(null, true);
+                }
+                return callback(new Error('Not allowed by CORS'));
+            },
+            methods: [...configService.get<Cors>('CORS').METHODS],
+            credentials: configService.get<Cors>('CORS').CREDENTIALS,
+        }),
+        urlencoded({ extended: true, limit: '136mb' }),
+        json({ limit: '136mb' }),
+        compression(),
+    );
+
+    app.set('view engine', 'hbs');
+    app.set('views', join(ROOT_DIR, 'views'));
+    app.use(express.static(join(ROOT_DIR, 'public')));
+
+    app.use('/', router);
+
+    app.use(
+        (err: Error, req: Request, res: Response, next: NextFunction) => {
+            if (err) {
+                return res.status(err['status'] || 500).json({
+                    status: 'ERROR',
+                    error: err['error'] || 'Internal Server Error',
+                    response: {
+                        message: err['message'] || 'Internal Server Error',
+                    },
+                  }
+                );
+            }
+
+            next();
+        },
+        (req: Request, res: Response, next: NextFunction) => {
+            const { method, url } = req;
+
+            res.status(HttpStatus.NOT_FOUND).json({
+                status: HttpStatus.NOT_FOUND,
+                error: 'Not Found',
+                response: {
+                    message: `Cannot ${method.toUpperCase()} ${url}`,
+                },
+            });
+
+            next();
+        },
+    );
+
+    const httpServer = configService.get<HttpServer>('SERVER');
+
+    ServerUP.app = app;
+    const server = ServerUP[httpServer.TYPE];
+
+    server.listen(httpServer.PORT, () => logger.log(httpServer.TYPE.toUpperCase() + ' - ON: ' + httpServer.PORT));
+
+    initWA();
+
+    onUnexpectedError();
 }
 
 bootstrap();

src/whatsapp/services/chatwoot.service.ts

@@ -930,7 +930,6 @@ export class ChatwootService {
   }
 
   public async receiveWebhook(instance: InstanceDto, body: any) {
-    console.log(body);
     try {
       this.logger.verbose('receive webhook to chatwoot instance: ' + instance.instanceName);
       const client = await this.clientCw(instance);