From f3982c0894069cab59e4ab04ce3d6cb4513d8e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20M=C3=B3ricz?= Date: Sat, 25 Jan 2025 19:02:32 +0100 Subject: [PATCH] fix: adapt preview team checks --- apps/api/src/services/billing/credit_billing.ts | 4 ++-- apps/api/src/services/logging/log_job.ts | 6 +++--- apps/api/src/services/notification/email_notification.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/api/src/services/billing/credit_billing.ts b/apps/api/src/services/billing/credit_billing.ts index 7ea822e1..082a32d2 100644 --- a/apps/api/src/services/billing/credit_billing.ts +++ b/apps/api/src/services/billing/credit_billing.ts @@ -48,7 +48,7 @@ export async function supaBillTeam( credits, }); - if (team_id === "preview") { + if (team_id === "preview" || team_id.startsWith("preview_")) { return { success: true, message: "Preview team, no credits used" }; } _logger.info(`Billing team ${team_id} for ${credits} credits`); @@ -109,7 +109,7 @@ export async function supaCheckTeamCredits( credits: number, ): Promise { // WARNING: chunk will be null if team_id is preview -- do not perform operations on it under ANY circumstances - mogery - if (team_id === "preview") { + if (team_id === "preview" || team_id.startsWith("preview_")) { return { success: true, message: "Preview team, no credits used", diff --git a/apps/api/src/services/logging/log_job.ts b/apps/api/src/services/logging/log_job.ts index ddd9b234..707f2911 100644 --- a/apps/api/src/services/logging/log_job.ts +++ b/apps/api/src/services/logging/log_job.ts @@ -50,7 +50,7 @@ export async function logJob(job: FirecrawlJob, force: boolean = false) { num_docs: job.num_docs, docs: cleanOfNull(job.docs), time_taken: job.time_taken, - team_id: job.team_id === "preview" ? null : job.team_id, + team_id: (job.team_id === "preview" || job.team_id?.startsWith("preview_"))? null : job.team_id, mode: job.mode, url: job.url, crawler_options: job.crawlerOptions, @@ -112,7 +112,7 @@ export async function logJob(job: FirecrawlJob, force: boolean = false) { if (process.env.POSTHOG_API_KEY && !job.crawl_id) { let phLog = { distinctId: "from-api", //* To identify this on the group level, setting distinctid to a static string per posthog docs: https://posthog.com/docs/product-analytics/group-analytics#advanced-server-side-only-capturing-group-events-without-a-user - ...(job.team_id !== "preview" && { + ...((job.team_id !== "preview" && !job.team_id?.startsWith("preview_")) && { groups: { team: job.team_id }, }), //* Identifying event on this team event: "job-logged", @@ -121,7 +121,7 @@ export async function logJob(job: FirecrawlJob, force: boolean = false) { message: job.message, num_docs: job.num_docs, time_taken: job.time_taken, - team_id: job.team_id === "preview" ? null : job.team_id, + team_id: (job.team_id === "preview" || job.team_id?.startsWith("preview_"))? null : job.team_id, mode: job.mode, url: job.url, crawler_options: job.crawlerOptions, diff --git a/apps/api/src/services/notification/email_notification.ts b/apps/api/src/services/notification/email_notification.ts index 6f310e5e..8c9a463a 100644 --- a/apps/api/src/services/notification/email_notification.ts +++ b/apps/api/src/services/notification/email_notification.ts @@ -86,7 +86,7 @@ export async function sendNotificationInternal( chunk: AuthCreditUsageChunk, bypassRecentChecks: boolean = false, ): Promise<{ success: boolean }> { - if (team_id === "preview") { + if (team_id === "preview" || team_id.startsWith("preview_")) { return { success: true }; } return await redlock.using(