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.

Sync application status on merge, imports, and reminder job linking

Kiran K27e448e06a34
diff --git a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
index 825ee82a1d..18c523c59e 100644
--- a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
+++ b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
@@ -8,6 +8,7 @@ import { logger } from "@/lib/axiom/server";
import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
+import { approveLinkedApplication } from "@/lib/program-applications/approve-linked-application";
import { storage } from "@/lib/storage";
import { recordLink } from "@/lib/tinybird";
import { redis } from "@/lib/upstash";
@@ -580,7 +581,14 @@ async function mergeSingleEnrollment({
programId,
},
},
- data: { status: "approved" },
+ data: {
+ status: "approved",
+ },
+ });
+
+ await approveLinkedApplication({
+ applicationId: targetEnrollment.applicationId,
+ tx,
});
}
diff --git a/apps/web/lib/firstpromoter/import-partners.ts b/apps/web/lib/firstpromoter/import-partners.ts
index 1cf3c4d959..f371bdf89e 100644
--- a/apps/web/lib/firstpromoter/import-partners.ts
+++ b/apps/web/lib/firstpromoter/import-partners.ts
@@ -10,6 +10,7 @@ import { createId } from "../api/create-id";
import { bulkCreateLinks } from "../api/links";
import { upsertPartnerPlatform } from "../api/partner-profile/upsert-partner-platform";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
import { FirstPromoterApi } from "./api";
import { firstPromoterImporter, MAX_BATCHES } from "./importer";
@@ -207,6 +208,11 @@ async function createPartnerAndLinks({
},
});
+ await approveLinkedApplication({
+ applicationId: programEnrollment.applicationId,
+ userId,
+ });
+
if (!program.domain || !program.url) {
console.error("Program domain or url not found", program.id);
return programEnrollment.id;
diff --git a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
index 8cc33ef56f..dcd854d6a0 100644
--- a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
+++ b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
@@ -1,3 +1,4 @@
+import { getApplicationStatusFromEnrollment } from "@/lib/partners/get-application-status-from-enrollment";
import { prisma } from "@/lib/prisma";
import { sendEmail } from "@dub/email";
import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";
@@ -63,21 +64,45 @@ export const programApplicationReminderJob = defineJob({
},
select: {
id: true,
+ partnerId: true,
+ status: true,
},
});
if (programEnrollment) {
- await prisma.programEnrollment.update({
- where: {
- id: programEnrollment.id,
- },
- data: {
- applicationId: application.id,
- },
+ const linked = await prisma.$transaction(async (tx) => {
+ // Only link if the enrollment has no application yet, otherwise the linked one is orphaned
+ const { count } = await tx.programEnrollment.updateMany({
+ where: {
+ id: programEnrollment.id,
+ applicationId: null,
+ },
+ data: {
+ applicationId: application.id,
+ },
+ });
+
+ await tx.programApplication.update({
+ where: {
+ id: application.id,
+ },
+ data: {
+ partnerId: programEnrollment.partnerId,
+ ...(count > 0 && {
+ status: getApplicationStatusFromEnrollment(
+ programEnrollment.status,
+ ),
+ }),
+ },
+ });
+
+ return count > 0;
});
console.info(
- `Partner with email ${application.email} has already been enrolled in program ${application.program.name}. Updated applicationId to ${application.id} and skipping...`,
+ linked
+ ? `Partner with email ${application.email} has already been enrolled in program ${application.program.name}. Updated applicationId to ${application.id} and skipping...`
+ : `Partner with email ${application.email} has already been enrolled in program ${application.program.name} with another application. Set partnerId on application ${application.id} and skipping...`,
);
return;
}
diff --git a/apps/web/lib/lemonsqueezy/import-partners.ts b/apps/web/lib/lemonsqueezy/import-partners.ts
index 9c09242796..493d8fe06d 100644
--- a/apps/web/lib/lemonsqueezy/import-partners.ts
+++ b/apps/web/lib/lemonsqueezy/import-partners.ts
@@ -4,6 +4,7 @@ import { createId } from "../api/create-id";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
import { createLink } from "../api/links";
import { generatePartnerLink } from "../api/partners/generate-partner-link";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { logImportError } from "../tinybird/log-import-error";
import { WorkspaceProps } from "../types";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -224,7 +225,7 @@ async function createPartnerAndLinks({
update: {},
});
- const { links } = await prisma.programEnrollment.upsert({
+ const { links, applicationId } = await prisma.programEnrollment.upsert({
where: {
partnerId_programId: {
partnerId: partner.id,
@@ -248,6 +249,7 @@ async function createPartnerAndLinks({
status: "approved",
},
select: {
+ applicationId: true,
links: {
select: {
key: true,
@@ -256,6 +258,11 @@ async function createPartnerAndLinks({
},
});
+ await approveLinkedApplication({
+ applicationId,
+ userId,
+ });
+
if (links.length > 0 && links.some((link) => link.key === affiliate.id)) {
console.log(
`Partner ${partner.id} already has a link with key ${affiliate.id}, skipping...`,
diff --git a/apps/web/lib/partnerstack/import-partners.ts b/apps/web/lib/partnerstack/import-partners.ts
index d6e746a635..352d411124 100644
--- a/apps/web/lib/partnerstack/import-partners.ts
+++ b/apps/web/lib/partnerstack/import-partners.ts
@@ -3,6 +3,7 @@ import { COUNTRIES, COUNTRY_CODES, sleep } from "@dub/utils";
import { PartnerGroup, Program } from "@prisma/client";
import { createId } from "../api/create-id";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { logImportError } from "../tinybird/log-import-error";
import { redis } from "../upstash";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -179,7 +180,7 @@ async function createPartner({
},
});
- await prisma.programEnrollment.upsert({
+ const { applicationId } = await prisma.programEnrollment.upsert({
where: {
partnerId_programId: {
partnerId,
@@ -202,6 +203,13 @@ async function createPartner({
update: {
status: "approved",
},
+ select: {
+ applicationId: true,
+ },
+ });
+
+ await approveLinkedApplication({
+ applicationId,
});
// PS doesn't return the partner email address in the customers response
diff --git a/apps/web/lib/program-applications/approve-linked-application.ts b/apps/web/lib/program-applications/approve-linked-application.ts
new file mode 100644
index 0000000000..3c3eaaa376
--- /dev/null
+++ b/apps/web/lib/program-applications/approve-linked-application.ts
@@ -0,0 +1,35 @@
+import { prisma } from "@/lib/prisma";
+import { Prisma, ProgramApplicationStatus } from "@prisma/client";
+
+// Keeps the application in sync when its enrollment is promoted to approved
+// outside the review flow (e.g. account merges, partner imports). Applications
+// that are already approved are skipped so their original review is preserved.
+export async function approveLinkedApplication({
+ applicationId,
+ userId,
+ tx,
+}: {
+ applicationId: string | null;
+ userId?: string;
+ tx?: Prisma.TransactionClient;
+}) {
+ if (!applicationId) {
+ return;
+ }
+
+ await (tx ?? prisma).programApplication.updateMany({
+ where: {
+ id: applicationId,
+ status: {
+ not: ProgramApplicationStatus.approved,
+ },
+ },
+ data: {
+ status: ProgramApplicationStatus.approved,
+ reviewedAt: new Date(),
+ rejectionReason: null,
+ rejectionNote: null,
+ ...(userId && { userId }),
+ },
+ });
+}
diff --git a/apps/web/lib/rewardful/import-partners.ts b/apps/web/lib/rewardful/import-partners.ts
index 33b4cb0b98..3e800adaa4 100644
--- a/apps/web/lib/rewardful/import-partners.ts
+++ b/apps/web/lib/rewardful/import-partners.ts
@@ -4,6 +4,7 @@ import { Program } from "@prisma/client";
import { createId } from "../api/create-id";
import { bulkCreateLinks } from "../api/links";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { logImportError } from "../tinybird/log-import-error";
import { redis } from "../upstash";
import { RewardfulApi } from "./api";
@@ -216,6 +217,11 @@ async function createPartnerAndLinks({
},
});
+ await approveLinkedApplication({
+ applicationId: programEnrollment.applicationId,
+ userId,
+ });
+
if (!program.domain || !program.url) {
console.error("Program domain or url not found", program.id);
return;
diff --git a/apps/web/lib/tapfiliate/import-partners.ts b/apps/web/lib/tapfiliate/import-partners.ts
index 46d9aec45e..de190052a8 100644
--- a/apps/web/lib/tapfiliate/import-partners.ts
+++ b/apps/web/lib/tapfiliate/import-partners.ts
@@ -5,6 +5,7 @@ import { createId } from "../api/create-id";
import { createLink } from "../api/links";
import { generatePartnerLink } from "../api/partners/generate-partner-link";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { logImportError } from "../tinybird/log-import-error";
import { WorkspaceProps } from "../types";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -226,7 +227,7 @@ async function createPartnerAndLinks({
update: {},
});
- const { links } = await prisma.programEnrollment.upsert({
+ const { links, applicationId } = await prisma.programEnrollment.upsert({
where: {
partnerId_programId: {
partnerId: partner.id,
@@ -250,6 +251,7 @@ async function createPartnerAndLinks({
status: "approved",
},
select: {
+ applicationId: true,
links: {
select: {
key: true,
@@ -258,6 +260,11 @@ async function createPartnerAndLinks({
},
});
+ await approveLinkedApplication({
+ applicationId,
+ userId,
+ });
+
if (links.length > 0 && links.some((link) => link.key === affiliate.id)) {
console.log(
`Partner ${partner.email} already has a link with key ${affiliate.id}, skipping...`,
diff --git a/apps/web/lib/tolt/import-partners.ts b/apps/web/lib/tolt/import-partners.ts
index 91fa1278dc..04f7529a5e 100644
--- a/apps/web/lib/tolt/import-partners.ts
+++ b/apps/web/lib/tolt/import-partners.ts
@@ -4,6 +4,7 @@ import { Partner, Program } from "@prisma/client";
import { createId } from "../api/create-id";
import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { approveLinkedApplication } from "../program-applications/approve-linked-application";
import { logImportError } from "../tinybird/log-import-error";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
import { ToltApi } from "./api";
@@ -162,7 +163,7 @@ async function createPartner({
},
});
- await prisma.programEnrollment.upsert({
+ const { applicationId } = await prisma.programEnrollment.upsert({
where: {
partnerId_programId: {
partnerId: partner.id,
@@ -179,6 +180,13 @@ async function createPartner({
update: {
status: "approved",
},
+ select: {
+ applicationId: true,
+ },
+ });
+
+ await approveLinkedApplication({
+ applicationId,
});
return partner;