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.

Convert program application reminder to a job with a cron shim

Kiran Kfd4255e69b8a
diff --git a/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts b/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
index b98fa183c3..4307a6a55c 100644
--- a/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
+++ b/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
@@ -1,104 +1,13 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { qstash } from "@/lib/cron";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { prisma } from "@/lib/prisma";
-import { sendEmail } from "@dub/email";
-import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils/src/constants";
+import { withCron } from "@/lib/cron/with-cron";
+import { programApplicationReminderJob } from "@/lib/jobs/handlers/program-application-reminder-job";
+import { logAndRespond } from "../utils";
+
+export const dynamic = "force-dynamic";
// POST - /api/cron/program-application-reminder
// Sends an email to a program application email if they haven't verified their account on Dub yet
-export async function POST(req: Request) {
- try {
- const rawBody = await req.text();
- await verifyQstashSignature({ req, rawBody });
-
- const { applicationId } = JSON.parse(rawBody);
-
- const application = await prisma.programApplication.findFirst({
- where: {
- id: applicationId,
- // Only send reminders for applications that were created less than 3 days ago
- createdAt: {
- gt: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000),
- },
- },
- include: {
- enrollment: true,
- program: {
- select: {
- id: true,
- name: true,
- slug: true,
- supportEmail: true,
- },
- },
- },
- });
-
- if (!application) {
- return new Response(
- `Application ${applicationId} not found. Skipping...`,
- );
- }
-
- if (application.enrollment) {
- return new Response(
- `Partner with applicationId ${application.id} has already been enrolled in program ${application.program.name}. Skipping...`,
- );
- }
-
- const programEnrollment = await prisma.programEnrollment.findFirst({
- where: {
- programId: application.program.id,
- partner: {
- email: application.email,
- },
- },
- });
-
- if (programEnrollment) {
- await prisma.programEnrollment.update({
- where: {
- id: programEnrollment.id,
- },
- data: {
- applicationId: application.id,
- },
- });
-
- return new Response(
- `Partner with email ${application.email} has already been enrolled in program ${application.program.name}. Updated applicationId to ${application.id} and skipping...`,
- );
- }
-
- await sendEmail({
- subject: `Complete your application for ${application.program.name}`,
- to: application.email,
- replyTo: application.program.supportEmail || "noreply",
- react: ProgramApplicationReminder({
- email: application.email,
- program: {
- name: application.program.name,
- slug: application.program.slug,
- },
- }),
- variant: "notifications",
- });
-
- await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/program-application-reminder`,
- // repeat every 24 hours, but it'll be canceled if the application is more than 3 days old or is associated with a partner
- delay: 24 * 60 * 60,
- body: {
- applicationId: application.id,
- },
- });
-
- return new Response(
- `Email sent to ${application.email} for application ${applicationId}.`,
- );
- } catch (error) {
- return handleAndReturnErrorResponse(error);
- }
-}
+// TODO: Remove this route once in-flight QStash messages to this URL have drained (~3 days after deploy)
+export const POST = withCron(async ({ rawBody }) => {
+ await programApplicationReminderJob.execute(JSON.parse(rawBody));
+ return logAndRespond("Program application reminder processed.");
+});
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 58b5086201..3dcf4e7719 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -9,9 +9,9 @@ import { getIP } from "@/lib/api/utils/get-ip";
import { markApplicationEventSubmitted } from "@/lib/application-events/update-application-event";
import { getApplicationEventCookieName } from "@/lib/application-events/utils";
import { getSession } from "@/lib/auth";
-import { qstash } from "@/lib/cron";
import { autoApprovePartnerJob } from "@/lib/jobs/handlers/auto-approve-partner-job";
import { autoRejectPartnerJob } from "@/lib/jobs/handlers/auto-reject-partner-job";
+import { programApplicationReminderJob } from "@/lib/jobs/handlers/program-application-reminder-job";
import { getNetworkProfileChecklistProgress } from "@/lib/network/get-network-profile-checklist-progress";
import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
import {
@@ -29,7 +29,6 @@ import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
import { partnerApplicationWebhookSchema } from "@/lib/zod/schemas/program-application";
import { programApplicationFormWebsiteAndSocialsFieldWithValueSchema } from "@/lib/zod/schemas/program-application-form";
import { createProgramApplicationSchema } from "@/lib/zod/schemas/programs";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import {
Partner,
PartnerGroup,
@@ -229,13 +228,14 @@ export const createProgramApplicationAction = actionClient
group,
});
- await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/program-application-reminder`,
- delay: 15 * 60, // 15 minutes
- body: {
+ await programApplicationReminderJob.dispatch(
+ {
applicationId: application.programApplicationId,
},
- });
+ {
+ delay: 15 * 60, // 15 minutes
+ },
+ );
return application;
});
diff --git a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
new file mode 100644
index 0000000000..8cc33ef56f
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
@@ -0,0 +1,113 @@
+import { prisma } from "@/lib/prisma";
+import { sendEmail } from "@dub/email";
+import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+ applicationId: z.string(),
+});
+
+// Sends an email to a program application email if they haven't verified their account on Dub yet
+export const programApplicationReminderJob = defineJob({
+ name: "program-application-reminder-job",
+ schema: inputSchema,
+ async handle(input) {
+ const { applicationId } = input;
+
+ const application = await prisma.programApplication.findFirst({
+ where: {
+ id: applicationId,
+ // Only send reminders for applications that were created less than 3 days ago
+ createdAt: {
+ gt: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000),
+ },
+ },
+ select: {
+ id: true,
+ email: true,
+ enrollment: {
+ select: {
+ id: true,
+ },
+ },
+ program: {
+ select: {
+ id: true,
+ name: true,
+ slug: true,
+ supportEmail: true,
+ },
+ },
+ },
+ });
+
+ if (!application) {
+ console.info(`Application ${applicationId} not found. Skipping...`);
+ return;
+ }
+
+ if (application.enrollment) {
+ console.info(
+ `Partner with applicationId ${application.id} has already been enrolled in program ${application.program.name}. Skipping...`,
+ );
+ return;
+ }
+
+ const programEnrollment = await prisma.programEnrollment.findFirst({
+ where: {
+ programId: application.program.id,
+ partner: {
+ email: application.email,
+ },
+ },
+ select: {
+ id: true,
+ },
+ });
+
+ if (programEnrollment) {
+ await prisma.programEnrollment.update({
+ where: {
+ id: programEnrollment.id,
+ },
+ data: {
+ applicationId: application.id,
+ },
+ });
+
+ console.info(
+ `Partner with email ${application.email} has already been enrolled in program ${application.program.name}. Updated applicationId to ${application.id} and skipping...`,
+ );
+ return;
+ }
+
+ await sendEmail({
+ subject: `Complete your application for ${application.program.name}`,
+ to: application.email,
+ replyTo: application.program.supportEmail || "noreply",
+ variant: "notifications",
+ react: ProgramApplicationReminder({
+ email: application.email,
+ program: {
+ name: application.program.name,
+ slug: application.program.slug,
+ },
+ }),
+ });
+
+ await programApplicationReminderJob.dispatch(
+ {
+ applicationId: application.id,
+ },
+ {
+ // repeat every 24 hours, but it'll be canceled if the application is more than 3 days old or is associated with a partner
+ delay: 24 * 60 * 60,
+ },
+ );
+
+ console.info(
+ `Email sent to ${application.email} for application ${applicationId}.`,
+ );
+ },
+});
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index adc4d255b0..ba367b8baf 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -106,6 +106,11 @@ const jobLoaders = {
import("./handlers/process-partner-group-change-job").then(
(m) => m.processPartnerGroupChangeJob,
),
+
+ "program-application-reminder-job": () =>
+ import("./handlers/program-application-reminder-job").then(
+ (m) => m.programApplicationReminderJob,
+ ),
} as const satisfies Record<string, () => Promise<JobDefinition>>;
const jobCache = new Map<string, JobDefinition>();