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.

Include staging workspace programs in deactivate/reactivate flows

Kiran K3d38d81e1bb7
diff --git a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
index b3f7ddfe4e..afca109b84 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
@@ -145,7 +145,7 @@ export async function checkoutSessionCompleted(
currentPlan: "free",
newPlan: updatedWorkspace.plan,
}) &&
- reactivateProgram(updatedWorkspace.defaultProgramId),
+ reactivateProgram(updatedWorkspace),
// If no programOnboarding data (Links trial), send TrialStartedEmail
// For program trial we send it in create-program.ts
subscription.status === "trialing" &&
diff --git a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
index 8be2eceaf0..1961a27ee9 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
@@ -221,7 +221,7 @@ export async function customerSubscriptionDeleted(
// Deactivate the program if the workspace had partner access
if (workspace.defaultProgramId) {
- await deactivateProgram(workspace.defaultProgramId);
+ await deactivateProgram(workspace);
}
const losesAdvancedFeatures = wouldLoseAdvancedFeatures({
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
index 8b931bb483..b1361e9f8e 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
@@ -60,7 +60,10 @@ export async function updateWorkspacePlan({
const { plan: newPlan, planTier: newPlanTier } = getPlanAndTierFromPriceId({
priceId,
});
- if (!newPlan) return;
+
+ if (!newPlan) {
+ return;
+ }
const newPlanName = newPlan.name.toLowerCase();
@@ -214,7 +217,7 @@ export async function updateWorkspacePlan({
}) &&
workspace.defaultProgramId
) {
- await deactivateProgram(workspace.defaultProgramId);
+ await deactivateProgram(workspace);
console.log(`Deactivated program for workspace ${workspace.id}.`);
}
@@ -226,7 +229,7 @@ export async function updateWorkspacePlan({
}) &&
workspace.defaultProgramId
) {
- await reactivateProgram(workspace.defaultProgramId);
+ await reactivateProgram(workspace);
console.log(`Reactivated program for workspace ${workspace.id}.`);
}
diff --git a/apps/web/lib/api/programs/deactivate-program.ts b/apps/web/lib/api/programs/deactivate-program.ts
index 81b15475c3..4ab8394b7c 100644
--- a/apps/web/lib/api/programs/deactivate-program.ts
+++ b/apps/web/lib/api/programs/deactivate-program.ts
@@ -1,47 +1,76 @@
import { qstash } from "@/lib/cron";
import { prisma } from "@/lib/prisma";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { Project } from "@prisma/client";
-export async function deactivateProgram(programId: string) {
- if (!programId) {
- throw new Error("[deactivateProgram] programId is required");
+export async function deactivateProgram(
+ workspace: Pick<Project, "defaultProgramId" | "stagingWorkspaceId">,
+) {
+ if (!workspace.defaultProgramId) {
+ throw new Error("[deactivateProgram] defaultProgramId is required");
}
- await prisma.$transaction([
- prisma.program.update({
- where: {
- id: programId,
- },
- data: {
- deactivatedAt: new Date(),
- // additional fields to reset
- messagingEnabledAt: null,
- addedToMarketplaceAt: null,
- featuredOnMarketplaceAt: null,
- },
- }),
+ const programIds = [workspace.defaultProgramId];
- prisma.partnerGroup.updateMany({
+ if (workspace.stagingWorkspaceId) {
+ const stagingWorkspace = await prisma.project.findUnique({
where: {
- programId,
+ id: workspace.stagingWorkspaceId,
},
- data: {
- applicationFormPublishedAt: null,
- landerPublishedAt: null,
- autoApprovePartnersEnabledAt: null,
+ select: {
+ defaultProgramId: true,
},
- }),
- ]);
-
- const response = await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/programs/deactivate`,
- body: {
- programId,
- },
- deduplicationId: `deactivate-program-${programId}`,
- });
+ });
+
+ if (stagingWorkspace?.defaultProgramId) {
+ programIds.push(stagingWorkspace.defaultProgramId);
+ }
+ }
+
+ await prisma.$transaction(
+ programIds.flatMap((id) => [
+ prisma.program.update({
+ where: {
+ id,
+ },
+ data: {
+ deactivatedAt: new Date(),
+ // additional fields to reset
+ messagingEnabledAt: null,
+ addedToMarketplaceAt: null,
+ featuredOnMarketplaceAt: null,
+ },
+ }),
+
+ prisma.partnerGroup.updateMany({
+ where: {
+ programId: id,
+ },
+ data: {
+ applicationFormPublishedAt: null,
+ landerPublishedAt: null,
+ autoApprovePartnersEnabledAt: null,
+ },
+ }),
+ ]),
+ );
- console.log("[deactivateProgram] Deactivation job enqueued.", { response });
+ const responses = await Promise.all(
+ programIds.map((id) =>
+ qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/programs/deactivate`,
+ body: {
+ programId: id,
+ },
+ deduplicationId: `deactivate-program-${id}`,
+ }),
+ ),
+ );
+
+ console.log("[deactivateProgram] Deactivation jobs enqueued.", {
+ programIds,
+ responses,
+ });
- return response;
+ return responses;
}
diff --git a/apps/web/lib/api/programs/reactivate-program.ts b/apps/web/lib/api/programs/reactivate-program.ts
index a6222eb9ff..d39615301f 100644
--- a/apps/web/lib/api/programs/reactivate-program.ts
+++ b/apps/web/lib/api/programs/reactivate-program.ts
@@ -2,46 +2,75 @@ import { qstash } from "@/lib/cron";
import { prisma } from "@/lib/prisma";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { Project } from "@prisma/client";
-export async function reactivateProgram(programId: string) {
- if (!programId) {
- throw new Error("[reactivateProgram] programId is required");
+export async function reactivateProgram(
+ workspace: Pick<Project, "defaultProgramId" | "stagingWorkspaceId">,
+) {
+ if (!workspace.defaultProgramId) {
+ throw new Error("[reactivateProgram] defaultProgramId is required");
}
- await prisma.$transaction([
- prisma.program.update({
+ const programIds = [workspace.defaultProgramId];
+
+ if (workspace.stagingWorkspaceId) {
+ const stagingWorkspace = await prisma.project.findUnique({
where: {
- id: programId,
+ id: workspace.stagingWorkspaceId,
},
- data: {
- deactivatedAt: null,
+ select: {
+ defaultProgramId: true,
},
- }),
+ });
- // republish the default group
- prisma.partnerGroup.update({
- where: {
- programId_slug: {
- programId,
- slug: DEFAULT_PARTNER_GROUP.slug,
+ if (stagingWorkspace?.defaultProgramId) {
+ programIds.push(stagingWorkspace.defaultProgramId);
+ }
+ }
+
+ await prisma.$transaction(
+ programIds.flatMap((id) => [
+ prisma.program.update({
+ where: {
+ id,
},
- },
- data: {
- applicationFormPublishedAt: new Date(),
- landerPublishedAt: new Date(),
- },
- }),
- ]);
-
- const response = await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/programs/reactivate`,
- body: {
- programId,
- },
- deduplicationId: `reactivate-program-${programId}`,
- });
+ data: {
+ deactivatedAt: null,
+ },
+ }),
+
+ // republish the default group
+ prisma.partnerGroup.update({
+ where: {
+ programId_slug: {
+ programId: id,
+ slug: DEFAULT_PARTNER_GROUP.slug,
+ },
+ },
+ data: {
+ applicationFormPublishedAt: new Date(),
+ landerPublishedAt: new Date(),
+ },
+ }),
+ ]),
+ );
- console.log("[reactivateProgram] Reactivation job enqueued.", { response });
+ const responses = await Promise.all(
+ programIds.map((id) =>
+ qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/programs/reactivate`,
+ body: {
+ programId: id,
+ },
+ deduplicationId: `reactivate-program-${id}`,
+ }),
+ ),
+ );
+
+ console.log("[reactivateProgram] Reactivation jobs enqueued.", {
+ programIds,
+ responses,
+ });
- return response;
+ return responses;
}