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.

CommissionSource.submitted → CommissionSource.user

Steven Tey68f5d184e073
diff --git a/apps/web/lib/api/conversions/track-lead.ts b/apps/web/lib/api/conversions/track-lead.ts
index 0ef4b9f1ee..25f22f2277 100644
--- a/apps/web/lib/api/conversions/track-lead.ts
+++ b/apps/web/lib/api/conversions/track-lead.ts
@@ -28,6 +28,7 @@ type TrackLeadParams = z.input<typeof trackLeadRequestSchema> & {
workspace: Pick<WorkspaceProps, "id" | "stripeConnectId" | "webhookEnabled">;
source?: CustomerSource; // default is "tracked"
commissionSource?: CommissionSource; // default is api
+ userId?: string; // only passed if CommissionSource.user
};
export const trackLead = async ({
@@ -43,6 +44,7 @@ export const trackLead = async ({
workspace,
source = "tracked",
commissionSource = CommissionSource.api,
+ userId,
}: TrackLeadParams) => {
// try to find the customer to use if it exists
let customer = await prisma.customer.findUnique({
@@ -303,6 +305,7 @@ export const trackLead = async ({
customerId: customer.id,
quantity: eventQuantity ?? 1,
source: commissionSource,
+ userId,
...(metadata != null && { metadata }),
context: {
customer: {
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index 7532177300..aa8c857ef5 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -38,6 +38,7 @@ type TrackSaleParams = z.input<typeof trackSaleRequestSchema> & {
workspace: Pick<WorkspaceProps, "id" | "stripeConnectId" | "webhookEnabled">;
source?: CustomerSource; // default is "tracked"
commissionSource?: CommissionSource; // default is api
+ userId?: string; // only passed if CommissionSource.user
};
export const trackSale = async ({
@@ -56,6 +57,7 @@ export const trackSale = async ({
workspace,
source = "tracked",
commissionSource = CommissionSource.api,
+ userId,
}: TrackSaleParams) => {
let existingCustomer: Customer | null = null;
let newCustomer: Customer | null = null;
@@ -350,6 +352,7 @@ export const trackSale = async ({
customer,
source,
commissionSource,
+ userId,
}),
]);
@@ -475,6 +478,7 @@ const _trackSale = async ({
customer,
source,
commissionSource = CommissionSource.api,
+ userId,
}: Omit<TrackSaleParams, "customerExternalId"> & {
leadEventData: LeadEventTB | null;
customer: Customer;
@@ -582,6 +586,7 @@ const _trackSale = async ({
invoiceId,
currency,
source: commissionSource,
+ userId,
...(metadata != null && { metadata }),
context: {
customer: {
diff --git a/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts b/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
index dee1c67c9e..cf468b94cf 100644
--- a/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
+++ b/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
@@ -11,6 +11,7 @@ interface MarkSubmittedLeadClosedWonInput {
lead: SubmittedLeadWithCustomer;
saleAmount: number;
stripeCustomerId: string | null;
+ userId: string; // user who marked the lead as closed won
}
// Mark a submitted lead as closed won
@@ -19,6 +20,7 @@ export const markSubmittedLeadClosedWon = async ({
lead,
saleAmount,
stripeCustomerId,
+ userId,
}: MarkSubmittedLeadClosedWonInput) => {
if (!lead.customer) {
throw new DubApiError({
@@ -36,7 +38,8 @@ export const markSubmittedLeadClosedWon = async ({
metadata: null,
workspace,
source: "submitted",
- commissionSource: CommissionSource.submitted,
+ commissionSource: CommissionSource.user,
+ userId,
});
if (stripeCustomerId) {
diff --git a/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts b/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
index c8601586d1..7ec1d1a404 100644
--- a/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
+++ b/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
@@ -10,6 +10,7 @@ interface MarkSubmittedLeadQualifiedInput {
workspace: Pick<Project, "id" | "stripeConnectId" | "webhookEnabled">;
lead: SubmittedLead;
externalId: string | null;
+ userId: string; // user who marked the lead as qualified
}
// Mark a submitted lead as qualified
@@ -17,6 +18,7 @@ export const markSubmittedLeadQualified = async ({
workspace,
lead,
externalId,
+ userId,
}: MarkSubmittedLeadQualifiedInput) => {
// Find the default link for the partner
const links = await prisma.link.findMany({
@@ -62,7 +64,8 @@ export const markSubmittedLeadQualified = async ({
mode: "wait",
workspace: pick(workspace, ["id", "stripeConnectId", "webhookEnabled"]),
source: "submitted",
- commissionSource: CommissionSource.submitted,
+ commissionSource: CommissionSource.user,
+ userId,
});
const customer = await prisma.customer.findUniqueOrThrow({
diff --git a/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts b/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
index a994920f63..fd74e1d829 100644
--- a/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
+++ b/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
@@ -101,6 +101,7 @@ export const updateSubmittedLeadStatusAction = authActionClient
workspace,
lead: updatedLead,
externalId: parsedInput.externalId ?? null,
+ userId: user.id,
}),
]
: []),
@@ -112,6 +113,7 @@ export const updateSubmittedLeadStatusAction = authActionClient
lead: updatedLead as SubmittedLeadWithCustomer,
saleAmount: parsedInput.saleAmount,
stripeCustomerId: parsedInput.stripeCustomerId ?? null,
+ userId: user.id,
}),
]
: []),
diff --git a/apps/web/prisma/schema/commission.prisma b/apps/web/prisma/schema/commission.prisma
index 62845bea46..97729c0e06 100644
--- a/apps/web/prisma/schema/commission.prisma
+++ b/apps/web/prisma/schema/commission.prisma
@@ -19,8 +19,7 @@ enum CommissionType {
enum CommissionSource {
api // track lead/sale API
- user // manual creates with userId (dashboard /api/commissions, bounties)
- submitted // submitted leads/sales
+ user // manual creates with userId (manual commissions, bounty submission approvals, submitted leads/sales)
stripe
shopify
hubspot