From dc189e1e9ded529e15ed0375c357142166cd61b4 Mon Sep 17 00:00:00 2001
From: rafaelsideguide <150964962+rafaelsideguide@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:22:59 -0300
Subject: [PATCH] feat: webhooks config on v1

---
 apps/api/src/services/queue-worker.ts | 10 ++--------
 apps/api/src/services/webhook.ts      |  6 +++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/api/src/services/queue-worker.ts b/apps/api/src/services/queue-worker.ts
index 31d70a0b..c373e6f6 100644
--- a/apps/api/src/services/queue-worker.ts
+++ b/apps/api/src/services/queue-worker.ts
@@ -218,8 +218,8 @@ async function processJob(job: Job, token: string) {
       docs,
     };
 
-    if (job.data.mode === "crawl") {
-      await callWebhook(job.data.team_id, job.id as string, data, job.data.webhook, job.data.v1);
+    if (job.data.webhook && job.data.mode !== "crawl") {
+      await callWebhook(job.data.team_id, job.data.crawl_id, data, job.data.webhook, job.data.v1);
     }
 
     if (job.data.crawl_id) {
@@ -342,8 +342,6 @@ async function processJob(job: Job, token: string) {
           error: message /* etc... */,
           docs: fullDocs,
         };
-
-        await callWebhook(job.data.team_id, job.data.crawl_id, data, job.data.webhook, job.data.v1);
       }
     }
 
@@ -386,10 +384,6 @@ async function processJob(job: Job, token: string) {
         "Something went wrong... Contact help@mendable.ai or try again." /* etc... */,
     };
     
-    if (job.data.mode === "crawl" || job.data.crawl_id) {
-      await callWebhook(job.data.team_id, job.data.crawl_id ?? job.id as string, data, job.data.webhook, job.data.v1);
-    }
-    
     if (job.data.crawl_id) {
       await logJob({
         job_id: job.id as string,
diff --git a/apps/api/src/services/webhook.ts b/apps/api/src/services/webhook.ts
index b60774e0..a3af9c34 100644
--- a/apps/api/src/services/webhook.ts
+++ b/apps/api/src/services/webhook.ts
@@ -2,9 +2,9 @@ import { legacyDocumentConverter } from "../../src/controllers/v1/types";
 import { Logger } from "../../src/lib/logger";
 import { supabase_service } from "./supabase";
 
-export const callWebhook = async (teamId: string, jobId: string, data: any, specified?: string, v1 = false) => {
+export const callWebhook = async (teamId: string, id: string, data: any, specified?: string, v1 = false) => {
   try {
-    const selfHostedUrl = process.env.SELF_HOSTED_WEBHOOK_URL?.replace("{{JOB_ID}}", jobId);
+    const selfHostedUrl = process.env.SELF_HOSTED_WEBHOOK_URL?.replace("{{JOB_ID}}", id);
     const useDbAuthentication = process.env.USE_DB_AUTHENTICATION === 'true';
     let webhookUrl = specified ?? selfHostedUrl;
 
@@ -50,7 +50,7 @@ export const callWebhook = async (teamId: string, jobId: string, data: any, spec
       },
       body: JSON.stringify({
         success: data.success,
-        jobId: jobId,
+        id: id,
         data: dataToSend,
         error: data.error || undefined,
       }),