Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Prefer resolved productId over nested nulls and drop non-string reward IDs.

Kiran K41c5997ae087
diff --git a/apps/web/lib/api/commissions/create-manual-commissions.ts b/apps/web/lib/api/commissions/create-manual-commissions.ts
index ae23cbcfcd..6998a52aa9 100644
--- a/apps/web/lib/api/commissions/create-manual-commissions.ts
+++ b/apps/web/lib/api/commissions/create-manual-commissions.ts
@@ -506,8 +506,8 @@ async function recordEvents(args: RecordEventsArgs) {
let saleAmount = sale?.amount ?? args.saleAmount;
const eventMetadata = {
- ...(productId ? { productId } : {}),
...(sale?.metadata ?? {}),
+ ...(productId ? { productId } : {}),
};
commissionMetadata = sale?.metadata ?? null;
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index e72edba86d..4fdaf662b9 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -540,7 +540,12 @@ export const rewardContextSchema = z.object({
sale: z
.object({
- productId: z.string().nullish(),
+ // Non-string productIds (e.g. from sale.metadata) are dropped so reward
+ // conditions only match string product IDs.
+ productId: z.preprocess(
+ (val) => (typeof val === "string" ? val : undefined),
+ z.string().nullish(),
+ ),
amount: z.number().nullish(),
type: z.enum(["new", "recurring"]).nullish(),
metadata: z.record(z.string(), z.unknown()).optional(),
diff --git a/apps/web/playwright/api/commissions/commissions.spec.ts b/apps/web/playwright/api/commissions/commissions.spec.ts
index cf5acc0bcc..9dddf1bb0f 100644
--- a/apps/web/playwright/api/commissions/commissions.spec.ts
+++ b/apps/web/playwright/api/commissions/commissions.spec.ts
@@ -311,7 +311,8 @@ test.describe("Sale commissions", () => {
test("PATCH preserves metadata on the response", async ({ api, program }) => {
const invoiceId = `INV_${nanoid()}`;
- const metadata = { plan: "pro", campaign: "spring" };
+ // Avoid plan/productId keys that trigger sale reward modifiers.
+ const metadata = { campaign: "spring" };
await withCommissionPartner(api, program, async (partnerId) => {
expect(
@@ -338,13 +339,13 @@ test.describe("Sale commissions", () => {
const { status, data } = await api.patch<CommissionResponse>(
`/api/commissions/${commissionId}`,
- { earnings: 2500 },
+ { earnings: 1111 },
);
expect(status).toEqual(200);
expect(data).toMatchObject({
id: commissionId,
- earnings: 2500,
+ earnings: 1111,
metadata,
});
});