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.

Check the enrollment in the routes that call the earnings timeseries

Rafif6c86e4c0cba
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
index d1243b97c9..7d8ec5e9ee 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
@@ -1,4 +1,5 @@
import { getPartnerEarningsTimeseries } from "@/lib/api/partner-profile/get-partner-earnings-timeseries";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
import { getPartnerEarningsTimeseriesSchema } from "@/lib/zod/schemas/partner-profile";
import { NextResponse } from "next/server";
@@ -6,11 +7,17 @@ import { NextResponse } from "next/server";
// GET /api/partner-profile/programs/[programId]/earnings/timeseries - get timeseries chart for a partner's earnings
export const GET = withPartnerProfile(
async ({ partner, params, searchParams }) => {
+ const { programId } = await getProgramEnrollmentOrThrow({
+ partnerId: partner.id,
+ programId: params.programId,
+ include: {},
+ });
+
const filters = getPartnerEarningsTimeseriesSchema.parse(searchParams);
const timeseries = await getPartnerEarningsTimeseries({
partnerId: partner.id,
- programId: params.programId,
+ programId,
filters,
});
diff --git a/apps/web/app/api/og/partner-earnings/route.tsx b/apps/web/app/api/og/partner-earnings/route.tsx
index 18b4dba2cb..a1c2cfe192 100644
--- a/apps/web/app/api/og/partner-earnings/route.tsx
+++ b/apps/web/app/api/og/partner-earnings/route.tsx
@@ -1,4 +1,5 @@
import { getPartnerEarningsTimeseries } from "@/lib/api/partner-profile/get-partner-earnings-timeseries";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
import { getPartnerEarningsTimeseriesSchema } from "@/lib/zod/schemas/partner-profile";
import { currencyFormatter, formatDate } from "@dub/utils";
@@ -15,13 +16,22 @@ const BACKGROUND_IMAGES = {
};
export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
- const { programId, background, ...filters } =
- getPartnerEarningsTimeseriesSchema
- .extend({
- programId: z.string(),
- background: z.enum(["light", "dark"]).optional().default("light"),
- })
- .parse(searchParams);
+ const {
+ programId: programIdOrSlug,
+ background,
+ ...filters
+ } = getPartnerEarningsTimeseriesSchema
+ .extend({
+ programId: z.string(),
+ background: z.enum(["light", "dark"]).optional().default("light"),
+ })
+ .parse(searchParams);
+
+ const { programId } = await getProgramEnrollmentOrThrow({
+ partnerId: partner.id,
+ programId: programIdOrSlug,
+ include: {},
+ });
const [interSemibold, timeseries] = await Promise.all([
loadGoogleFont("Inter:wght@600"),
diff --git a/apps/web/lib/api/partner-profile/get-partner-earnings-timeseries.ts b/apps/web/lib/api/partner-profile/get-partner-earnings-timeseries.ts
index c91c671057..1d5dc65119 100644
--- a/apps/web/lib/api/partner-profile/get-partner-earnings-timeseries.ts
+++ b/apps/web/lib/api/partner-profile/get-partner-earnings-timeseries.ts
@@ -1,5 +1,4 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { sqlGranularityMap } from "@/lib/planetscale/granularity";
import { prisma } from "@/lib/prisma";
import { getPartnerEarningsTimeseriesSchema } from "@/lib/zod/schemas/partner-profile";
@@ -14,7 +13,7 @@ export async function getPartnerEarningsTimeseries({
filters,
}: {
partnerId: string;
- programId?: string; // if not provided, earnings across all programs (except the network program) are returned
+ programId?: string; // must be checked against the partner's enrollments first. If not provided, earnings across all programs (except the network program) are returned
filters: Omit<
z.infer<typeof getPartnerEarningsTimeseriesSchema>,
"groupBy"
@@ -72,7 +71,7 @@ export async function getPartnerEarningsTimeseries({
FROM Commission
WHERE
earnings != 0
- ${scope.programId ? Prisma.sql`AND programId = ${scope.programId}` : Prisma.sql`AND programId != ${NETWORK_PROGRAM_ID}`}
+ ${programId ? Prisma.sql`AND programId = ${programId}` : Prisma.sql`AND programId != ${NETWORK_PROGRAM_ID}`}
AND partnerId = ${partnerId}
AND createdAt >= ${startDate}
AND createdAt < ${endDate}
@@ -102,8 +101,17 @@ export async function getPartnerEarningsTimeseries({
? ["sale", "lead", "click"]
// only show filtered type if type filter is provided
.filter((t) => (type ? type === t : true))
- : groupBy === "programId"
- ? [...new Set(earnings.map((e) => e.programId!))]
+ : groupBy === "programId" || !programId
+ ? // across programs, only include the groups that have earnings
+ [
+ ...new Set(
+ earnings
+ .map((e) =>
+ groupBy === "programId" ? e.programId : e.linkId,
+ )
+ .filter((key): key is string => !!key),
+ ),
+ ]
: scope.links
// only show filtered link if linkId filter is provided
.filter((link) => (linkId ? link.id === linkId : true))
@@ -167,60 +175,40 @@ async function getEarningsScope({
includeLinks: boolean;
includeDataAvailableFrom: boolean;
}): Promise<{
- programId: string | null;
links: { id: string }[];
dataAvailableFrom?: Date;
}> {
- if (programId) {
- const { program, links } = await getProgramEnrollmentOrThrow({
- partnerId,
- programId,
- include: {
- program: true,
- links: includeLinks,
- },
- });
-
- return {
- programId: program.id,
- links: links ?? [],
- dataAvailableFrom: program.startedAt ?? program.createdAt,
- };
- }
-
const [programs, links] = await Promise.all([
includeDataAvailableFrom
? prisma.program.findMany({
- where: {
- id: {
- not: NETWORK_PROGRAM_ID,
- },
- partners: {
- some: {
- partnerId,
+ where: programId
+ ? { id: programId }
+ : {
+ id: {
+ not: NETWORK_PROGRAM_ID,
+ },
+ partners: {
+ some: {
+ partnerId,
+ },
+ },
},
- },
- },
select: {
startedAt: true,
createdAt: true,
},
})
: [],
- includeLinks
+ // for one program, the chart shows every link of the program, including links without earnings
+ includeLinks && programId
? prisma.link.findMany({
where: {
+ programId,
partnerId,
- programId: {
- not: NETWORK_PROGRAM_ID,
- },
},
select: {
id: true,
},
- orderBy: {
- createdAt: "asc",
- },
})
: [],
]);
@@ -230,7 +218,6 @@ async function getEarningsScope({
);
return {
- programId: null,
links,
dataAvailableFrom:
programStartTimes.length > 0
diff --git a/apps/web/playwright/api/partner-profile/earnings.spec.ts b/apps/web/playwright/api/partner-profile/earnings.spec.ts
index 9a09788408..1e9679ccbc 100644
--- a/apps/web/playwright/api/partner-profile/earnings.spec.ts
+++ b/apps/web/playwright/api/partner-profile/earnings.spec.ts
@@ -225,6 +225,33 @@ test.describe("GET /partner-profile/earnings", () => {
expect(byLink.status).toEqual(200);
expect(byLink.data.reduce((sum, d) => sum + d.earnings, 0)).toEqual(3500);
expect(Object.keys(byLink.data[0].data ?? {})).toEqual(partnerLinkIds);
+
+ // across programs, only links with earnings are included, and the test commissions have no link
+ const byLinkAcrossPrograms = await partnerApi.get<TimeseriesPoint[]>(
+ "/api/partner-profile/earnings/timeseries?groupBy=linkId&timezone=UTC",
+ );
+ expect(byLinkAcrossPrograms.status).toEqual(200);
+ for (const point of byLinkAcrossPrograms.data) {
+ expect(point.data).toEqual({});
+ }
+ });
+ });
+
+ test("returns 404 from the per-program timeseries and the OG image for another program", async ({
+ playwright,
+ }) => {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ expect(
+ await partnerApi.get(
+ "/api/partner-profile/programs/prog_doesnotexist/earnings/timeseries",
+ ),
+ ).toMatchObject({ status: 404 });
+
+ expect(
+ await partnerApi.get(
+ "/api/og/partner-earnings?programId=prog_doesnotexist",
+ ),
+ ).toMatchObject({ status: 404 });
});
});