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.

Pass lead context consistently for reward condition evaluation

Kiran Kc17fafe0e738
diff --git a/apps/web/lib/api/conversions/track-lead.ts b/apps/web/lib/api/conversions/track-lead.ts
index c2cf08ad06..6bf291e6d6 100644
--- a/apps/web/lib/api/conversions/track-lead.ts
+++ b/apps/web/lib/api/conversions/track-lead.ts
@@ -304,13 +304,9 @@ export const trackLead = async ({
country: customer.country,
source,
},
- ...(metadata != null
- ? {
- lead: {
- metadata: metadata as Record<string, unknown>,
- },
- }
- : {}),
+ lead: {
+ ...(metadata != null && { metadata }),
+ },
},
clickEvent: {
url: clickData.url,
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index e64edd86e1..4baa572d7b 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -489,11 +489,7 @@ const _trackSale = async ({
sale: {
productId: metadata?.productId,
amount: saleData.amount,
- ...(metadata != null
- ? {
- metadata: metadata as Record<string, unknown>,
- }
- : {}),
+ ...(metadata != null && { metadata }),
},
},
clickEvent: {
diff --git a/apps/web/lib/partners/evaluate-reward-conditions.ts b/apps/web/lib/partners/evaluate-reward-conditions.ts
index 92c8e0af25..c3642fc7f1 100644
--- a/apps/web/lib/partners/evaluate-reward-conditions.ts
+++ b/apps/web/lib/partners/evaluate-reward-conditions.ts
@@ -98,12 +98,15 @@ function resolveConditionFieldValue({
if (condition.entity === "customer") {
return context.customer?.[condition.attribute];
}
+
if (condition.entity === "sale") {
return context.sale?.[condition.attribute];
}
+
if (condition.entity === "partner") {
return context.partner?.[condition.attribute];
}
+
if (condition.entity === "lead") {
return undefined;
}
@@ -115,18 +118,23 @@ function parseMetadataNumeric(raw: unknown): number | undefined {
if (raw == null) {
return undefined;
}
+
if (typeof raw === "number" && !Number.isNaN(raw)) {
return raw;
}
+
if (typeof raw === "string") {
if (raw.trim() === "" || Number.isNaN(Number(raw))) {
return undefined;
}
+
return Number(raw);
}
+
if (typeof raw === "boolean") {
return undefined;
}
+
const n = Number(raw);
return Number.isNaN(n) ? undefined : n;
}
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index 73741cd226..9447d6d23e 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -29,7 +29,7 @@ export type RewardConditionEntityAttribute = {
}[];
};
-export type RewardConditionEntity = {
+type RewardConditionEntity = {
id: "partner" | "customer" | "sale" | "lead";
label: string;
attributes: RewardConditionEntityAttribute[];
@@ -225,7 +225,7 @@ export const REWARD_CONDITIONS: Record<
},
};
-export const REWARD_CONDITION_ENTITIES = [
+const REWARD_CONDITION_ENTITIES = [
...new Set(
Object.values(REWARD_CONDITIONS).flatMap(({ entities }) => entities),
),
@@ -235,11 +235,11 @@ export const REWARD_CONDITION_ATTRIBUTES = Object.values(
REWARD_CONDITIONS,
).flatMap(({ entities }) => entities.flatMap(({ attributes }) => attributes));
-export const REWARD_CONDITION_ATTRIBUTE_IDS = [
+const REWARD_CONDITION_ATTRIBUTE_IDS = [
...new Set(REWARD_CONDITION_ATTRIBUTES.map(({ id }) => id)),
];
-export const REWARD_METADATA_CONDITION_ENTITIES = ["lead", "sale"] as const;
+const REWARD_METADATA_CONDITION_ENTITIES = ["lead", "sale"] as const;
export const CONDITION_OPERATORS = [
"equals_to",
@@ -310,10 +310,8 @@ export const CONDITION_OPERATOR_LABELS = {
} as const;
export const rewardConditionBaseSchema = z.object({
- entity: z.enum(
- REWARD_CONDITION_ENTITIES.map(({ id }) => id) as [string, ...string[]],
- ),
- attribute: z.enum(REWARD_CONDITION_ATTRIBUTE_IDS as [string, ...string[]]),
+ entity: z.enum(REWARD_CONDITION_ENTITIES.map(({ id }) => id)),
+ attribute: z.enum(REWARD_CONDITION_ATTRIBUTE_IDS),
operator: z.enum(CONDITION_OPERATORS),
value: z.union([
z.string(),