The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
remove customer.firstSaleAt from context and rely on customer.susbcriptionDuration
Steven Tey16c2ee7097b4
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.tsindex 73e3de2fc1..2a9b17e824 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@@ -463,7 +463,6 @@ export async function checkoutSessionCompleted(context: {customer: {country: customer.country,- firstSaleAt: customer.firstSaleAt,},sale: {productId,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.tsindex db042db496..2de879db5f 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@@ -232,7 +232,6 @@ export async function invoicePaid(event: Stripe.Event, mode: StripeMode) {context: {customer: {country: customer.country,- firstSaleAt: customer.firstSaleAt,},sale: {productId: invoice.lines.data[0]?.pricing?.price_details?.product,diff --git a/apps/web/lib/actions/partners/create-manual-commission.ts b/apps/web/lib/actions/partners/create-manual-commission.tsindex ce4ed1c0d4..53e820be22 100644--- a/apps/web/lib/actions/partners/create-manual-commission.ts+++ b/apps/web/lib/actions/partners/create-manual-commission.ts@@ -294,7 +294,6 @@ export const createManualCommissionAction = authActionClientcontext: {customer: {country: customer.country,- firstSaleAt: customer.firstSaleAt,},sale: {productId,diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.tsindex fb12dd1037..caa5c4bc81 100644--- a/apps/web/lib/api/conversions/track-sale.ts+++ b/apps/web/lib/api/conversions/track-sale.ts@@ -553,7 +553,6 @@ const _trackSale = async ({customer: {country: customer.country,source,- firstSaleAt: customer.firstSaleAt,},sale: {productId: metadata?.productId,diff --git a/apps/web/lib/integrations/shopify/create-sale.ts b/apps/web/lib/integrations/shopify/create-sale.tsindex 4023a534f5..b06d39ad95 100644--- a/apps/web/lib/integrations/shopify/create-sale.ts+++ b/apps/web/lib/integrations/shopify/create-sale.ts@@ -150,7 +150,6 @@ export async function createShopifySale({context: {customer: {country: customer.country,- firstSaleAt: customer.firstSaleAt,},sale: {amount: saleData.amount,diff --git a/apps/web/lib/partners/create-partner-commission.ts b/apps/web/lib/partners/create-partner-commission.tsindex 573b0e7be8..c1ddcac7e4 100644--- a/apps/web/lib/partners/create-partner-commission.ts+++ b/apps/web/lib/partners/create-partner-commission.ts@@ -216,12 +216,12 @@ export const createPartnerCommission = async ({// Recurring sale reward (maxDuration > 0)else {- const monthsDifference = differenceInMonths(+ const subscriptionDuration = differenceInMonths(new Date(),firstCommission.createdAt,);- if (monthsDifference >= reward.maxDuration) {+ if (subscriptionDuration >= reward.maxDuration) {console.log(`Partner ${partnerId} has reached max duration for ${event} event, skipping commission creation...`,);@@ -231,6 +231,30 @@ export const createPartnerCommission = async ({webhookPartner: constructWebhookPartner(programEnrollment),};}++ // re-run determinePartnerReward with the customer's subscription duration+ reward = determinePartnerReward({+ event,+ programEnrollment,+ context: {+ ...context,+ customer: {+ ...context?.customer,+ subscriptionDuration,+ },+ },+ });++ if (!reward) {+ console.log(+ `Partner ${partnerId} does not have a qualifying reward for subscription duration ${subscriptionDuration}, skipping commission creation...`,+ );+ return {+ commission: null,+ programEnrollment,+ webhookPartner: constructWebhookPartner(programEnrollment),+ };+ }}}}diff --git a/apps/web/lib/partners/determine-partner-reward.ts b/apps/web/lib/partners/determine-partner-reward.tsindex bf715809ca..e2f31820b1 100644--- a/apps/web/lib/partners/determine-partner-reward.ts+++ b/apps/web/lib/partners/determine-partner-reward.ts@@ -1,5 +1,4 @@import { EventType, Link, Prisma, Reward } from "@dub/prisma/client";-import { differenceInMonths } from "date-fns";import { serializeReward } from "../api/partners/serialize-reward";import { RewardContext } from "../types";import {@@ -52,13 +51,6 @@ export const determinePartnerReward = ({totalCommissions: programEnrollment.totalCommissions,country: programEnrollment.partner?.country,},- customer: {- ...context?.customer,- subscriptionDuration: differenceInMonths(- new Date(),- context?.customer?.firstSaleAt ?? new Date(),- ),- },};if (partnerReward.modifiers && context) {diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.tsindex c25e813c71..f950effbc9 100644--- a/apps/web/lib/zod/schemas/rewards.ts+++ b/apps/web/lib/zod/schemas/rewards.ts@@ -352,7 +352,6 @@ export const rewardContextSchema = z.object({.object({country: z.string().nullish(),source: z.enum(CUSTOMER_SOURCES).default("tracked").nullish(),- firstSaleAt: z.date().nullish(),subscriptionDuration: z.number().nullish(),}).optional(),