The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add paid at to commissions API and export (#4048)
Pedro Ladeira8310bf61a356
diff --git a/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts b/apps/web/app/(ee)/api/commissions/[commissionId]/route.tsindex e176c5d8cc..4b7f355117 100644--- a/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts+++ b/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts@@ -69,6 +69,7 @@ export const GET = withWorkspace(async ({ workspace, params }) => {return NextResponse.json(CommissionDetailSchema.parse({...rest,+ paidAt: rest.payout?.paidAt ?? null,partner: {...partner,groupId: programEnrollment.partnerGroup?.id ?? null,@@ -125,6 +126,7 @@ export const PATCH = withWorkspace(return NextResponse.json(CommissionEnrichedSchema.parse({...updatedCommission,+ paidAt: updatedCommission.payout?.paidAt ?? null,customer: transformCustomerForCommission(updatedCommission.customer),}),);diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.tsindex e5fa92b9ee..3e130c3a79 100644--- a/apps/web/app/(ee)/api/commissions/route.ts+++ b/apps/web/app/(ee)/api/commissions/route.ts@@ -59,6 +59,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {z.array(CommissionEnrichedSchema).parse(commissions.map((c) => ({...c,+ paidAt: c.payout?.paidAt ?? null,customer: transformCustomerForCommission(c.customer),partner: {...c.partner,diff --git a/apps/web/lib/api/commissions/format-commissions-for-export.ts b/apps/web/lib/api/commissions/format-commissions-for-export.tsindex 0d29f33212..4e5efcc29a 100644--- a/apps/web/lib/api/commissions/format-commissions-for-export.ts+++ b/apps/web/lib/api/commissions/format-commissions-for-export.ts@@ -29,7 +29,10 @@ const COLUMN_TYPE_SCHEMAS = {.nullable().default("").transform((value) => value || ""),- date: z.date().transform((date) => date?.toISOString() || ""),+ date: z+ .date()+ .nullable()+ .transform((date) => (date ? date.toISOString() : "")),string: z.string().nullable()@@ -51,6 +54,7 @@ export function formatCommissionsForExport(const formattedCommissions = commissions.map((commission) => {const row: Record<string, unknown> = {...commission,+ paidAt: commission.payout?.paidAt ?? null,customerName: commission.customer?.name || "",customerEmail: commission.customer?.email || "",customerExternalId: commission.customer?.externalId || "",diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.tsindex 4ddc2c0c76..50c19aa5f7 100644--- a/apps/web/lib/api/commissions/get-commissions.ts+++ b/apps/web/lib/api/commissions/get-commissions.ts@@ -173,6 +173,11 @@ export async function getCommissions(filters: CommissionsFilters) {customer: true,partner: true,programEnrollment: true,+ payout: {+ select: {+ paidAt: true,+ },+ },},...paginationQuery,});diff --git a/apps/web/lib/api/commissions/update-partner-commission.ts b/apps/web/lib/api/commissions/update-partner-commission.tsindex 5ee3f0fc9f..c9a6ffe241 100644--- a/apps/web/lib/api/commissions/update-partner-commission.ts+++ b/apps/web/lib/api/commissions/update-partner-commission.ts@@ -211,6 +211,11 @@ export async function updatePartnerCommission({include: {customer: true,partner: true,+ payout: {+ select: {+ paidAt: true,+ },+ },},});diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.tsindex 6931bc21d3..a940a4dcfc 100644--- a/apps/web/lib/zod/schemas/commissions.ts+++ b/apps/web/lib/zod/schemas/commissions.ts@@ -35,6 +35,12 @@ export const CommissionSchema = z.object({// Represents the commission object used in webhook and API responses (/api/commissions/**)export const CommissionEnrichedSchema = CommissionSchema.extend({+ paidAt: z+ .date()+ .nullable()+ .describe(+ "The date the commission was paid out to the partner. Null if not paid yet.",+ ),partner: EnrolledPartnerSchema.pick({id: true,name: true,@@ -331,6 +337,7 @@ export const COMMISSION_EXPORT_COLUMNS = [{ id: "invoiceId", label: "Invoice ID", type: "string", default: true },{ id: "quantity", label: "Quantity", type: "number", default: true },{ id: "createdAt", label: "Created at", type: "date", default: true },+ { id: "paidAt", label: "Paid at", type: "date", default: false },{ id: "updatedAt", label: "Updated at", type: "date", default: false },{ id: "partnerId", label: "Partner ID", type: "string", default: false },{ id: "partnerName", label: "Partner name", type: "string", default: false },