The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
final changes, address coderabbit feedback
Steven Tey9029f4716084
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsxindex 614804a6dd..7552bf590b 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx@@ -4,6 +4,7 @@ import { mutatePrefix } from "@/lib/swr/mutate";import useRewards from "@/lib/swr/use-rewards";import useWorkspace from "@/lib/swr/use-workspace";import { createCommissionSchema } from "@/lib/zod/schemas/commissions";+import { StripeCustomerInvoiceSchema } from "@/lib/zod/schemas/customers";import { CustomerSelector } from "@/ui/customers/customer-selector";import { PartnerLinkSelector } from "@/ui/partners/partner-link-selector";import { PartnerSelector } from "@/ui/partners/partner-selector";@@ -39,12 +40,7 @@ interface CreateCommissionSheetProps {type FormData = z.infer<typeof createCommissionSchema>;-// API returns created as ISO string after JSON serialization-type StripeInvoiceFromApi = {- id: string;- amount_paid: number;- created: string;-};+type StripeInvoiceFromApi = z.infer<typeof StripeCustomerInvoiceSchema>;async function fetcherStripeInvoices(url: string): Promise<{invoices: StripeInvoiceFromApi[];@@ -653,32 +649,29 @@ function CreateCommissionSheetContent({</p></div><div className="max-h-96 overflow-y-auto p-1.5">- {stripeInvoices.map((inv) => {- const createdDate = new Date(inv.created);- return (- <div- key={inv.id}- className="flex items-center justify-between gap-3 rounded-md px-3 py-2.5"- >- <div className="min-w-0 flex-1">- <a- href={`https://dashboard.stripe.com/invoices/${inv.id}`}- target="_blank"- rel="noopener noreferrer"- className="cursor-alias font-mono text-sm font-medium text-neutral-800 decoration-dotted underline-offset-2 hover:underline"- >- {inv.id}- </a>- <p className="mt-0.5 text-xs text-neutral-500">- {formatDate(createdDate)}- </p>- </div>- <span className="shrink-0 text-sm font-medium text-neutral-700">- {currencyFormatter(inv.amount_paid)}- </span>+ {stripeInvoices.map((inv) => (+ <div+ key={inv.id}+ className="flex items-center justify-between gap-3 rounded-md px-3 py-2.5"+ >+ <div className="min-w-0 flex-1">+ <a+ href={`https://dashboard.stripe.com/invoices/${inv.id}`}+ target="_blank"+ rel="noopener noreferrer"+ className="cursor-alias font-mono text-sm font-medium text-neutral-800 decoration-dotted underline-offset-2 hover:underline"+ >+ {inv.id}+ </a>+ <p className="mt-0.5 text-xs text-neutral-500">+ {formatDate(inv.createdAt)}+ </p></div>- );- })}+ <span className="shrink-0 text-sm font-medium text-neutral-700">+ {currencyFormatter(inv.amount)}+ </span>+ </div>+ ))}</div></div>)}diff --git a/apps/web/lib/actions/partners/create-manual-commission.ts b/apps/web/lib/actions/partners/create-manual-commission.tsindex d5cc6ab6f0..98fa371539 100644--- a/apps/web/lib/actions/partners/create-manual-commission.ts+++ b/apps/web/lib/actions/partners/create-manual-commission.ts@@ -141,7 +141,7 @@ export const createManualCommissionAction = authActionClient}}- const tbEventsToRecord: Promise<any>[] = []; // a list of promises of events to record in Tinybird+ const tbEventsToRecord: Array<() => Promise<unknown>> = []; // a list of promises of events to record in Tinybirdconst commissionsToCreate: CreatePartnerCommissionProps[] = [];// keep track of click event to update customer later@@ -174,7 +174,10 @@ export const createManualCommissionAction = authActionClient}).then((invoices, // sort invoices by created date ascending- ) => invoices.sort((a, b) => a.created.getTime() - b.created.getTime()),+ ) =>+ invoices.sort(+ (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),+ ),);if (stripeCustomerInvoices.length === 0) {@@ -183,8 +186,8 @@ export const createManualCommissionAction = authActionClient);}- lastLeadAt = stripeCustomerInvoices[0].created;- lastConversionAt = stripeCustomerInvoices[0].created;+ lastLeadAt = stripeCustomerInvoices[0].createdAt;+ lastConversionAt = stripeCustomerInvoices[0].createdAt;clickId = nanoid(16);clickedAt = new Date(lastLeadAt.getTime() - 5 * 60 * 1000);@@ -201,7 +204,7 @@ export const createManualCommissionAction = authActionClient: "",});- tbEventsToRecord.push(recordClickZod(generatedClickEvent));+ tbEventsToRecord.push(() => recordClickZod(generatedClickEvent));const leadEventData = leadEventSchemaTBWithTimestamp.parse({...generatedClickEvent,@@ -211,23 +214,24 @@ export const createManualCommissionAction = authActionClienttimestamp: lastLeadAt.toISOString(),});- tbEventsToRecord.push(recordLeadWithTimestamp(leadEventData));+ tbEventsToRecord.push(() => recordLeadWithTimestamp(leadEventData));const saleEventData = stripeCustomerInvoices.map((invoice) =>saleEventSchemaTBWithTimestamp.parse({...generatedClickEvent,event_id: nanoid(16),invoice_id: invoice.id,- event_name: "Purchase",- amount: invoice.amount_paid,+ event_name: "Invoice paid",+ amount: invoice.amount,customer_id: customer.id,payment_processor: "stripe",currency: "usd",- timestamp: invoice.created.toISOString(),+ timestamp: invoice.createdAt.toISOString(),+ metadata: JSON.stringify(invoice.metadata),}),);- tbEventsToRecord.push(recordSaleWithTimestamp(saleEventData));+ tbEventsToRecord.push(() => recordSaleWithTimestamp(saleEventData));commissionsToCreate.push(...saleEventData.map((saleEvent) => ({@@ -271,7 +275,7 @@ export const createManualCommissionAction = authActionClient: "",});- tbEventsToRecord.push(recordClickZod(generatedClickEvent));+ tbEventsToRecord.push(() => recordClickZod(generatedClickEvent));// Record lead eventconst leadEventData = leadEventSchemaTBWithTimestamp.parse({@@ -284,7 +288,7 @@ export const createManualCommissionAction = authActionClientconsole.log("New lead event to record: ", leadEventData);- tbEventsToRecord.push(recordLeadWithTimestamp(leadEventData));+ tbEventsToRecord.push(() => recordLeadWithTimestamp(leadEventData));if (commissionType === "lead") {commissionsToCreate.push({@@ -322,7 +326,7 @@ export const createManualCommissionAction = authActionClientconsole.log("New sale event to record: ", saleEventData);- tbEventsToRecord.push(recordSaleWithTimestamp(saleEventData));+ tbEventsToRecord.push(() => recordSaleWithTimestamp(saleEventData));if (commissionType === "sale") {commissionsToCreate.push({@@ -343,15 +347,16 @@ export const createManualCommissionAction = authActionClientsale: { productId },},});- // Track the sale event timestamp for link stats update+ totalSales++;+ totalSaleAmount += saleEventData.amount;lastConversionAt = new Date(saleEventData.timestamp);}}}// record events in Tinybird- const tbRes = await Promise.allSettled(tbEventsToRecord);- console.log("recorded events in Tinybird: ", prettyPrint(tbRes));+ const tbRes = await Promise.allSettled(tbEventsToRecord.map((fn) => fn()));+ console.log("Recorded events in Tinybird: ", prettyPrint(tbRes));// create partner commissionsawait Promise.allSettled(@@ -399,14 +404,12 @@ export const createManualCommissionAction = authActionClientnewTimestamp: lastConversionAt || new Date(),}),}),- ...(commissionType === "sale" && {- sales: {- increment: saleAmount ? 1 : totalSales,- },- saleAmount: {- increment: saleAmount ?? totalSaleAmount,- },- }),+ sales: {+ increment: totalSales,+ },+ saleAmount: {+ increment: totalSaleAmount,+ },},}),prisma.customer.update({@@ -425,7 +428,9 @@ export const createManualCommissionAction = authActionClientsaleAmount: {increment: totalSaleAmount,},- firstSaleAt: customer.firstSaleAt ? undefined : new Date(),+ firstSaleAt: customer.firstSaleAt+ ? undefined+ : lastConversionAt ?? new Date(),},}),]);diff --git a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts b/apps/web/lib/api/customers/get-customer-stripe-invoices.tsindex 509a945f76..f720920593 100644--- a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts+++ b/apps/web/lib/api/customers/get-customer-stripe-invoices.ts@@ -16,14 +16,21 @@ export async function getCustomerStripeInvoices({{customer: stripeCustomerId,status: "paid",+ limit: 100,},{stripeAccount: stripeConnectId,},);- const stripeCustomerInvoices =- StripeCustomerInvoiceSchema.array().parse(data);+ const stripeCustomerInvoices = data.map((invoice) =>+ StripeCustomerInvoiceSchema.parse({+ id: invoice.id,+ amount: invoice.amount_paid,+ createdAt: new Date(invoice.created * 1000),+ metadata: invoice,+ }),+ );return stripeCustomerInvoices;}diff --git a/apps/web/lib/zod/schemas/customers.ts b/apps/web/lib/zod/schemas/customers.tsindex cbd2082ee8..e38842da19 100644--- a/apps/web/lib/zod/schemas/customers.ts+++ b/apps/web/lib/zod/schemas/customers.ts@@ -197,6 +197,7 @@ export const StripeCustomerSchema = z.object({export const StripeCustomerInvoiceSchema = z.object({id: z.string(),- amount_paid: z.number(),- created: z.number().transform((v) => new Date(v * 1000)),+ amount: z.number(),+ createdAt: z.date(),+ metadata: z.any(),});diff --git a/apps/web/ui/modals/add-customer-modal.tsx b/apps/web/ui/modals/add-customer-modal.tsxindex 2aa04d1ca1..7f8b6c1f6e 100644--- a/apps/web/ui/modals/add-customer-modal.tsx+++ b/apps/web/ui/modals/add-customer-modal.tsx@@ -73,6 +73,7 @@ export const AddCustomerModal = ({watch,reset,setValue,+ getValues,formState: { isSubmitting, errors },} = useForm<FormData>({defaultValues: {@@ -183,7 +184,7 @@ export const AddCustomerModal = ({const customer = await response.json();await mutate(`/api/customers?workspaceId=${workspaceId}`);toast.success(- `Customer with ID "${customer.externalId}" added successfully!`,+ `Customer "${customer.email ?? customer.externalId}" added successfully!`,);onSuccess?.(customer);setShowModal(false);@@ -210,6 +211,7 @@ export const AddCustomerModal = ({setShowStripeImport(true);setStripeSearchResults(null);setStripeSearchError(null);+ setStripeSearchEmail(getValues("email") ?? "");}}/>)}@@ -461,7 +463,7 @@ export const AddCustomerModal = ({})}/><p className="mt-1.5 text-xs text-neutral-500">- Optional. Used to attribute recurring sales to partners.+ Used to attribute recurring sales to partners.</p></div>)}