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.

Backfill partner platforms once and drop redundant application null checks

Kiran K03bb6b8eb235
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index eb67402f4b..74d22c1ddb 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -373,7 +373,7 @@ async function createApplicationAndEnrollment({
const { platforms, socialFields } = await backfillPartnerPlatforms({
partnerId: partner.id,
platforms: partner.platforms,
- application: programApplication,
+ applications: [programApplication],
});
await Promise.allSettled([
diff --git a/apps/web/lib/partners/backfill-partner-platforms.ts b/apps/web/lib/partners/backfill-partner-platforms.ts
index 68d60795d0..400972d267 100644
--- a/apps/web/lib/partners/backfill-partner-platforms.ts
+++ b/apps/web/lib/partners/backfill-partner-platforms.ts
@@ -69,11 +69,12 @@ const mergeApplicationSocialPlatforms = ({
};
/**
- * Saves the website and social profiles from a program application that the
+ * Saves the website and social profiles from program applications that the
* partner's profile doesn't have yet (e.g. they skipped them during onboarding).
*
* Existing profile platforms are never overwritten, since they may be verified.
- * New ones are sanitized and saved as unverified.
+ * New ones are sanitized and saved as unverified. When several applications
+ * provide the same platform, the earliest one in `applications` wins.
*
* Returns the partner's platforms as they are actually stored after the backfill,
* along with the matching flat social fields (`website`, `youtube`, etc.). Re-reading
@@ -84,16 +85,22 @@ const mergeApplicationSocialPlatforms = ({
export async function backfillPartnerPlatforms({
partnerId,
platforms,
- application,
+ applications,
}: {
partnerId: string;
platforms: PartnerPlatform[];
- application: ProgramApplication;
+ applications: ProgramApplication[];
}) {
- const { missingPlatforms } = mergeApplicationSocialPlatforms({
- platforms,
- application,
- });
+ const missingPlatforms: ApplicationPlatform[] = [];
+
+ for (const application of applications) {
+ const merged = mergeApplicationSocialPlatforms({
+ platforms: [...platforms, ...missingPlatforms],
+ application,
+ });
+
+ missingPlatforms.push(...merged.missingPlatforms);
+ }
let savedPlatforms = platforms;
diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.ts
index c55ed92d94..c7bb49b9bb 100644
--- a/apps/web/lib/partners/complete-program-applications.ts
+++ b/apps/web/lib/partners/complete-program-applications.ts
@@ -161,119 +161,117 @@ export async function completeProgramApplications(userEmail: string) {
workspaces.map((ws) => [ws.defaultProgramId, ws]),
);
- let savedPlatforms = partner.platforms;
-
- for (const programApplication of filteredProgramApplications) {
- const application = programApplication;
- const program = programApplication.program;
- const group = programApplication.partnerGroup;
- const programEnrollment = enrollmentsByApplicationId.get(
- programApplication.id,
- );
-
- const { platforms, socialFields } = await backfillPartnerPlatforms({
- partnerId: partner.id,
- platforms: savedPlatforms,
- application,
- });
+ const { platforms, socialFields } = await backfillPartnerPlatforms({
+ partnerId: partner.id,
+ platforms: partner.platforms,
+ applications: filteredProgramApplications,
+ });
- savedPlatforms = platforms;
+ await Promise.allSettled(
+ filteredProgramApplications.map(async (programApplication) => {
+ const application = programApplication;
+ const program = programApplication.program;
+ const group = programApplication.partnerGroup;
+ const programEnrollment = enrollmentsByApplicationId.get(
+ programApplication.id,
+ );
- const applicationFormData = formatApplicationFormData(application).map(
- ({ title, value }) => ({
- label: title,
- value: value !== "" ? value : null,
- }),
- );
+ const applicationFormData = formatApplicationFormData(application).map(
+ ({ title, value }) => ({
+ label: title,
+ value: value !== "" ? value : null,
+ }),
+ );
- const { valid: validApplication } = evaluateApplicationRequirements({
- applicationRequirements: program.applicationRequirements,
- context: {
- country: partner.country,
- email: partner.email,
- },
- });
+ const { valid: validApplication } = evaluateApplicationRequirements({
+ applicationRequirements: program.applicationRequirements,
+ context: {
+ country: partner.country,
+ email: partner.email,
+ },
+ });
- const webhookData = {
- id: application.id,
- createdAt: application.createdAt,
- applicationFormData,
- partner: {
- ...partner,
- ...programEnrollment,
- id: partner.id,
- status: "pending",
- },
- };
+ const webhookData = {
+ id: application.id,
+ createdAt: application.createdAt,
+ applicationFormData,
+ partner: {
+ ...partner,
+ ...programEnrollment,
+ id: partner.id,
+ status: "pending",
+ },
+ };
- await Promise.allSettled([
- ...(validApplication
- ? [
- notifyProgramApplication({
- partner,
- program,
- group,
- application,
- }),
+ await Promise.allSettled([
+ ...(validApplication
+ ? [
+ notifyProgramApplication({
+ partner,
+ program,
+ group,
+ application,
+ }),
- // Auto-approve the partner if the group has auto-approval enabled
- group?.autoApprovePartnersEnabledAt
- ? autoApproveProgramApplicationJob.dispatch(
- { applicationId: application.id },
- { label: partner.id },
- )
- : Promise.resolve(null),
+ // Auto-approve the partner if the group has auto-approval enabled
+ group?.autoApprovePartnersEnabledAt
+ ? autoApproveProgramApplicationJob.dispatch(
+ { applicationId: application.id },
+ { label: partner.id },
+ )
+ : Promise.resolve(null),
- // Send "partner.application_submitted" webhook (deprecated)
- workspacesByProgramId.has(program.id) &&
- sendWorkspaceWebhook({
- workspace: workspacesByProgramId.get(program.id)!,
- trigger: "partner.application_submitted",
- data: partnerApplicationWebhookSchema.parse({
- ...webhookData,
- partner: {
- ...webhookData.partner,
- ...formatWebsiteAndSocialsFields(application),
- },
+ // Send "partner.application_submitted" webhook (deprecated)
+ workspacesByProgramId.has(program.id) &&
+ sendWorkspaceWebhook({
+ workspace: workspacesByProgramId.get(program.id)!,
+ trigger: "partner.application_submitted",
+ data: partnerApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ ...formatWebsiteAndSocialsFields(application),
+ },
+ }),
}),
- }),
- // Send "program_application.created" webhook
- workspacesByProgramId.has(program.id) &&
- sendWorkspaceWebhook({
- workspace: workspacesByProgramId.get(program.id)!,
- trigger: "program_application.created",
- data: programApplicationWebhookSchema.parse({
- ...webhookData,
- partner: {
- ...webhookData.partner,
- platforms,
- ...socialFields,
- },
+ // Send "program_application.created" webhook
+ workspacesByProgramId.has(program.id) &&
+ sendWorkspaceWebhook({
+ workspace: workspacesByProgramId.get(program.id)!,
+ trigger: "program_application.created",
+ data: programApplicationWebhookSchema.parse({
+ ...webhookData,
+ partner: {
+ ...webhookData.partner,
+ platforms,
+ ...socialFields,
+ },
+ }),
}),
- }),
- ]
- : [
- autoRejectProgramApplicationJob.dispatch(
- {
- applicationId: application.id,
- },
- {
- delay: 5 * 60, // 5 minutes
- label: partner.id,
- },
- ),
- ]),
+ ]
+ : [
+ autoRejectProgramApplicationJob.dispatch(
+ {
+ applicationId: application.id,
+ },
+ {
+ delay: 5 * 60, // 5 minutes
+ label: partner.id,
+ },
+ ),
+ ]),
- // Detect and record fraud events for the partner when they apply to a program
- detectAndRecordFraudApplication({
- context: {
- program,
- partner,
- },
- }),
- ]);
- }
+ // Detect and record fraud events for the partner when they apply to a program
+ detectAndRecordFraudApplication({
+ context: {
+ program,
+ partner,
+ },
+ }),
+ ]);
+ }),
+ );
await Promise.allSettled(
programEnrollments.map((programEnrollment) =>
diff --git a/apps/web/lib/program-applications/approve-program-application.ts b/apps/web/lib/program-applications/approve-program-application.ts
index b042c8251f..bf96a1c844 100644
--- a/apps/web/lib/program-applications/approve-program-application.ts
+++ b/apps/web/lib/program-applications/approve-program-application.ts
@@ -118,7 +118,7 @@ export async function approveProgramApplication({
}
const programEnrollment: Partial<ProgramEnrollment> = {
- ...(programApplication && { applicationId: programApplication.id }),
+ applicationId: programApplication.id,
...(isNewEnrollment && {
status: ProgramEnrollmentStatus.approved,
createdAt: now,
@@ -150,20 +150,18 @@ export async function approveProgramApplication({
},
});
- if (programApplication) {
- await tx.programApplication.update({
- where: {
- id: programApplication.id,
- },
- data: {
- status: ProgramApplicationStatus.approved,
- reviewedAt: now,
- rejectionReason: null,
- rejectionNote: null,
- userId,
- },
- });
- }
+ await tx.programApplication.update({
+ where: {
+ id: programApplication.id,
+ },
+ data: {
+ status: ProgramApplicationStatus.approved,
+ reviewedAt: now,
+ rejectionReason: null,
+ rejectionNote: null,
+ userId,
+ },
+ });
if (isNewEnrollment) {
await tx.project.update({