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.

Store environment on programs instead of reading it from the workspace.

Kiran K6f3f52cd166c
diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
index a94e973144..9264a1554f 100644
--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
@@ -38,11 +38,7 @@ export async function queueExternalPayouts(
slug: true,
logo: true,
supportEmail: true,
- workspace: {
- select: {
- environment: true,
- },
- },
+ environment: true,
},
});
@@ -137,11 +133,11 @@ export async function queueExternalPayouts(
templateName: "PartnerPayoutConfirmed",
templateProps: {
email: payout.partner.email!,
- workspace: program.workspace,
program: {
id: program.id,
name: program.name,
logo: program.logo,
+ environment: program.environment,
},
payout: {
id: payout.id,
diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/send-paypal-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/send-paypal-payouts.ts
index bd5a140665..14cb1e072c 100644
--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/send-paypal-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/send-paypal-payouts.ts
@@ -40,9 +40,7 @@ export async function sendPaypalPayouts({
},
},
program: {
- workspace: {
- environment: WorkspaceEnvironment.production,
- },
+ environment: WorkspaceEnvironment.production,
},
},
include: {
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
index 0234a8c112..62532240e5 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
@@ -30,15 +30,7 @@ export const POST = withCron(async ({ rawBody }) => {
invoiceId,
},
include: {
- program: {
- include: {
- workspace: {
- select: {
- environment: true,
- },
- },
- },
- },
+ program: true,
partner: true,
invoice: true,
},
@@ -99,11 +91,11 @@ export const POST = withCron(async ({ rawBody }) => {
replyTo: payout.program.supportEmail || "noreply",
react: PartnerPayoutConfirmed({
email: payout.partner.email!,
- workspace: payout.program.workspace,
program: {
id: payout.program.id,
name: payout.program.name,
logo: payout.program.logo,
+ environment: payout.program.environment,
},
payout: {
id: payout.id,
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
index 0ed13128b4..ddced8ee4a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
@@ -49,9 +49,7 @@ export default async function ApplicationPage(props: {
program.group.applicationFormData || {},
);
- const isNonProduction = !isProductionEnvironment(
- program.workspace.environment,
- );
+ const isNonProduction = !isProductionEnvironment(program.environment);
return (
<div
@@ -63,7 +61,7 @@ export default async function ApplicationPage(props: {
} as CSSProperties
}
>
- <ProgramEnvironmentBanner environment={program.workspace.environment} />
+ <ProgramEnvironmentBanner environment={program.environment} />
<ApplyHeader
group={program.group}
showApply={false}
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
index 3e1329a8c5..0d245b000a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
@@ -92,9 +92,7 @@ export default async function SuccessPage(props: {
: null;
const hasPartnerProfile = !!enrollmentId || !!application?.partnerId;
- const isNonProduction = !isProductionEnvironment(
- program.workspace.environment,
- );
+ const isNonProduction = !isProductionEnvironment(program.environment);
return (
<div
@@ -106,7 +104,7 @@ export default async function SuccessPage(props: {
} as CSSProperties
}
>
- <ProgramEnvironmentBanner environment={program.workspace.environment} />
+ <ProgramEnvironmentBanner environment={program.environment} />
<ApplyHeader
group={program.group}
showLogin={false}
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
index d1220a5fa6..9c4323575b 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
@@ -35,7 +35,7 @@ export async function generateMetadata(props: {
} by referring ${program.name} to your friends and followers.`,
image: `${APP_DOMAIN}/api/og/program?slug=${program.slug}${groupSlug ? `&groupSlug=${groupSlug}` : ""}`,
canonicalUrl: `${PARTNERS_DOMAIN}/${program.slug}`,
- noIndex: !isProductionEnvironment(program.workspace.environment),
+ noIndex: !isProductionEnvironment(program.environment),
});
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
index 84437aa53a..8765cc73e9 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
@@ -45,9 +45,7 @@ export default async function ApplyPage(props: {
}
const landerData = programLanderSchema.parse(program.group.landerData || {});
- const isNonProduction = !isProductionEnvironment(
- program.workspace.environment,
- );
+ const isNonProduction = !isProductionEnvironment(program.environment);
return (
<div
@@ -59,7 +57,7 @@ export default async function ApplyPage(props: {
} as CSSProperties
}
>
- <ProgramEnvironmentBanner environment={program.workspace.environment} />
+ <ProgramEnvironmentBanner environment={program.environment} />
<ApplyHeader group={program.group} hasBanner={isNonProduction} />
<ApplicationAnalytics />
<div className="p-6">
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
index 5c99ef766b..42036a6e34 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
@@ -34,7 +34,7 @@ export async function generateMetadata(props: {
} by referring ${program.name} to your friends and followers.`,
image: `${PARTNERS_DOMAIN}/api/og/program?slug=${program.slug}`,
canonicalUrl: `${PARTNERS_DOMAIN}/${program.slug}`,
- noIndex: !isProductionEnvironment(program.workspace.environment),
+ noIndex: !isProductionEnvironment(program.environment),
});
}
diff --git a/apps/web/app/sitemap.ts b/apps/web/app/sitemap.ts
index d2d7947c04..ab186652dc 100644
--- a/apps/web/app/sitemap.ts
+++ b/apps/web/app/sitemap.ts
@@ -20,9 +20,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
if (PARTNERS_HOSTNAMES.has(domain)) {
const programs = await prisma.program.findMany({
where: {
- workspace: {
- environment: WorkspaceEnvironment.production,
- },
+ environment: WorkspaceEnvironment.production,
groups: {
some: {
slug: "default",
diff --git a/apps/web/lib/actions/partners/create-program.ts b/apps/web/lib/actions/partners/create-program.ts
index 60deaa80d6..6976394a5f 100644
--- a/apps/web/lib/actions/partners/create-program.ts
+++ b/apps/web/lib/actions/partners/create-program.ts
@@ -50,6 +50,7 @@ export const createProgram = async ({
| "webhookEnabled"
| "invoicePrefix"
| "stagingWorkspaceId"
+ | "environment"
>;
user: Pick<User, "id" | "email">;
isProgramOnboarding?: boolean;
@@ -152,6 +153,7 @@ export const createProgram = async ({
supportEmail,
helpUrl,
termsUrl,
+ environment: workspace.environment,
messagingEnabledAt: canMessagePartners ? new Date() : null,
...(type &&
(amountInCents != null || amountInPercentage != null) && {
diff --git a/apps/web/lib/fetchers/get-program-slugs.ts b/apps/web/lib/fetchers/get-program-slugs.ts
index 2a87bcb054..b7e0bcc58e 100644
--- a/apps/web/lib/fetchers/get-program-slugs.ts
+++ b/apps/web/lib/fetchers/get-program-slugs.ts
@@ -5,9 +5,7 @@ import { cache } from "react";
export const getProgramSlugs = cache(async () =>
prisma.program.findMany({
where: {
- workspace: {
- environment: WorkspaceEnvironment.production,
- },
+ environment: WorkspaceEnvironment.production,
},
select: {
slug: true,
diff --git a/apps/web/lib/fetchers/get-program.ts b/apps/web/lib/fetchers/get-program.ts
index a46bffe1e7..ae36ba18b9 100644
--- a/apps/web/lib/fetchers/get-program.ts
+++ b/apps/web/lib/fetchers/get-program.ts
@@ -3,16 +3,10 @@ import { prisma } from "@/lib/prisma";
import { Program, Reward } from "@prisma/client";
import { cache } from "react";
import { serializeReward } from "../api/partners/serialize-reward";
-import {
- DiscountProps,
- GroupWithFormDataProps,
- RewardProps,
- WorkspaceProps,
-} from "../types";
+import { DiscountProps, GroupWithFormDataProps, RewardProps } from "../types";
type Result = Program & {
groups: GroupWithFormDataProps[];
- workspace: Pick<WorkspaceProps, "environment">;
};
export const getProgram = cache(
@@ -36,11 +30,6 @@ export const getProgram = cache(
},
},
}),
- workspace: {
- select: {
- environment: true,
- },
- },
},
});
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 c7b84ff914..b7836c8c04 100644
--- a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
+++ b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts
@@ -24,9 +24,7 @@ export const programApplicationReminderJob = defineJob({
gt: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000),
},
program: {
- workspace: {
- environment: WorkspaceEnvironment.production,
- },
+ environment: WorkspaceEnvironment.production,
},
},
select: {
diff --git a/apps/web/lib/sandbox/create-staging-program.ts b/apps/web/lib/sandbox/create-staging-program.ts
index b455e11605..a59b73f547 100644
--- a/apps/web/lib/sandbox/create-staging-program.ts
+++ b/apps/web/lib/sandbox/create-staging-program.ts
@@ -1,5 +1,5 @@
import { prisma } from "@/lib/prisma";
-import { Prisma } from "@prisma/client";
+import { Prisma, WorkspaceEnvironment } from "@prisma/client";
import { createId } from "../api/create-id";
import { getPlanCapabilities } from "../plan-capabilities";
import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -195,6 +195,7 @@ export async function createStagingProgram(workspaceId: string) {
termsUrl: program.termsUrl,
helpUrl: program.helpUrl,
supportEmail: program.supportEmail,
+ environment: WorkspaceEnvironment.staging,
},
});
diff --git a/apps/web/lib/sandbox/mock-payout-completion.ts b/apps/web/lib/sandbox/mock-payout-completion.ts
index f02294df99..de82f3312f 100644
--- a/apps/web/lib/sandbox/mock-payout-completion.ts
+++ b/apps/web/lib/sandbox/mock-payout-completion.ts
@@ -41,11 +41,7 @@ export async function mockPayoutCompletion({
name: true,
logo: true,
workspaceId: true,
- workspace: {
- select: {
- environment: true,
- },
- },
+ environment: true,
},
},
partner: {
@@ -141,7 +137,6 @@ export async function mockPayoutCompletion({
subject: `You've received a ${currencyFormatter(payout.amount)} payout from ${program.name}`,
react: PartnerPayoutProcessed({
email: partner.email!,
- workspace: program.workspace,
program,
payout,
}),
diff --git a/apps/web/prisma/schema/program.prisma b/apps/web/prisma/schema/program.prisma
index 0bf27e9108..158c73a999 100644
--- a/apps/web/prisma/schema/program.prisma
+++ b/apps/web/prisma/schema/program.prisma
@@ -25,19 +25,20 @@ enum ProgramPayoutMode {
}
model Program {
- id String @id
+ id String @id
workspaceId String
defaultFolderId String
defaultGroupId String
name String
- slug String @unique
- domain String? @unique
+ slug String @unique
+ domain String? @unique
url String?
logo String?
- description String? @db.Text
- primaryRewardEvent EventType @default(sale)
- minPayoutAmount Int @default(0) // Default minimum payout amount of $0
- payoutMode ProgramPayoutMode @default(internal)
+ description String? @db.Text
+ primaryRewardEvent EventType @default(sale)
+ minPayoutAmount Int @default(0) // Default minimum payout amount of $0
+ payoutMode ProgramPayoutMode @default(internal)
+ environment WorkspaceEnvironment @default(production)
inviteEmailData Json? @db.Json
embedData Json? @db.Json
diff --git a/apps/web/scripts/migrations/link-manual-staging-workspaces.ts b/apps/web/scripts/migrations/link-manual-staging-workspaces.ts
index 2595be102f..099556479f 100644
--- a/apps/web/scripts/migrations/link-manual-staging-workspaces.ts
+++ b/apps/web/scripts/migrations/link-manual-staging-workspaces.ts
@@ -73,6 +73,25 @@ async function main() {
console.table(workspacePairs);
+ const programsToSync = await prisma.program.findMany({
+ where: {
+ workspaceId: {
+ in: workspacePairs.map(({ stagingWorkspaceId }) => stagingWorkspaceId),
+ },
+ environment: {
+ not: WorkspaceEnvironment.staging,
+ },
+ },
+ select: {
+ id: true,
+ slug: true,
+ workspaceId: true,
+ environment: true,
+ },
+ });
+
+ console.table(programsToSync);
+
if (DRY_RUN) {
return;
}
@@ -92,7 +111,7 @@ async function main() {
}
}
-// Point the production workspace at the manual staging workspace and mark it as staging.
+// Point the production workspace at the manual staging workspace and mark it (and its programs) as staging.
async function linkStagingWorkspace({
productionWorkspaceId,
productionSlug,
@@ -152,6 +171,18 @@ async function linkStagingWorkspace({
`${stagingSlug} is a sandbox workspace or has its own staging workspace.`,
);
}
+
+ await tx.program.updateMany({
+ where: {
+ workspaceId: stagingWorkspaceId,
+ environment: {
+ not: WorkspaceEnvironment.staging,
+ },
+ },
+ data: {
+ environment: WorkspaceEnvironment.staging,
+ },
+ });
});
}
diff --git a/packages/email/src/templates/partner-payout-confirmed.tsx b/packages/email/src/templates/partner-payout-confirmed.tsx
index aa0f1a233f..2e32dcc0ed 100644
--- a/packages/email/src/templates/partner-payout-confirmed.tsx
+++ b/packages/email/src/templates/partner-payout-confirmed.tsx
@@ -26,13 +26,11 @@ const PAYOUT_METHOD_LABELS: Record<PartnerPayoutMethod, string> = {
// Send this email when the payout is confirmed when payment is send using ACH
export default function PartnerPayoutConfirmed({
email = "[email protected]",
- workspace = {
- environment: "production",
- },
program = {
id: "prog_CYCu7IMAapjkRpTnr8F1azjN",
name: "Acme",
logo: DUB_WORDMARK,
+ environment: "production",
},
payout = {
id: "po_8VuCr2i7WnG65d4TNgZO19fT",
@@ -46,13 +44,11 @@ export default function PartnerPayoutConfirmed({
},
}: {
email: string;
- workspace?: {
- environment: WorkspaceEnvironment;
- };
program: {
id: string;
name: string;
logo: string | null;
+ environment?: WorkspaceEnvironment;
};
payout: {
id: string;
@@ -105,7 +101,7 @@ export default function PartnerPayoutConfirmed({
<Tailwind>
<Body className="mx-auto my-auto bg-white font-sans">
<Container className="mx-auto my-10 max-w-[600px] rounded border border-solid border-neutral-200 px-10 py-5">
- <EnvironmentBanner environment={workspace.environment} />
+ <EnvironmentBanner environment={program.environment} />
<Section className="mt-8">
<Img
src={program.logo || "https://assets.dub.co/wordmark.png"}
diff --git a/packages/email/src/templates/partner-payout-processed.tsx b/packages/email/src/templates/partner-payout-processed.tsx
index 18d530bdf9..90aa61eccc 100644
--- a/packages/email/src/templates/partner-payout-processed.tsx
+++ b/packages/email/src/templates/partner-payout-processed.tsx
@@ -24,12 +24,10 @@ import {
export default function PartnerPayoutProcessed({
email = "[email protected]",
- workspace = {
- environment: "production",
- },
program = {
name: "Acme",
logo: DUB_WORDMARK,
+ environment: "production",
},
payout = {
id: "po_8VuCr2i7WnG65d4TNgZO19fT",
@@ -40,12 +38,10 @@ export default function PartnerPayoutProcessed({
},
}: {
email: string;
- workspace?: {
- environment: WorkspaceEnvironment;
- };
program: {
name: string;
logo: string | null;
+ environment?: WorkspaceEnvironment;
};
payout: {
id: string;
@@ -164,7 +160,7 @@ export default function PartnerPayoutProcessed({
<Tailwind>
<Body className="mx-auto my-auto bg-white font-sans">
<Container className="mx-auto my-10 max-w-[600px] rounded border border-solid border-neutral-200 px-10 py-5">
- <EnvironmentBanner environment={workspace.environment} />
+ <EnvironmentBanner environment={program.environment} />
<Section className="mt-8">
<Img
src={program.logo || "https://assets.dub.co/wordmark.png"}