The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Only approve a pending application by default for already approved partners
Kiran K1c1dc890d97d
diff --git a/apps/web/lib/program-applications/approve-program-application.ts b/apps/web/lib/program-applications/approve-program-application.tsindex 5ca40b46cd..adbb09e807 100644--- a/apps/web/lib/program-applications/approve-program-application.ts+++ b/apps/web/lib/program-applications/approve-program-application.ts@@ -43,58 +43,17 @@ export async function approveProgramApplication({groupId,userId,}: ApproveProgramApplicationInput) {- const [programApplication, existingEnrollment] = await Promise.all([- prisma.programApplication.findFirst({- where: {- ...(applicationId && { id: applicationId }),- programId,+ const existingEnrollment = await prisma.programEnrollment.findUnique({+ where: {+ partnerId_programId: {partnerId,- status: {- in: APPROVABLE_APPLICATION_STATUSES,- },- },- select: {- id: true,- groupId: true,- status: true,- program: {- select: {- defaultGroupId: true,- workspace: {- select: {- id: true,- trialEndsAt: true,- partnersUsage: true,- partnersLimit: true,- },- },- },- },- },- orderBy: {- createdAt: "desc",- },- }),-- prisma.programEnrollment.findUnique({- where: {- partnerId_programId: {- partnerId,- programId,- },- },- select: {- status: true,+ programId,},- }),- ]);-- if (!programApplication) {- throw new DubApiError({- code: "not_found",- message: "No pending or rejected application found.",- });- }+ },+ select: {+ status: true,+ },+ });if (existingEnrollment &&@@ -106,6 +65,60 @@ export async function approveProgramApplication({});}+ const isEnrollmentApproved =+ existingEnrollment?.status === ProgramEnrollmentStatus.approved;+ const requirePendingApplication = !applicationId && isEnrollmentApproved;++ const programApplication = await prisma.programApplication.findFirst({+ where: {+ ...(applicationId && { id: applicationId }),+ programId,+ partnerId,+ status: requirePendingApplication+ ? ProgramApplicationStatus.pending+ : {+ in: APPROVABLE_APPLICATION_STATUSES,+ },+ },+ select: {+ id: true,+ groupId: true,+ status: true,+ program: {+ select: {+ defaultGroupId: true,+ workspace: {+ select: {+ id: true,+ trialEndsAt: true,+ partnersUsage: true,+ partnersLimit: true,+ },+ },+ },+ },+ },+ orderBy: {+ createdAt: "desc",+ },+ });++ if (!programApplication) {+ // When a specific application ID is provided+ if (requirePendingApplication) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "This application cannot be approved because it is already approved.",+ });+ }++ throw new DubApiError({+ code: "not_found",+ message: "No pending application or rejected application found.",+ });+ }+const { program } = programApplication;const finalGroupId =@@ -125,9 +138,7 @@ export async function approveProgramApplication({});const now = new Date();-- const isNewEnrollment =- existingEnrollment?.status !== ProgramEnrollmentStatus.approved;+ const isNewEnrollment = !isEnrollmentApproved;await prisma.$transaction(async (tx) => {if (isNewEnrollment) {diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.tsindex 6dbfcb201c..37944f4fba 100644--- a/apps/web/lib/zod/schemas/program-application.ts+++ b/apps/web/lib/zod/schemas/program-application.ts@@ -115,7 +115,7 @@ export const approveProgramApplicationSchema = z.object({.string().optional().describe(- "The ID of the application to approve. If not provided, the partner's most recent pending or rejected application is used.",+ "The ID of the application to approve. If not provided, the partner's most recent pending or rejected application is used. For a partner who is already approved in the program, only a pending application is used.",),groupId: z.string()diff --git a/apps/web/playwright/api/program-applications/program-applications-review.spec.ts b/apps/web/playwright/api/program-applications/program-applications-review.spec.tsindex a123bbe318..540aedb476 100644--- a/apps/web/playwright/api/program-applications/program-applications-review.spec.ts+++ b/apps/web/playwright/api/program-applications/program-applications-review.spec.ts@@ -77,11 +77,14 @@ test.describe("program application reviews", () => {});let programId: string;+ let defaultGroupId: string;let extraGroup: GroupProps;let applications: SeededApplication[] = [];+ const extraApplicationIds: string[] = [];test.beforeAll(async ({ api, program }) => {programId = program.id;+ defaultGroupId = program.defaultGroupId;extraGroup = await createGroup(api);const now = Date.now();@@ -179,11 +182,14 @@ test.describe("program application reviews", () => {await deletePartner(application.partnerId);}- if (applications.length > 0) {+ if (applications.length > 0 || extraApplicationIds.length > 0) {await prisma.programApplication.deleteMany({where: {id: {- in: applications.map((application) => application.applicationId),+ in: [+ ...applications.map((application) => application.applicationId),+ ...extraApplicationIds,+ ],},},});@@ -352,6 +358,64 @@ test.describe("program application reviews", () => {});});+ test("POST /program-applications/approve – partnerId only does not revive a rejected group application", async ({+ api,+ }) => {+ const application = applications[0]!;+ const rejectedApplicationId = createId({ prefix: "pga_" });+ extraApplicationIds.push(rejectedApplicationId);++ await prisma.programApplication.create({+ data: {+ id: rejectedApplicationId,+ programId,+ partnerId: application.partnerId,+ groupId: defaultGroupId,+ name: application.name,+ email: application.email,+ country: application.country,+ formData: { fields: [] },+ status: "rejected",+ reviewedAt: new Date(),+ createdAt: new Date(),+ },+ });++ const response = await api.post("/api/program-applications/approve", {+ partnerId: application.partnerId,+ });++ expect(response).toEqual(+ apiError({+ code: "bad_request",+ message:+ "This enrollment cannot be approved because it is already approved.",+ }),+ );++ const enrollment = await prisma.programEnrollment.findUniqueOrThrow({+ where: {+ partnerId_programId: {+ partnerId: application.partnerId,+ programId,+ },+ },+ });++ expect(enrollment.status).toBe("approved");+ expect(enrollment.groupId).toBe(application.groupId);+ expect(enrollment.applicationId).toBe(application.applicationId);++ const rejectedApplication =+ await prisma.programApplication.findUniqueOrThrow({+ where: {+ id: rejectedApplicationId,+ },+ });++ expect(rejectedApplication.status).toBe("rejected");+ });+test("POST /partners/applications/approve – legacy alias of POST /program-applications/approve", async ({api,}) => {