The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Skip unneeded queries in the partner earnings timeseries
Rafi00f7d5d372f9
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.tsindex ad9a577456..c91c671057 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@@ -41,6 +41,8 @@ export async function getPartnerEarningsTimeseries({partnerId,programId,includeLinks: groupBy === "linkId",+ // getStartEndDates only uses dataAvailableFrom for the "all" interval+ includeDataAvailableFrom: interval === "all" && !start,});const { startDate, endDate, granularity } = getStartEndDates({@@ -158,10 +160,12 @@ async function getEarningsScope({partnerId,programId,includeLinks,+ includeDataAvailableFrom,}: {partnerId: string;programId?: string;includeLinks: boolean;+ includeDataAvailableFrom: boolean;}): Promise<{programId: string | null;links: { id: string }[];@@ -173,34 +177,36 @@ async function getEarningsScope({programId,include: {program: true,- links: true,+ links: includeLinks,},});return {programId: program.id,- links,+ links: links ?? [],dataAvailableFrom: program.startedAt ?? program.createdAt,};}const [programs, links] = await Promise.all([- prisma.program.findMany({- where: {- id: {- not: NETWORK_PROGRAM_ID,- },- partners: {- some: {- partnerId,+ includeDataAvailableFrom+ ? prisma.program.findMany({+ where: {+ id: {+ not: NETWORK_PROGRAM_ID,+ },+ partners: {+ some: {+ partnerId,+ },+ },},- },- },- select: {- startedAt: true,- createdAt: true,- },- }),+ select: {+ startedAt: true,+ createdAt: true,+ },+ })+ : [],includeLinks? prisma.link.findMany({where: {diff --git a/apps/web/playwright/api/partner-profile/earnings.spec.ts b/apps/web/playwright/api/partner-profile/earnings.spec.tsindex e70a115d1e..4e09329d48 100644--- a/apps/web/playwright/api/partner-profile/earnings.spec.ts+++ b/apps/web/playwright/api/partner-profile/earnings.spec.ts@@ -19,17 +19,17 @@ type TimeseriesPoint = {data?: Record<string, number>;};-const DAY = 24 * 60 * 60 * 1000;-test.describe("GET /partner-profile/earnings", () => {let partnerId: string | undefined;let userId: string | undefined;let token: string;let programSlug: string;+ let partnerLinkIds: string[];test.beforeAll(async ({ api, program }) => {const { data: partner } = await createPartner(api);partnerId = partner.id;+ partnerLinkIds = (partner.links ?? []).map((link) => link.id);token = `dub_pw_${nanoid(24)}`;const user = await prisma.user.create({@@ -61,12 +61,13 @@ test.describe("GET /partner-profile/earnings", () => {}));// two commissions in the test program, and one in the network program, which must be excluded+ // (created now, because the "all" interval starts when the test program started)await prisma.commission.createMany({data: [- { programId: program.id, earnings: 1000, daysAgo: 2 },- { programId: program.id, earnings: 2500, daysAgo: 5 },- { programId: NETWORK_PROGRAM_ID, earnings: 9900, daysAgo: 3 },- ].map(({ programId, earnings, daysAgo }) => ({+ { programId: program.id, earnings: 1000 },+ { programId: program.id, earnings: 2500 },+ { programId: NETWORK_PROGRAM_ID, earnings: 9900 },+ ].map(({ programId, earnings }) => ({id: createId({ prefix: "cm_" }),programId,partnerId: partner.id,@@ -75,7 +76,6 @@ test.describe("GET /partner-profile/earnings", () => {amount: 0,quantity: 1,earnings,- createdAt: new Date(Date.now() - daysAgo * DAY),})),});});@@ -204,6 +204,28 @@ test.describe("GET /partner-profile/earnings", () => {});});+ test("returns the all-time timeseries and the per-program timeseries by link", async ({+ playwright,+ program,+ }) => {+ await withPartnerApi(playwright, async (partnerApi) => {+ const allTime = await partnerApi.get<TimeseriesPoint[]>(+ "/api/partner-profile/earnings/timeseries?interval=all&timezone=UTC",+ );+ expect(allTime.status).toEqual(200);+ expect(allTime.data.reduce((sum, d) => sum + d.earnings, 0)).toEqual(+ 3500,+ );++ const byLink = await partnerApi.get<TimeseriesPoint[]>(+ `/api/partner-profile/programs/${program.id}/earnings/timeseries?groupBy=linkId&timezone=UTC`,+ );+ 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);+ });+ });+test("rejects a workspace token", async ({ api }) => {expect(await api.get("/api/partner-profile/earnings")).toEqual(apiError({