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 cross-program-summary calculation again

Steven Teyf807bb8074b2
diff --git a/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts b/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts
index b68e2f2399..cfe9198c22 100644
--- a/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts
+++ b/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts
@@ -1,10 +1,7 @@
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withWorkspace } from "@/lib/auth";
-import {
- INACTIVE_ENROLLMENT_STATUSES,
- partnerCrossProgramSummarySchema,
-} from "@/lib/zod/schemas/partners";
+import { partnerCrossProgramSummarySchema } from "@/lib/zod/schemas/partners";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
@@ -28,7 +25,7 @@ export const GET = withWorkspace(
not: programId,
},
status: {
- notIn: [...INACTIVE_ENROLLMENT_STATUSES, "pending"],
+ not: "pending",
},
},
_count: true,
@@ -39,17 +36,21 @@ export const GET = withWorkspace(
0,
);
- const bannedPrograms =
- programEnrollments.find((enrollment) => enrollment.status === "banned")
- ?._count ?? 0;
+ // approved and archived statuses
+ const trustedPrograms = programEnrollments
+ .filter((enrollment) =>
+ ["approved", "archived"].includes(enrollment.status),
+ )
+ .reduce((acc, enrollment) => acc + enrollment._count, 0);
- const trustedPrograms = totalPrograms - bannedPrograms;
+ // all other statuses
+ const removedPrograms = totalPrograms - trustedPrograms;
return NextResponse.json(
partnerCrossProgramSummarySchema.parse({
totalPrograms,
- bannedPrograms,
trustedPrograms,
+ removedPrograms,
}),
);
},
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 6620e2b0bd..e4bdf5c4f3 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -847,6 +847,6 @@ export const partnerPayoutSettingsSchema = z.object({
export const partnerCrossProgramSummarySchema = z.object({
totalPrograms: z.number(),
- bannedPrograms: z.number(),
trustedPrograms: z.number(),
+ removedPrograms: z.number(),
});
diff --git a/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx b/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx
index 2d3c040f8c..ffb67e77f3 100644
--- a/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx
+++ b/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx
@@ -21,9 +21,9 @@ export function PartnerCrossProgramSummary({
},
{
icon: UserXmark,
- text: "Banned from programs",
+ text: "Removed from programs",
total: crossProgramSummary?.totalPrograms,
- value: crossProgramSummary?.bannedPrograms,
+ value: crossProgramSummary?.removedPrograms,
},
];