From 2e3ff855092881d6371baae92251213654df6d53 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 6 May 2024 17:22:16 -0700 Subject: [PATCH] Update crawl-cancel.ts --- apps/api/src/controllers/crawl-cancel.ts | 30 +++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/apps/api/src/controllers/crawl-cancel.ts b/apps/api/src/controllers/crawl-cancel.ts index 7523b78..8e8ba31 100644 --- a/apps/api/src/controllers/crawl-cancel.ts +++ b/apps/api/src/controllers/crawl-cancel.ts @@ -4,6 +4,7 @@ import { RateLimiterMode } from "../../src/types"; import { addWebScraperJob } from "../../src/services/queue-jobs"; import { getWebScraperQueue } from "../../src/services/queue-service"; import { supabase_service } from "../../src/services/supabase"; +import { billTeam } from "../../src/services/billing/credit_billing"; export async function crawlCancelController(req: Request, res: Response) { try { @@ -21,7 +22,11 @@ export async function crawlCancelController(req: Request, res: Response) { } // check if the job belongs to the team - const {data, error: supaError}= await supabase_service.from("bulljobs_teams").select("*").eq("job_id", req.params.jobId).eq("team_id", team_id); + const { data, error: supaError } = await supabase_service + .from("bulljobs_teams") + .select("*") + .eq("job_id", req.params.jobId) + .eq("team_id", team_id); if (supaError) { return res.status(500).json({ error: supaError.message }); } @@ -29,19 +34,26 @@ export async function crawlCancelController(req: Request, res: Response) { if (data.length === 0) { return res.status(403).json({ error: "Unauthorized" }); } + const jobState = await job.getState(); + const { partialDocs } = await job.progress(); - try { - await job.moveToFailed(Error("Job cancelled by user"), true); - - } catch (error) { - console.error(error); - + if (partialDocs && partialDocs.length > 0 && jobState === "active") { + console.log("Billing team for partial docs..."); + // Note: the credits that we will bill them here might be lower than the actual + // due to promises that are not yet resolved + await billTeam(team_id, partialDocs.length); } - const jobState = await job.getState(); + try { + await job.moveToFailed(Error("Job cancelled by user"), true); + } catch (error) { + console.error(error); + } + + const newJobState = await job.getState(); res.json({ - status: jobState === "failed" ? "cancelled" : "Cancelling...", + status: newJobState === "failed" ? "cancelled" : "Cancelling...", }); } catch (error) { console.error(error);