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.

add referral_amount and handle metadata.user_id

Pedro Ladeiraf602c1564e63
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
index 5f4e2bc11d..5930f69871 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
@@ -26,6 +26,7 @@ import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
import { attributeViaPromotionCodeId } from "./utils/attribute-via-promotion-code-id";
import { getCheckoutSessionProducts } from "./utils/get-checkout-session-products";
import { getConnectedCustomer } from "./utils/get-connected-customer";
+import { getDubCustomerExternalIdFromMetadata } from "./utils/get-dub-customer-external-id-from-metadata";
import { incrementLinkLeads } from "./utils/increment-link-leads";
import { updateCustomerWithStripeCustomerId } from "./utils/update-customer-with-stripe-customer-id";
@@ -36,8 +37,9 @@ export async function checkoutSessionCompleted({
workspace,
}: WebhookHandlerInput<Stripe.CheckoutSessionCompletedEvent>): Promise<WebhookHandlerResponse> {
let charge = event.data.object;
- let dubCustomerExternalId =
- charge.metadata?.dubCustomerExternalId || charge.metadata?.dubCustomerId;
+ let dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+ charge.metadata,
+ );
const clientReferenceId = charge.client_reference_id;
const stripeAccountId = event.account as string;
const stripeCustomerId = charge.customer as string;
@@ -249,8 +251,7 @@ export async function checkoutSessionCompleted({
});
const connectedCustomerDubCustomerExternalId =
- connectedCustomer?.metadata.dubCustomerExternalId ||
- connectedCustomer?.metadata.dubCustomerId;
+ getDubCustomerExternalIdFromMetadata(connectedCustomer?.metadata);
if (connectedCustomerDubCustomerExternalId) {
dubCustomerExternalId = connectedCustomerDubCustomerExternalId;
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
index 9cae9a5037..fc8c5d4b76 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
@@ -18,6 +18,7 @@ import type Stripe from "stripe";
import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
import { attributeViaPromotionCodeId } from "./utils/attribute-via-promotion-code-id";
import { getConnectedCustomer } from "./utils/get-connected-customer";
+import { getDubCustomerExternalIdFromMetadata } from "./utils/get-dub-customer-external-id-from-metadata";
// Handle event "invoice.paid"
export async function invoicePaid({
@@ -57,9 +58,9 @@ export async function invoicePaid({
mode,
});
- const dubCustomerExternalId =
- connectedCustomer?.metadata.dubCustomerExternalId ||
- connectedCustomer?.metadata.dubCustomerId;
+ const dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+ connectedCustomer?.metadata,
+ );
if (dubCustomerExternalId) {
try {
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts
new file mode 100644
index 0000000000..50d08b46bc
--- /dev/null
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts
@@ -0,0 +1,21 @@
+/**
+ * Resolve Dub customer.externalId from Stripe object metadata.
+ * Precedence:
+ * 1. dubCustomerExternalId
+ * 2. dubCustomerId
+ * 3. user_id (Lemon Squeezy customer id after LS → Stripe migration)
+ */
+export function getDubCustomerExternalIdFromMetadata(
+ metadata?: Record<string, string> | null,
+): string | undefined {
+ if (!metadata) return undefined;
+
+ const value =
+ metadata.dubCustomerExternalId ||
+ metadata.dubCustomerId ||
+ metadata.user_id;
+
+ if (value == null || value === "") return undefined;
+
+ return String(value);
+}
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
index dbf7e9f78c..f9c1d3ec1b 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
@@ -16,6 +16,7 @@ import { Prisma } from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import type Stripe from "stripe";
import { WebhookHandlerInput, WebhookHandlerResponse } from "../types";
+import { getDubCustomerExternalIdFromMetadata } from "./get-dub-customer-external-id-from-metadata";
export async function syncCustomer({
event,
@@ -28,9 +29,9 @@ export async function syncCustomer({
>): Promise<WebhookHandlerResponse> {
const stripeCustomer = event.data.object;
const stripeAccountId = event.account as string;
- const dubCustomerExternalId =
- stripeCustomer.metadata?.dubCustomerExternalId ||
- stripeCustomer.metadata?.dubCustomerId;
+ const dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+ stripeCustomer.metadata,
+ );
const clickId = stripeCustomer.metadata?.dubClickId;
console.log(
diff --git a/apps/web/lib/lemonsqueezy/import-commissions.ts b/apps/web/lib/lemonsqueezy/import-commissions.ts
index ecedf4ae21..cd7fc73ea0 100644
--- a/apps/web/lib/lemonsqueezy/import-commissions.ts
+++ b/apps/web/lib/lemonsqueezy/import-commissions.ts
@@ -2,20 +2,13 @@ import { prisma } from "@/lib/prisma";
import { sendEmail } from "@dub/email";
import ProgramImported from "@dub/email/templates/program-imported";
import { chunk, nanoid } from "@dub/utils";
-import {
- CommissionStatus,
- Customer,
- Link,
- Program,
- Reward,
-} from "@prisma/client";
+import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
import { isFirstConversion } from "../analytics/is-first-conversion";
import { createId } from "../api/create-id";
import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
import { syncPartnerLinksStats } from "../api/partners/sync-partner-links-stats";
import { syncTotalCommissions } from "../api/partners/sync-total-commissions";
-import { calculateSaleEarnings } from "../api/sales/calculate-sale-earnings";
import { getLeadEvents } from "../tinybird/get-lead-events";
import { logImportError } from "../tinybird/log-import-error";
import { recordSaleWithTimestamp } from "../tinybird/record-sale";
@@ -37,11 +30,45 @@ type SaleEvent = {
amount: number;
currency: string;
amountUsd: number | null | undefined;
+ firstOrderItemPrice?: number | null;
+ referralAmount: number | null | undefined;
status: string;
createdAt: string;
metadata: Record<string, unknown>;
};
+function resolveAmountUsd({
+ amount,
+ amountUsd,
+ currency,
+ fxRates,
+}: {
+ amount: number;
+ amountUsd: number | null | undefined;
+ currency: string;
+ fxRates: Record<string, string> | null;
+}): number | null {
+ if (amountUsd != null) {
+ return amountUsd;
+ }
+
+ if (currency.toUpperCase() === "USD") {
+ return amount;
+ }
+
+ if (!fxRates) {
+ return null;
+ }
+
+ const converted = convertCurrencyWithFxRates({
+ currency,
+ amount,
+ fxRates,
+ });
+
+ return converted.currency.toUpperCase() === "USD" ? converted.amount : null;
+}
+
// Only renewals/updates — initials are covered by the Order import.
// Missing/unknown billing_reason is skipped to avoid double-counting.
const IMPORTABLE_INVOICE_REASONS = new Set(["renewal", "updated"]);
@@ -213,6 +240,8 @@ async function listOrderSaleEvents({
amount: order.subtotal,
currency: order.currency,
amountUsd: order.subtotal_usd,
+ firstOrderItemPrice: order.first_order_item?.price,
+ referralAmount: order.referral_amount,
status: order.status,
createdAt: order.created_at || new Date().toISOString(),
metadata: order as unknown as Record<string, unknown>,
@@ -259,6 +288,7 @@ async function listInvoiceSaleEvents({
amount: invoice.subtotal,
currency: invoice.currency,
amountUsd: invoice.subtotal_usd,
+ referralAmount: invoice.referral_amount,
status: invoice.status,
createdAt: invoice.created_at || new Date().toISOString(),
metadata: invoice as unknown as Record<string, unknown>,
@@ -314,33 +344,6 @@ async function processSaleEvents({
const affiliateIdToLink = new Map(links.map((link) => [link.key, link]));
- const partnerIds = [
- ...new Set(
- links
- .map((link) => link.partnerId)
- .filter((id): id is string => Boolean(id)),
- ),
- ];
-
- const enrollments = await prisma.programEnrollment.findMany({
- where: {
- programId: program.id,
- partnerId: {
- in: partnerIds,
- },
- },
- include: {
- saleReward: true,
- },
- });
-
- const partnerIdToSaleReward = new Map(
- enrollments.map((enrollment) => [
- enrollment.partnerId,
- enrollment.saleReward,
- ]),
- );
-
const customerLeadEvents = await getLeadEvents({
customerIds: customersData.map((customer) => customer.id),
}).then((res) => res.data);
@@ -354,14 +357,6 @@ async function processSaleEvents({
program,
saleEvent,
partnerLink: affiliateIdToLink.get(saleEvent.affiliateId),
- saleReward: (() => {
- const partnerId = affiliateIdToLink.get(
- saleEvent.affiliateId,
- )?.partnerId;
- return partnerId
- ? partnerIdToSaleReward.get(partnerId) ?? null
- : null;
- })(),
fxRates,
importId,
customersData,
@@ -376,7 +371,6 @@ async function createCommission({
program,
saleEvent,
partnerLink,
- saleReward,
fxRates,
importId,
customersData,
@@ -385,7 +379,6 @@ async function createCommission({
program: Pick<Program, "id" | "workspaceId">;
saleEvent: SaleEvent;
partnerLink?: Link;
- saleReward: Reward | null;
fxRates: Record<string, string> | null;
importId: string;
customersData: (Customer & { link: Link | null })[];
@@ -467,22 +460,26 @@ async function createCommission({
return;
}
- // Prefer LS-provided USD amounts; otherwise convert
- let saleAmount: number | null =
- saleEvent.amountUsd != null
- ? saleEvent.amountUsd
- : saleEvent.currency.toUpperCase() === "USD"
- ? saleEvent.amount
- : null;
+ // Prefer LS-provided USD amounts; otherwise convert. For subscription first
+ // charges, order subtotal is often 0 while first_order_item.price has the amount.
+ let saleAmount = resolveAmountUsd({
+ amount: saleEvent.amount,
+ amountUsd: saleEvent.amountUsd,
+ currency: saleEvent.currency,
+ fxRates,
+ });
- if (saleAmount == null && fxRates) {
- const converted = convertCurrencyWithFxRates({
+ if (
+ (saleAmount == null || saleAmount === 0) &&
+ saleEvent.firstOrderItemPrice != null &&
+ saleEvent.firstOrderItemPrice > 0
+ ) {
+ saleAmount = resolveAmountUsd({
+ amount: saleEvent.firstOrderItemPrice,
+ amountUsd: null,
currency: saleEvent.currency,
- amount: saleEvent.amount,
fxRates,
});
- saleAmount =
- converted.currency.toUpperCase() === "USD" ? converted.amount : null;
}
if (saleAmount == null) {
@@ -496,22 +493,15 @@ async function createCommission({
const createdAt = new Date(saleEvent.createdAt);
- // LS does not expose per-order commission amounts; derive from Dub sale reward
- const earnings = saleReward
- ? calculateSaleEarnings({
- reward: {
- type: saleReward.type,
- amountInCents: saleReward.amountInCents,
- amountInPercentage: saleReward.amountInPercentage
- ? Number(saleReward.amountInPercentage)
- : null,
- },
- sale: {
- amount: saleAmount,
- quantity: 1,
- },
- })
- : 0;
+ const earnings =
+ saleEvent.referralAmount == null
+ ? 0
+ : resolveAmountUsd({
+ amount: saleEvent.referralAmount,
+ amountUsd: null,
+ currency: saleEvent.currency,
+ fxRates,
+ }) ?? 0;
const clickData = clickEventSchemaTB
.omit({ timestamp: true })
diff --git a/apps/web/lib/lemonsqueezy/schemas.ts b/apps/web/lib/lemonsqueezy/schemas.ts
index 1b82714458..9039c67627 100644
--- a/apps/web/lib/lemonsqueezy/schemas.ts
+++ b/apps/web/lib/lemonsqueezy/schemas.ts
@@ -120,6 +120,12 @@ export const lemonSqueezyOrderSchema = z.object({
total_usd: z.number().nullish(),
refunded_amount: z.number().nullish(),
refunded_amount_usd: z.number().nullish(),
+ referral_amount: z.number().nullish(),
+ first_order_item: z
+ .object({
+ price: z.number().nullish(),
+ })
+ .nullish(),
status: z.string(),
refunded: z.boolean().nullish(),
refunded_at: z.string().nullish(),
@@ -152,6 +158,7 @@ export const lemonSqueezySubscriptionInvoiceSchema = z.object({
tax_usd: z.number().nullish(),
total_usd: z.number().nullish(),
refunded_amount_usd: z.number().nullish(),
+ referral_amount: z.number().nullish(),
created_at: z.string().nullish(),
updated_at: z.string().nullish(),
test_mode: z.boolean().nullish(),