The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Treat empty IDs as Stripe import conflicts and drop Tinybird time filter.
Kiran K531aa81e7a4e
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.tsindex ae8ae37cda..4a2cc44f5b 100644--- a/apps/web/lib/zod/schemas/commissions.ts+++ b/apps/web/lib/zod/schemas/commissions.ts@@ -651,8 +651,10 @@ const createSaleCommissionSchema = zdata.date != null && "date",data.saleAmount != null && "saleAmount",data.saleEventDate != null && "saleEventDate",- (data.invoiceId || data.sale?.invoiceId) && "invoiceId",- (data.productId || data.sale?.metadata?.productId) && "productId",+ (data.invoiceId != null || data.sale?.invoiceId != null) &&+ "invoiceId",+ (data.productId != null || data.sale?.metadata?.productId != null) &&+ "productId",].filter((field): field is string => Boolean(field));if (conflicts.length > 0) {diff --git a/apps/web/playwright/api/commissions/commissions.spec.ts b/apps/web/playwright/api/commissions/commissions.spec.tsindex 8e6677d596..54bf42a73b 100644--- a/apps/web/playwright/api/commissions/commissions.spec.ts+++ b/apps/web/playwright/api/commissions/commissions.spec.ts@@ -688,6 +688,22 @@ test.describe("Sale commissions", () => {"custom: sale: `sale`, `date`, `invoiceId`, `productId` cannot be provided when `importStripeInvoices` is enabled.",}),},+ {+ name: "rejects empty invoiceId and productId when importing Stripe invoices",+ body: {+ type: "sale",+ partnerId: "pn_test",+ customerId: "cus_test",+ importStripeInvoices: true,+ invoiceId: "",+ productId: "",+ },+ expected: apiError({+ code: "unprocessable_entity",+ message:+ "custom: invoiceId: `invoiceId`, `productId` cannot be provided when `importStripeInvoices` is enabled.",+ }),+ },{name: "rejects invalid paymentProcessor",body: {diff --git a/apps/web/scripts/migrations/backfill-commissions-metadata.ts b/apps/web/scripts/migrations/backfill-commissions-metadata.tsindex 5fef551dd6..5df04ae297 100644--- a/apps/web/scripts/migrations/backfill-commissions-metadata.ts+++ b/apps/web/scripts/migrations/backfill-commissions-metadata.ts@@ -1,6 +1,5 @@import "dotenv-flow/config";-import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";import { prisma } from "@/lib/prisma";import { tb } from "@/lib/tinybird/client";import { CommissionType, Prisma } from "@prisma/client";@@ -14,13 +13,11 @@ Create this once in Tinybird before running:SELECT event_id, metadataFROM dub_lead_events_mvWHERE event_id IN {{ Array(eventIds, 'String') }}- AND timestamp BETWEEN {{ DateTime(start) }} AND {{ DateTime(end) }}AND metadata != ''UNION ALLSELECT event_id, metadataFROM dub_sale_events_mvWHERE event_id IN {{ Array(eventIds, 'String') }}- AND timestamp BETWEEN {{ DateTime(start) }} AND {{ DateTime(end) }}AND metadata != ''*/@@ -29,14 +26,11 @@ const BATCH_SIZE = 1000;const THROTTLE_MS = 1000;const LAST_CURSOR_ID: string | null = null; // Paste the last printed cursor id here to resume after a crash.const USER_METADATA_MAX_CHARS = 10_000; // Matches metadataSchema in lib/zod/schemas/misc.ts-const TIMESTAMP_PAD_MS = 86_400_000; // ±1 day: commission createdAt can lag Tinybird event timestampconst getEventsMetadata = tb.buildPipe({pipe: "internal_get_events_metadata",parameters: z.object({eventIds: z.string().array(),- start: z.string(),- end: z.string(),}),data: z.object({event_id: z.string(),@@ -143,7 +137,6 @@ async function main() {id: true,eventId: true,type: true,- createdAt: true,},take: BATCH_SIZE,orderBy: {@@ -161,20 +154,8 @@ async function main() {.map((c) => c.eventId).filter((id): id is string => Boolean(id));- const start = new Date(- Math.min(...commissions.map((c) => c.createdAt.getTime())) -- TIMESTAMP_PAD_MS,- );-- const end = new Date(- Math.max(...commissions.map((c) => c.createdAt.getTime())) +- TIMESTAMP_PAD_MS,- );-const { data: tbRows } = await getEventsMetadata({eventIds,- start: formatUTCDateTimeClickhouse(start),- end: formatUTCDateTimeClickhouse(end),});const metadataByEventId = new Map(tbRows.map((row) => [row.event_id, row.metadata]),