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.

Auto-approve by pending application and drop legacy auto-approve/reject crons

Kiran K9711f42e005a
diff --git a/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts b/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts
deleted file mode 100644
index 33650185b5..0000000000
--- a/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { withCron } from "@/lib/cron/with-cron";
-import { autoApprovePartnerJob } from "@/lib/jobs/handlers/auto-approve-partner-job";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-// POST /api/cron/partners/auto-approve
-export const POST = withCron(async ({ rawBody }) => {
- await autoApprovePartnerJob.execute(JSON.parse(rawBody));
- return logAndRespond("Successfully auto-approved partner.");
-});
diff --git a/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts b/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts
deleted file mode 100644
index 44878feb62..0000000000
--- a/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { withCron } from "@/lib/cron/with-cron";
-import { autoRejectPartnerJob } from "@/lib/jobs/handlers/auto-reject-partner-job";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-// POST /api/cron/partners/auto-reject
-export const POST = withCron(async ({ rawBody }) => {
- await autoRejectPartnerJob.execute(JSON.parse(rawBody));
- return logAndRespond("Successfully auto-rejected partner.");
-});
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index aec0da5175..c3c598ef15 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -313,7 +313,7 @@ async function createApplicationAndEnrollment({
const applicationId = createId({ prefix: "pga_" });
const enrollmentId = createId({ prefix: "pge_" });
- const [application, programEnrollment] = await prisma.$transaction([
+ const [programApplication, programEnrollment] = await prisma.$transaction([
prisma.programApplication.create({
data: {
...sanitizeData(data, group),
@@ -353,16 +353,16 @@ async function createApplicationAndEnrollment({
waitUntil(
(async () => {
- const applicationFormData = formatApplicationFormData(application).map(
- ({ title, value }) => ({
- label: title,
- value: value !== "" ? value : null,
- }),
- );
+ const applicationFormData = formatApplicationFormData(
+ programApplication,
+ ).map(({ title, value }) => ({
+ label: title,
+ value: value !== "" ? value : null,
+ }));
const webhookData = {
- id: application.id,
- createdAt: application.createdAt,
+ id: programApplication.id,
+ createdAt: programApplication.createdAt,
applicationFormData,
partner: {
...partner,
@@ -374,7 +374,7 @@ async function createApplicationAndEnrollment({
const { platforms, socialFields } = await backfillPartnerPlatforms({
partnerId: partner.id,
platforms: partner.platforms,
- application,
+ application: programApplication,
});
await Promise.allSettled([
@@ -382,7 +382,7 @@ async function createApplicationAndEnrollment({
partner,
program,
group,
- application,
+ application: programApplication,
}),
// Auto-approve the partner if the group has auto-approval enabled
@@ -391,6 +391,7 @@ async function createApplicationAndEnrollment({
{
programId: program.id,
partnerId: partner.id,
+ applicationId: programApplication.id,
},
{
label: partner.id,
@@ -406,7 +407,7 @@ async function createApplicationAndEnrollment({
...webhookData,
partner: {
...webhookData.partner,
- ...formatWebsiteAndSocialsFields(application),
+ ...formatWebsiteAndSocialsFields(programApplication),
},
}),
}),
diff --git a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
index 757fca5804..1039935b06 100644
--- a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
+++ b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
@@ -3,60 +3,108 @@ import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-applica
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { prisma } from "@/lib/prisma";
import { approveProgramApplication } from "@/lib/program-applications/approve-program-application";
-import { ProgramEnrollmentStatus } from "@prisma/client";
+import { ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
import { defineJob } from "../index";
const inputSchema = z.object({
programId: z.string(),
partnerId: z.string(),
+ applicationId: z.string().optional(),
});
+// TODO:
+// Rename this job to auto-approve-program-application-job
+
// This job is used to auto-approve a partner enrolled in a program
export const autoApprovePartnerJob = defineJob({
name: "auto-approve-partner-job",
schema: inputSchema,
async handle(input) {
- const { programId, partnerId } = input;
+ const { programId, partnerId, applicationId } = input;
- const programEnrollment = await prisma.programEnrollment.findUnique({
- where: {
- partnerId_programId: {
- partnerId,
+ const [programApplication, programEnrollment] = await Promise.all([
+ prisma.programApplication.findFirst({
+ where: {
+ ...(applicationId && { id: applicationId }),
programId,
+ partnerId,
+ status: ProgramApplicationStatus.pending,
},
- },
- include: {
- partnerGroup: true,
- partner: {
- include: {
- platforms: true,
+ include: {
+ partnerGroup: true,
+ partner: {
+ include: {
+ platforms: true,
+ },
},
},
- },
- });
+ orderBy: {
+ createdAt: "desc",
+ },
+ }),
+
+ prisma.programEnrollment.findUnique({
+ where: {
+ partnerId_programId: {
+ partnerId,
+ programId,
+ },
+ },
+ select: {
+ status: true,
+ groupId: true,
+ },
+ }),
+ ]);
+
+ if (!programApplication) {
+ console.warn(
+ `No pending application found for partner ${partnerId} in program ${programId}.`,
+ );
+ return;
+ }
+
+ if (programApplication.status !== ProgramApplicationStatus.pending) {
+ console.warn(`Application ${programApplication.id} is not pending.`);
+ return;
+ }
if (!programEnrollment) {
console.warn(`Partner ${partnerId} not found in program ${programId}.`);
return;
}
- const group = programEnrollment.partnerGroup;
+ const isApplyingToAdditionalGroup =
+ programApplication.groupId !== programEnrollment.groupId;
- if (!group) {
+ if (isApplyingToAdditionalGroup) {
console.warn(
- `Group not found for partner ${partnerId} in program ${programId}.`,
+ `Partner ${partnerId} is applying to a different group than the one they are already in.`,
);
return;
}
- if (!group.autoApprovePartnersEnabledAt) {
- console.warn(`Group ${group.id} does not have auto-approval enabled.`);
+ const { partnerGroup, partner } = programApplication;
+
+ if (!partnerGroup) {
+ console.warn(
+ `Partner group not found for partner ${partnerId} in program ${programId}.`,
+ );
return;
}
- if (programEnrollment.status !== ProgramEnrollmentStatus.pending) {
- console.warn(`${partnerId} is in ${programEnrollment.status} status.`);
+ if (!partnerGroup.autoApprovePartnersEnabledAt) {
+ console.warn(
+ `Partner group ${partnerGroup.id} does not have auto-approval enabled.`,
+ );
+ return;
+ }
+
+ if (!partner) {
+ console.warn(
+ `Partner not found for application ${programApplication.id}.`,
+ );
return;
}
@@ -93,7 +141,7 @@ export const autoApprovePartnerJob = defineJob({
if (canManageFraudEvents) {
const { riskSeverity } = await getProgramApplicationRisks({
program,
- partner: programEnrollment.partner,
+ partner,
});
if (riskSeverity === "high") {
@@ -105,8 +153,8 @@ export const autoApprovePartnerJob = defineJob({
const result = evaluateApplicationRequirements({
applicationRequirements: program.applicationRequirements,
context: {
- country: programEnrollment.partner.country,
- email: programEnrollment.partner.email,
+ country: partner.country,
+ email: partner.email,
},
});
@@ -138,6 +186,7 @@ export const autoApprovePartnerJob = defineJob({
partnerId,
userId: owner.userId,
groupId: programEnrollment.groupId,
+ applicationId: programApplication.id,
});
console.info(
diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.ts
index f8bf5968a4..e8ff2aa63e 100644
--- a/apps/web/lib/partners/complete-program-applications.ts
+++ b/apps/web/lib/partners/complete-program-applications.ts
@@ -222,6 +222,7 @@ export async function completeProgramApplications(userEmail: string) {
{
programId: program.id,
partnerId: partner.id,
+ applicationId: application.id,
},
{
label: partner.id,