adjusting route for proper webhook definition

code-chat-br · Dec 23, 2023 · d384f2f · d384f2f
1 parent 986d901
commit d384f2f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 services:
   api:
     container_name: codechat_api
-    image: codechat/develop
+    image: codechat/api:latest
     restart: unless-stopped
     ports:
       - 8084:8084

diff --git a/src/guards/instance.guard.ts b/src/guards/instance.guard.ts
@@ -99,7 +99,8 @@ export class InstanceGuard {
       req.originalUrl.includes('/instance/create') ||
       req.originalUrl.includes('/instance/fetchInstances') ||
       req.originalUrl.includes('/instance/qrcode') ||
-      req.originalUrl.includes('/instance/connect')
+      req.originalUrl.includes('/instance/connect') ||
+      req.originalUrl.includes('/webhook')
     ) {
       return next();
     }

diff --git a/src/repository/repository.service.ts b/src/repository/repository.service.ts
@@ -89,6 +89,10 @@ export class Repository extends PrismaClient {
           continue;
         }
 
+        if (!find?.events) {
+          break;
+        }
+
         const k = `ARRAY['${key}']`;
         const v = `to_jsonb(${value}::boolean)`;
 
@@ -106,6 +110,7 @@ export class Repository extends PrismaClient {
         data: {
           url: data?.url,
           enabled: data?.enabled,
+          events: !find?.events ? data?.events : undefined,
         },
         select: {
           id: true,

diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
@@ -130,6 +130,7 @@ export class InstanceController {
 
       switch (state) {
         case 'close':
+          await instance.loadWebhook();
           await instance.connectToWhatsapp();
           await delay(2000);
           return instance.qrCode;

diff --git a/src/whatsapp/controllers/webhook.controller.ts b/src/whatsapp/controllers/webhook.controller.ts
@@ -34,8 +34,6 @@
  * └──────────────────────────────────────────────────────────────────────────────┘
  */
 
-import { isURL } from 'class-validator';
-import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WebhookService } from '../services/webhook.service';
@@ -44,13 +42,10 @@ export class WebhookController {
   constructor(private readonly webhookService: WebhookService) {}
 
   public async createWebhook(instance: InstanceDto, data: WebhookDto) {
-    if (!isURL(data.url)) {
-      throw new BadRequestException('Invalid "url" property');
-    }
-    return this.webhookService.create(instance, data);
+    return await this.webhookService.create(instance, data);
   }
 
   public async findWebhook(instance: InstanceDto) {
-    return this.webhookService.find(instance);
+    return await this.webhookService.find(instance);
   }
 }