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.

Group the partner earnings count by program

Rafi80301e145404
diff --git a/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts b/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
index 6b47c6f24f..75f499aa58 100644
--- a/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
+++ b/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
@@ -1,7 +1,7 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
import { generateRandomName } from "@/lib/names";
import { prisma } from "@/lib/prisma";
-import { getPartnerEarningsCountQuerySchema } from "@/lib/zod/schemas/partner-profile";
+import { partnerProfileEarningsCountQuerySchema } from "@/lib/zod/schemas/partner-profile";
import { Prisma } from "@prisma/client";
import * as z from "zod/v4";
import { getEarningsProgramFilter } from "./get-earnings-program-id";
@@ -14,7 +14,10 @@ export async function getPartnerEarningsCount({
}: {
partnerId: string;
programId?: string; // if not provided, earnings across all programs (except the network program) are counted
- filters: z.infer<typeof getPartnerEarningsCountQuerySchema>;
+ filters: Omit<
+ z.infer<typeof partnerProfileEarningsCountQuerySchema>,
+ "programIdOrSlug"
+ >;
}) {
const {
groupBy,
@@ -40,7 +43,10 @@ export async function getPartnerEarningsCount({
earnings: {
not: 0,
},
- programId: getEarningsProgramFilter(programId),
+ // the program filter options list every program, like the other grouped filters
+ programId: getEarningsProgramFilter(
+ groupBy === "programId" ? undefined : programId,
+ ),
partnerId,
...(payoutId && { payoutId }),
createdAt: {
@@ -180,5 +186,34 @@ export async function getPartnerEarningsCount({
});
}
+ if (groupBy === "programId") {
+ const programs = await prisma.program.findMany({
+ where: {
+ id: {
+ in: counts.map(({ programId }) => programId),
+ },
+ },
+ select: {
+ id: true,
+ name: true,
+ slug: true,
+ logo: true,
+ },
+ });
+
+ const programsById = new Map(programs.map((p) => [p.id, p]));
+
+ return counts.map(({ programId, _count }) => {
+ const program = programsById.get(programId);
+ return {
+ id: programId,
+ name: program?.name,
+ slug: program?.slug,
+ logo: program?.logo,
+ _count,
+ };
+ });
+ }
+
return counts;
}
diff --git a/apps/web/lib/swr/use-partner-profile-earnings.ts b/apps/web/lib/swr/use-partner-profile-earnings.ts
index 636da56744..36b09a6361 100644
--- a/apps/web/lib/swr/use-partner-profile-earnings.ts
+++ b/apps/web/lib/swr/use-partner-profile-earnings.ts
@@ -72,7 +72,7 @@ export function usePartnerProfileEarningsCount<T = { count: number }>({
groupBy,
...query
}: PartnerProfileEarningsQuery & {
- groupBy?: "linkId" | "customerId" | "status" | "type";
+ groupBy?: "linkId" | "customerId" | "status" | "type" | "programId";
}) {
return usePartnerProfileEarningsSWR<T>(
"/count",
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index 84063aecce..5a484d5623 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -120,6 +120,9 @@ export const partnerProfileEarningsQuerySchema =
export const partnerProfileEarningsCountQuerySchema =
getPartnerEarningsCountQuerySchema.extend({
programIdOrSlug: programIdOrSlugSchema,
+ groupBy: z
+ .enum(["linkId", "customerId", "status", "type", "programId"])
+ .optional(),
});
export const partnerProfileEarningsTimeseriesQuerySchema =
diff --git a/apps/web/playwright/api/partner-profile/earnings.spec.ts b/apps/web/playwright/api/partner-profile/earnings.spec.ts
index 585eb13053..a0daeda893 100644
--- a/apps/web/playwright/api/partner-profile/earnings.spec.ts
+++ b/apps/web/playwright/api/partner-profile/earnings.spec.ts
@@ -233,6 +233,33 @@ test.describe("GET /partner-profile/earnings", () => {
});
});
+ test("counts earnings grouped by program, also when one program is selected", async ({
+ playwright,
+ program,
+ }) => {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ for (const query of ["", `&programIdOrSlug=${programB.slug}`]) {
+ const { status, data } = await partnerApi.get<
+ { id: string; slug: string; _count: number }[]
+ >(`/api/partner-profile/earnings/count?groupBy=programId${query}`);
+
+ expect(status).toEqual(200);
+ expect(data).toEqual([
+ expect.objectContaining({
+ id: program.id,
+ slug: programSlug,
+ _count: 2,
+ }),
+ expect.objectContaining({
+ id: programB.id,
+ slug: programB.slug,
+ _count: 1,
+ }),
+ ]);
+ }
+ });
+ });
+
test("filters by program ID or slug", async ({ playwright, program }) => {
await withPartnerApi(playwright, async (partnerApi) => {
for (const programIdOrSlug of [program.id, programSlug]) {