From c281fe62c015f1f14de77c2f3b59b44c8a56ddac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20M=C3=B3ricz?= <mo.geryy@gmail.com>
Date: Fri, 16 Aug 2024 23:43:54 +0200
Subject: [PATCH] fix(crawl): propagate db fix to preview endpoint

---
 apps/api/src/controllers/crawl-status.ts |  2 +-
 apps/api/src/controllers/status.ts       | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/apps/api/src/controllers/crawl-status.ts b/apps/api/src/controllers/crawl-status.ts
index b429fe9c..3488ce26 100644
--- a/apps/api/src/controllers/crawl-status.ts
+++ b/apps/api/src/controllers/crawl-status.ts
@@ -6,7 +6,7 @@ import { Logger } from "../../src/lib/logger";
 import { getCrawl, getCrawlJobs } from "../../src/lib/crawl-redis";
 import { supabaseGetJobsById } from "../../src/lib/supabase-jobs";
 
-async function getJobs(ids: string[]) {
+export async function getJobs(ids: string[]) {
   const jobs = (await Promise.all(ids.map(x => getScrapeQueue().getJob(x)))).filter(x => x);
   
   if (process.env.USE_DB_AUTHENTICATION === "true") {
diff --git a/apps/api/src/controllers/status.ts b/apps/api/src/controllers/status.ts
index 21a9cf47..e469060f 100644
--- a/apps/api/src/controllers/status.ts
+++ b/apps/api/src/controllers/status.ts
@@ -3,6 +3,7 @@ import { Logger } from "../../src/lib/logger";
 import { getCrawl, getCrawlJobs } from "../../src/lib/crawl-redis";
 import { getScrapeQueue } from "../../src/services/queue-service";
 import { supabaseGetJobById } from "../../src/lib/supabase-jobs";
+import { getJobs } from "./crawl-status";
 
 export async function crawlJobStatusPreviewController(req: Request, res: Response) {
   try {
@@ -22,19 +23,7 @@ export async function crawlJobStatusPreviewController(req: Request, res: Respons
     //   }
     // }
 
-    const jobs = (await Promise.all(jobIDs.map(async x => {
-      const job = await getScrapeQueue().getJob(x);
-      
-      if (process.env.USE_DB_AUTHENTICATION === "true") {
-        const supabaseData = await supabaseGetJobById(job.id);
-
-        if (supabaseData) {
-          job.returnvalue = supabaseData.docs;
-        }
-      }
-
-      return job;
-    }))).sort((a, b) => a.timestamp - b.timestamp);
+    const jobs = (await getJobs(jobIDs)).sort((a, b) => a.timestamp - b.timestamp);
     const jobStatuses = await Promise.all(jobs.map(x => x.getState()));
     const jobStatus = sc.cancelled ? "failed" : jobStatuses.every(x => x === "completed") ? "completed" : jobStatuses.some(x => x === "failed") ? "failed" : "active";