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.

fix getEarningsForPartner

Steven Teyc79caf13ec5b
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
index 06199a45d8..17ac4f7d9a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
@@ -1,6 +1,7 @@
"use client";
import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
+import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerEarningsResponse } from "@/lib/types";
import { CLAWBACK_REASONS_MAP } from "@/lib/zod/schemas/commissions";
@@ -10,6 +11,7 @@ import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import { CountryFlag } from "@/ui/shared/country-flag";
import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
+import { CommissionType } from "@dub/prisma/client";
import {
CopyText,
LinkLogo,
@@ -43,6 +45,7 @@ type ColumnMeta = {
export function EarningsTablePartner({ limit }: { limit?: number }) {
const { programSlug } = useParams();
+ const { partner } = usePartnerProfile();
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
const { queryParams, searchParamsObj, getQueryString } = useRouterStuff();
@@ -109,26 +112,39 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
filterParams: ({ row }) =>
row.original.link ? { linkId: row.original.link.id } : null,
},
- cell: ({ row }) =>
- row.original.link ? (
+ cell: ({ row }) => {
+ const referralLink = row.original.link
+ ? {
+ apexDomain: getApexDomain(row.original.link.url),
+ shortLink: row.original.link.shortLink,
+ }
+ : row.original.type === CommissionType.referral && partner?.username
+ ? {
+ apexDomain: "dub.co",
+ shortLink: `https://partners.dub.co/${programSlug}/apply?via=${partner.username}`,
+ }
+ : null;
+
+ if (!referralLink) return "-";
+
+ return (
<div className="flex items-center gap-3">
<LinkLogo
- apexDomain={getApexDomain(row.original.link.url)}
+ apexDomain={referralLink.apexDomain}
className="size-4 shrink-0 sm:size-4"
/>
<CopyText
- value={row.original.link.shortLink}
+ value={referralLink.shortLink}
successMessage="Copied link to clipboard!"
className="truncate"
>
- <span className="truncate" title={row.original.link.shortLink}>
- {getPrettyUrl(row.original.link.shortLink)}
+ <span className="truncate" title={referralLink.shortLink}>
+ {getPrettyUrl(referralLink.shortLink)}
</span>
</CopyText>
</div>
- ) : (
- "-"
- ),
+ );
+ },
size: 250,
},
{
diff --git a/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts b/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
index 3cae672afa..0eda805b4b 100644
--- a/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
+++ b/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
@@ -5,6 +5,7 @@ import {
PartnerEarningsSchema,
} from "@/lib/zod/schemas/partner-profile";
import { prisma } from "@dub/prisma";
+import { CommissionType, Partner } from "@dub/prisma/client";
import * as z from "zod/v4";
import { obfuscateCustomerEmail } from "./obfuscate-customer-email";
@@ -62,7 +63,14 @@ export async function getEarningsForPartner(
},
},
include: {
- customer: true,
+ customer: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ country: true,
+ },
+ },
link: {
select: {
id: true,
@@ -78,28 +86,52 @@ export async function getEarningsForPartner(
},
});
+ // TODO: Once we migrate to add sourcePartner relation on Commission table, we can simplify this logic
+ let sourcePartners: Pick<Partner, "id" | "name" | "email" | "country">[] = [];
+ const commissionsWithSourcePartnerIds = earnings.filter(
+ (e) => e.type === CommissionType.referral && e.sourcePartnerId,
+ );
+ if (commissionsWithSourcePartnerIds.length > 0) {
+ sourcePartners = await prisma.partner.findMany({
+ where: {
+ id: {
+ in: commissionsWithSourcePartnerIds.map((e) => e.sourcePartnerId!),
+ },
+ },
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ country: true,
+ },
+ });
+ }
+
return z.array(PartnerEarningsSchema).parse(
earnings.map((e) => {
+ if (e.type === CommissionType.referral && e.sourcePartnerId) {
+ const sourcePartner = sourcePartners.find(
+ (p) => p.id === e.sourcePartnerId,
+ );
+ if (sourcePartner) {
+ e.customer = sourcePartner;
+ }
+ }
+
// fallback to a random name if the customer doesn't have an email
const customerEmail =
e.customer?.email || e.customer?.name || generateRandomName();
- // For referral commissions, the customer belongs to the referred partner,
- // not the partner fetching their earnings — so hide the customer details.
- const belongsToSamePartner = e.customer?.partnerId === partnerId;
-
return {
...e,
- customer: belongsToSamePartner
- ? e.customer
- ? {
- ...e.customer,
- email: customerDataSharingEnabledAt
- ? customerEmail
- : obfuscateCustomerEmail(customerEmail),
- country: e.customer?.country,
- }
- : null
+ customer: e.customer
+ ? {
+ ...e.customer,
+ email: customerDataSharingEnabledAt
+ ? customerEmail
+ : obfuscateCustomerEmail(customerEmail),
+ country: e.customer?.country,
+ }
: null,
};
}),