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.

Add status and partnerId to ProgramApplication and keep them in sync

Kiran K1aa5eecf6e65
diff --git a/apps/web/app/(ee)/api/e2e/partners/pending-program-application/route.ts b/apps/web/app/(ee)/api/e2e/partners/pending-program-application/route.ts
index 2a916cd9c4..a22f03b197 100644
--- a/apps/web/app/(ee)/api/e2e/partners/pending-program-application/route.ts
+++ b/apps/web/app/(ee)/api/e2e/partners/pending-program-application/route.ts
@@ -4,7 +4,10 @@ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-progr
import { parseRequestBody } from "@/lib/api/utils";
import { withWorkspace } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
-import { ProgramEnrollmentStatus } from "@prisma/client";
+import {
+ ProgramApplicationStatus,
+ ProgramEnrollmentStatus,
+} from "@prisma/client";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
import { assertE2EWorkspace } from "../../guard";
@@ -90,6 +93,7 @@ export const POST = withWorkspace(
data: {
id: applicationId,
programId,
+ partnerId,
groupId,
name: partner.name,
email: partner.email ?? `${partner.id}@e2e.dub-internal-test.com`,
@@ -123,6 +127,7 @@ export const POST = withWorkspace(
prisma.programApplication.update({
where: { id: enrollment.applicationId },
data: {
+ status: ProgramApplicationStatus.pending,
reviewedAt: null,
rejectionReason: null,
rejectionNote: null,
@@ -152,6 +157,7 @@ export const POST = withWorkspace(
data: {
id: applicationId,
programId,
+ partnerId,
groupId,
name: partner.name,
email: partner.email ?? `${partner.id}@e2e.dub-internal-test.com`,
diff --git a/apps/web/lib/actions/partners/bulk-approve-partners.ts b/apps/web/lib/actions/partners/bulk-approve-partners.ts
index 2b95340e04..55418ddbc2 100644
--- a/apps/web/lib/actions/partners/bulk-approve-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-approve-partners.ts
@@ -9,6 +9,10 @@ import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
import { throwIfPartnersLimitExceeded } from "@/lib/partners/throw-if-partners-limit-exceeded";
import { prisma } from "@/lib/prisma";
import { bulkApprovePartnersSchema } from "@/lib/zod/schemas/partners";
+import {
+ ProgramApplicationStatus,
+ ProgramEnrollmentStatus,
+} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import { authActionClient } from "../safe-action";
import { throwIfNoPermission } from "../throw-if-no-permission";
@@ -88,8 +92,12 @@ export const bulkApprovePartnersAction = authActionClient
id: {
in: applicationIds,
},
+ enrollment: {
+ status: ProgramEnrollmentStatus.approved,
+ },
},
data: {
+ status: ProgramApplicationStatus.approved,
reviewedAt: now,
rejectionReason: null,
rejectionNote: null,
@@ -120,6 +128,7 @@ export const bulkApprovePartnersAction = authActionClient
id: {
in: programEnrollments.map(({ id }) => id),
},
+ status: ProgramEnrollmentStatus.approved,
},
include: {
partner: true,
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 4543b86b02..58b5086201 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -299,6 +299,7 @@ async function createApplicationAndEnrollment({
...sanitizeData(data, group),
id: applicationId,
programId: program.id,
+ partnerId: partner.id,
groupId: group.id,
},
}),
diff --git a/apps/web/lib/actions/partners/unban-partner.ts b/apps/web/lib/actions/partners/unban-partner.ts
index 19b54c85c0..b95c1d3e57 100644
--- a/apps/web/lib/actions/partners/unban-partner.ts
+++ b/apps/web/lib/actions/partners/unban-partner.ts
@@ -7,6 +7,7 @@ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-progr
import { unbanPartnerJob } from "@/lib/jobs/handlers/unban-partner-job";
import { prisma } from "@/lib/prisma";
import { banPartnerSchema } from "@/lib/zod/schemas/partners";
+import { ProgramApplicationStatus } from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import { authActionClient } from "../safe-action";
import { throwIfNoPermission } from "../throw-if-no-permission";
@@ -79,6 +80,26 @@ export const unbanPartnerAction = authActionClient
discountId: partnerGroup.discountId,
},
}),
+
+ ...(programEnrollment.applicationId
+ ? [
+ prisma.programApplication.updateMany({
+ where: {
+ id: programEnrollment.applicationId,
+ status: {
+ not: ProgramApplicationStatus.approved,
+ },
+ },
+ data: {
+ status: ProgramApplicationStatus.approved,
+ reviewedAt: new Date(),
+ rejectionReason: null,
+ rejectionNote: null,
+ userId: user.id,
+ },
+ }),
+ ]
+ : []),
]);
await unbanPartnerJob.dispatch(
diff --git a/apps/web/lib/api/partners/applications/approve-partner.ts b/apps/web/lib/api/partners/applications/approve-partner.ts
index 164c058ba7..a7c0cd71a2 100644
--- a/apps/web/lib/api/partners/applications/approve-partner.ts
+++ b/apps/web/lib/api/partners/applications/approve-partner.ts
@@ -1,7 +1,10 @@
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
import { prisma } from "@/lib/prisma";
-import { ProgramEnrollmentStatus } from "@prisma/client";
+import {
+ ProgramApplicationStatus,
+ ProgramEnrollmentStatus,
+} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
import { throwIfPartnersLimitExceeded } from "../../../partners/throw-if-partners-limit-exceeded";
@@ -111,6 +114,7 @@ export async function approvePartner({
id: programEnrollment.applicationId,
},
data: {
+ status: ProgramApplicationStatus.approved,
reviewedAt: now,
rejectionReason: null,
rejectionNote: null,
diff --git a/apps/web/lib/api/partners/applications/reject-partner.ts b/apps/web/lib/api/partners/applications/reject-partner.ts
index 4380273f93..1b36091fcc 100644
--- a/apps/web/lib/api/partners/applications/reject-partner.ts
+++ b/apps/web/lib/api/partners/applications/reject-partner.ts
@@ -5,7 +5,10 @@ import { WorkspaceProps } from "@/lib/types";
import { rejectPartnerSchema } from "@/lib/zod/schemas/partners";
import { sendEmail } from "@dub/email";
import PartnerApplicationRejected from "@dub/email/templates/partner-application-rejected";
-import { ProgramEnrollmentStatus } from "@prisma/client";
+import {
+ ProgramApplicationStatus,
+ ProgramEnrollmentStatus,
+} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
import { trackActivityLog } from "../../activity-log/track-activity-log";
@@ -87,6 +90,7 @@ export async function rejectPartner({
id: programEnrollment.applicationId,
},
data: {
+ status: ProgramApplicationStatus.rejected,
reviewedAt: new Date(),
rejectionReason,
rejectionNote,
diff --git a/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts b/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts
index 635990362c..fc466b50c1 100644
--- a/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts
+++ b/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts
@@ -7,6 +7,7 @@ import { sendEmail } from "@dub/email";
import PartnerApplicationRejected from "@dub/email/templates/partner-application-rejected";
import {
ProgramApplicationRejectionReason,
+ ProgramApplicationStatus,
ProgramEnrollmentStatus,
} from "@prisma/client";
import * as z from "zod/v4";
@@ -107,6 +108,7 @@ export const autoRejectPartnerJob = defineJob({
id: programEnrollment.applicationId,
},
data: {
+ status: ProgramApplicationStatus.rejected,
reviewedAt: new Date(),
rejectionReason:
ProgramApplicationRejectionReason.doesNotMeetRequirements,
diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.ts
index 5e91493af9..551fe41a70 100644
--- a/apps/web/lib/partners/complete-program-applications.ts
+++ b/apps/web/lib/partners/complete-program-applications.ts
@@ -1,4 +1,5 @@
import { prisma } from "@/lib/prisma";
+import { pluck } from "@dub/utils";
import { PlatformType, Prisma } from "@prisma/client";
import { createId } from "../api/create-id";
import { detectAndRecordFraudApplication } from "../api/fraud/detect-record-fraud-application";
@@ -115,10 +116,26 @@ export async function completeProgramApplications(userEmail: string) {
]),
);
- await prisma.programEnrollment.createMany({
- data: programEnrollments,
- skipDuplicates: true,
- });
+ await prisma.$transaction([
+ prisma.programEnrollment.createMany({
+ data: programEnrollments,
+ skipDuplicates: true,
+ }),
+
+ prisma.programApplication.updateMany({
+ where: {
+ id: {
+ in: pluck(filteredProgramApplications, "id"),
+ },
+ enrollment: {
+ isNot: null,
+ },
+ },
+ data: {
+ partnerId: user.partners[0].partnerId,
+ },
+ }),
+ ]);
// Fetch the programs' workspaces
const workspaces = await prisma.project.findMany({
diff --git a/apps/web/playwright/api/partner-applications/partner-applications.spec.ts b/apps/web/playwright/api/partner-applications/partner-applications.spec.ts
index 7c5059b5de..97d49ba2bc 100644
--- a/apps/web/playwright/api/partner-applications/partner-applications.spec.ts
+++ b/apps/web/playwright/api/partner-applications/partner-applications.spec.ts
@@ -146,6 +146,7 @@ test.describe("partner applications", () => {
data: {
id: applicationId,
programId,
+ partnerId,
groupId: row.groupId,
name: row.name,
email: row.email,
diff --git a/apps/web/prisma/schema/application.prisma b/apps/web/prisma/schema/application.prisma
index 8121fad929..5b1a65c26a 100644
--- a/apps/web/prisma/schema/application.prisma
+++ b/apps/web/prisma/schema/application.prisma
@@ -5,9 +5,16 @@ enum ProgramApplicationRejectionReason {
other
}
+enum ProgramApplicationStatus {
+ pending
+ approved
+ rejected
+}
+
model ProgramApplication {
id String @id
programId String
+ partnerId String?
groupId String?
name String
email String
@@ -19,6 +26,7 @@ model ProgramApplication {
instagram String? @db.Text
tiktok String? @db.Text
formData Json? @db.Json
+ status ProgramApplicationStatus @default(pending)
userId String? // user who reviewed the application
rejectionReason ProgramApplicationRejectionReason?
rejectionNote String? @db.Text
@@ -27,15 +35,17 @@ model ProgramApplication {
updatedAt DateTime @updatedAt
program Program @relation(fields: [programId], references: [id])
+ partner Partner? @relation(fields: [partnerId], references: [id], onDelete: SetNull)
partnerGroup PartnerGroup? @relation(fields: [groupId], references: [id])
enrollment ProgramEnrollment?
user User? @relation(fields: [userId], references: [id])
programApplicationEvents ProgramApplicationEvent[]
- @@index(programId)
+ @@index(partnerId)
@@index(groupId)
@@index(email)
@@index(userId)
+ @@index([programId, status, createdAt])
}
model ProgramApplicationEvent {
diff --git a/apps/web/prisma/schema/partner.prisma b/apps/web/prisma/schema/partner.prisma
index 90d8710ffe..def00c3a56 100644
--- a/apps/web/prisma/schema/partner.prisma
+++ b/apps/web/prisma/schema/partner.prisma
@@ -83,7 +83,7 @@ model Partner {
invoiceSettings Json?
changeHistoryLog Json?
referredByPartnerId String?
- usersLimit Int @default(10)
+ usersLimit Int @default(10)
programs ProgramEnrollment[]
users PartnerUser[]
@@ -111,6 +111,7 @@ model Partner {
partnerRewinds PartnerRewind[]
platforms PartnerPlatform[]
referredApplications ProgramApplicationEvent[]
+ programApplications ProgramApplication[]
submittedLeads SubmittedLead[]
@@index(country)