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.

Pass workspace into partner discount generation and add custom discount tests

Kiran Kf86ca8a6e269
diff --git a/apps/web/app/(ee)/api/discount-codes/route.ts b/apps/web/app/(ee)/api/discount-codes/route.ts
index 69e561a1b5..23c1ad95f9 100644
--- a/apps/web/app/(ee)/api/discount-codes/route.ts
+++ b/apps/web/app/(ee)/api/discount-codes/route.ts
@@ -49,9 +49,6 @@ export const GET = withWorkspace(
...(partnerId && { partnerId }),
...(discountId && { discountId }),
},
- include: {
- discount: true,
- },
orderBy: {
createdAt: "desc",
},
@@ -119,6 +116,18 @@ export const POST = withWorkspace(
});
}
+ // A link can have only one discount code
+ const duplicateByLink = programEnrollment.discountCodes.find(
+ (discountCode) => discountCode.linkId === linkId,
+ );
+
+ if (duplicateByLink) {
+ throw new DubApiError({
+ code: "bad_request",
+ message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
+ });
+ }
+
// Check for duplicate by code
if (code) {
const duplicateByCode = await prisma.discountCode.findUnique({
@@ -141,18 +150,6 @@ export const POST = withWorkspace(
}
}
- // A link can have only one discount code
- const duplicateByLink = programEnrollment.discountCodes.find(
- (discountCode) => discountCode.linkId === linkId,
- );
-
- if (duplicateByLink) {
- throw new DubApiError({
- code: "bad_request",
- message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
- });
- }
-
const discountCode = await createDiscountCode({
workspace,
partner: programEnrollment.partner,
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
index 599f02aed1..746ad26447 100644
--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
@@ -126,6 +126,9 @@ export const { POST } = serve<Input>(
select: {
id: true,
plan: true,
+ webhookEnabled: true,
+ stripeConnectId: true,
+ shopifyStoreId: true,
},
});
@@ -172,8 +175,21 @@ export const { POST } = serve<Input>(
// Step 2: Auto-provision discount code if enabled
await context.run("create-discount-codes", async () => {
+ const workspace = await prisma.project.findUniqueOrThrow({
+ where: {
+ id: program.workspaceId,
+ },
+ select: {
+ id: true,
+ plan: true,
+ webhookEnabled: true,
+ stripeConnectId: true,
+ shopifyStoreId: true,
+ },
+ });
+
await generateDiscountCodeForPartner({
- workspaceId: program.workspaceId,
+ workspace,
partner: {
id: partner.id,
name: partner.name,
diff --git a/apps/web/lib/actions/partners/accept-program-invite.ts b/apps/web/lib/actions/partners/accept-program-invite.ts
index 48d54bf073..4d38f177d6 100644
--- a/apps/web/lib/actions/partners/accept-program-invite.ts
+++ b/apps/web/lib/actions/partners/accept-program-invite.ts
@@ -54,6 +54,8 @@ export const acceptProgramInviteAction = authPartnerActionClient
select: {
id: true,
webhookEnabled: true,
+ stripeConnectId: true,
+ shopifyStoreId: true,
},
});
@@ -72,7 +74,7 @@ export const acceptProgramInviteAction = authPartnerActionClient
await Promise.allSettled([
// 1. Generate discount code for partner (if enabled)
generateDiscountCodeForPartner({
- workspaceId: workspace.id,
+ workspace,
partner: enrolledPartner,
}),
// 2. Send "partner.enrolled" webhook to workspace
diff --git a/apps/web/lib/discounts/create-discount-code.ts b/apps/web/lib/discounts/create-discount-code.ts
index 6a3e2b007e..e30fda7a33 100644
--- a/apps/web/lib/discounts/create-discount-code.ts
+++ b/apps/web/lib/discounts/create-discount-code.ts
@@ -33,8 +33,16 @@ export async function createDiscountCode({
});
const linkWithCode = await prisma.link.findUnique({
- where: { id: link.id },
- select: { discountCode: { select: { code: true } } },
+ where: {
+ id: link.id,
+ },
+ select: {
+ discountCode: {
+ select: {
+ code: true,
+ },
+ },
+ },
});
if (linkWithCode?.discountCode) {
diff --git a/apps/web/lib/discounts/generate-discount-code-for-partner.ts b/apps/web/lib/discounts/generate-discount-code-for-partner.ts
index 8df75a7859..711e79f06c 100644
--- a/apps/web/lib/discounts/generate-discount-code-for-partner.ts
+++ b/apps/web/lib/discounts/generate-discount-code-for-partner.ts
@@ -1,12 +1,16 @@
import { prisma } from "@/lib/prisma";
import { EnrolledPartnerProps } from "@/lib/types";
+import { Project } from "@prisma/client";
import { createDiscountCode } from "./create-discount-code";
export async function generateDiscountCodeForPartner({
- workspaceId,
+ workspace,
partner,
}: {
- workspaceId: string;
+ workspace: Pick<
+ Project,
+ "id" | "webhookEnabled" | "stripeConnectId" | "shopifyStoreId"
+ >;
partner: Pick<EnrolledPartnerProps, "id" | "name" | "groupId">;
}) {
if (!partner.groupId) {
@@ -32,17 +36,6 @@ export async function generateDiscountCodeForPartner({
return;
}
- const workspace = await prisma.project.findUniqueOrThrow({
- where: {
- id: workspaceId,
- },
- select: {
- id: true,
- stripeConnectId: true,
- shopifyStoreId: true,
- },
- });
-
const partnerDefaultLink = await prisma.link.findFirst({
where: {
programId: group.programId,
diff --git a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
index 050f9dbb5d..4aa17ec72f 100644
--- a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
+++ b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
@@ -25,11 +25,6 @@ const customDiscount = {
provider: DiscountProvider.custom,
};
-const expectedDiscountShape = {
- id: expect.any(String),
- ...customDiscount,
-};
-
let customDiscountId: string | undefined;
let partnerGroupId: string | undefined;
@@ -186,13 +181,13 @@ test("POST /discount-codes", async ({ api }) => {
partnerId = partner.id;
expect(status).toEqual(200);
- expect(DiscountCodeSchema.parse(data)).toMatchObject({
+ expect(data).toEqual({
id: expect.any(String),
code: body.code,
+ discountId: customDiscountId,
partnerId: partner.id,
linkId: body.linkId,
disabledAt: null,
- discount: expectedDiscountShape,
});
} finally {
await deletePartner(partnerId);
diff --git a/apps/web/playwright/api/discounts/discounts.spec.ts b/apps/web/playwright/api/discounts/discounts.spec.ts
new file mode 100644
index 0000000000..502caf8ef0
--- /dev/null
+++ b/apps/web/playwright/api/discounts/discounts.spec.ts
@@ -0,0 +1,380 @@
+import { createId } from "@/lib/api/create-id";
+import { conn } from "@/lib/planetscale";
+import { prisma } from "@/lib/prisma";
+import type {
+ Customer,
+ CustomerEnriched,
+ DiscountProps,
+ EnrolledPartnerProps,
+ GroupProps,
+} from "@/lib/types";
+import { DEFAULT_ADDITIONAL_PARTNER_LINKS } from "@/lib/zod/schemas/groups";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { DiscountProvider, RewardStructure } from "@prisma/client";
+import { randomCustomer, randomName, randomPartnerEmail } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+test.describe.configure({
+ mode: "parallel",
+});
+
+const customDiscount = {
+ amount: 10,
+ type: RewardStructure.percentage,
+ maxDuration: 6,
+ provider: DiscountProvider.custom,
+};
+
+const expectedCustomDiscount = {
+ ...customDiscount,
+ couponId: null,
+ couponTestId: null,
+ description: null,
+ autoProvisionEnabledAt: null,
+};
+
+const expectedCustomerDiscount = {
+ id: expect.any(String),
+ amount: customDiscount.amount,
+ type: customDiscount.type,
+ maxDuration: customDiscount.maxDuration,
+ couponId: null,
+ couponTestId: null,
+ description: null,
+};
+
+let customDiscountId: string | undefined;
+let partnerGroupId: string | undefined;
+
+test.beforeAll(async ({ program }) => {
+ const discount = await prisma.discount.create({
+ data: {
+ id: createId({ prefix: "disc_" }),
+ programId: program.id,
+ ...customDiscount,
+ },
+ });
+
+ const group = await prisma.partnerGroup.create({
+ data: {
+ id: createId({ prefix: "grp_" }),
+ programId: program.id,
+ slug: `pw-disc-${nanoid(8).toLowerCase()}`,
+ name: "Playwright Custom Discounts",
+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+ discountId: discount.id,
+ },
+ });
+
+ await prisma.partnerGroupDefaultLink.create({
+ data: {
+ id: createId({ prefix: "pgdl_" }),
+ programId: program.id,
+ groupId: group.id,
+ domain: TEST_WORKSPACE.program.domain,
+ url: TEST_WORKSPACE.program.url,
+ },
+ });
+
+ partnerGroupId = group.id;
+ customDiscountId = discount.id;
+});
+
+test.afterAll(async () => {
+ if (partnerGroupId) {
+ const programEnrollments = await prisma.programEnrollment.findMany({
+ where: {
+ groupId: partnerGroupId,
+ },
+ select: {
+ partnerId: true,
+ },
+ });
+
+ for (const enrollment of programEnrollments) {
+ await deletePartner(enrollment.partnerId);
+ }
+
+ await prisma.partnerGroupDefaultLink.deleteMany({
+ where: {
+ groupId: partnerGroupId,
+ },
+ });
+
+ await prisma.partnerGroup.delete({
+ where: {
+ id: partnerGroupId,
+ },
+ });
+ }
+
+ if (customDiscountId) {
+ await prisma.discountCode.deleteMany({
+ where: {
+ discountId: customDiscountId,
+ },
+ });
+
+ await prisma.programEnrollment.updateMany({
+ where: {
+ discountId: customDiscountId,
+ },
+ data: {
+ discountId: null,
+ },
+ });
+
+ await prisma.discount.delete({
+ where: {
+ id: customDiscountId,
+ },
+ });
+ }
+});
+
+async function createPartner(api: ApiClient) {
+ if (!partnerGroupId) {
+ throw new Error("Custom discount group was not seeded.");
+ }
+
+ return api.post<EnrolledPartnerProps>("/api/partners", {
+ name: randomName(),
+ email: randomPartnerEmail(),
+ groupId: partnerGroupId,
+ });
+}
+
+async function deletePartner(partnerId: string | undefined) {
+ if (!partnerId) return;
+
+ await prisma.discountCode.deleteMany({
+ where: {
+ partnerId,
+ },
+ });
+
+ await prisma.link.deleteMany({
+ where: {
+ partnerId,
+ },
+ });
+
+ await prisma.programEnrollment.deleteMany({
+ where: {
+ partnerId,
+ },
+ });
+
+ await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
+}
+
+async function createCustomerWithCustomDiscount({
+ api,
+ program,
+}: {
+ api: ApiClient;
+ program: { id: string };
+}) {
+ const { data: partner } = await createPartner(api);
+ const linkId = partner.links?.[0]?.id;
+
+ if (!linkId) {
+ throw new Error("Partner was created without a default link.");
+ }
+
+ const { data: customer } = await api.post<Customer>(
+ "/api/customers",
+ randomCustomer(),
+ );
+
+ await prisma.customer.update({
+ where: {
+ id: customer.id,
+ },
+ data: {
+ linkId,
+ partnerId: partner.id,
+ programId: program.id,
+ },
+ });
+
+ return { partner, customer };
+}
+
+async function deleteCustomer(api: ApiClient, id: string | undefined) {
+ if (!id) return;
+ await api.delete(`/api/customers/${id}`);
+}
+
+test("GET /programs/{programId}/discounts – custom provider", async ({
+ api,
+ program,
+}) => {
+ const { status, data } = await api.get<DiscountProps[]>(
+ `/api/programs/${program.id}/discounts`,
+ );
+
+ expect(status).toEqual(200);
+
+ const discount = data.find((item) => item.id === customDiscountId);
+
+ expect(discount).toEqual({
+ id: customDiscountId,
+ ...expectedCustomDiscount,
+ partnersCount: expect.any(Number),
+ });
+});
+
+test("GET /groups/{id} – nested custom discount", async ({ api }) => {
+ const { status, data } = await api.get<GroupProps>(
+ `/api/groups/${partnerGroupId}`,
+ );
+
+ expect(status).toEqual(200);
+ expect(data.discount).toEqual({
+ id: customDiscountId,
+ ...expectedCustomDiscount,
+ });
+});
+
+test("GET /groups/{id} – group without discount", async ({ api, program }) => {
+ let groupId: string | undefined;
+
+ try {
+ const group = await prisma.partnerGroup.create({
+ data: {
+ id: createId({ prefix: "grp_" }),
+ programId: program.id,
+ slug: `pw-nodisc-${nanoid(8).toLowerCase()}`,
+ name: randomName("group"),
+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+ },
+ });
+ groupId = group.id;
+
+ const { status, data } = await api.get<GroupProps>(
+ `/api/groups/${groupId}`,
+ );
+
+ expect(status).toEqual(200);
+ expect(data.discount).toBeNull();
+ } finally {
+ if (groupId) {
+ await prisma.partnerGroup.delete({
+ where: {
+ id: groupId,
+ },
+ });
+ }
+ }
+});
+
+test("GET /partners/{id} – custom discount", async ({ api }) => {
+ let partnerId: string | undefined;
+
+ try {
+ const { data: partner } = await createPartner(api);
+ partnerId = partner.id;
+
+ const { status, data } = await api.get<
+ EnrolledPartnerProps & {
+ discount: Pick<DiscountProps, "id" | "provider"> | null;
+ }
+ >(`/api/partners/${partnerId}`);
+
+ expect(status).toEqual(200);
+ expect(data.discount).toEqual({
+ id: customDiscountId,
+ provider: DiscountProvider.custom,
+ });
+ } finally {
+ await deletePartner(partnerId);
+ }
+});
+
+test("GET /customers/{id} – custom discount", async ({ api, program }) => {
+ let partnerId: string | undefined;
+ let customerId: string | undefined;
+
+ try {
+ const { partner, customer } = await createCustomerWithCustomDiscount({
+ api,
+ program,
+ });
+ partnerId = partner.id;
+ customerId = customer.id;
+
+ const { status, data } = await api.get<CustomerEnriched>(
+ `/api/customers/${customerId}?includeExpandedFields=true`,
+ );
+
+ expect(status).toEqual(200);
+ expect(data.discount).toMatchObject({
+ ...expectedCustomerDiscount,
+ id: customDiscountId,
+ });
+ expect(data.discount).not.toHaveProperty("provider");
+ } finally {
+ await deleteCustomer(api, customerId);
+ await deletePartner(partnerId);
+ }
+});
+
+test("GET /customers?email= – custom discount", async ({ api, program }) => {
+ let partnerId: string | undefined;
+ let customerId: string | undefined;
+
+ try {
+ const { partner, customer } = await createCustomerWithCustomDiscount({
+ api,
+ program,
+ });
+ partnerId = partner.id;
+ customerId = customer.id;
+
+ const { status, data: customers } = await api.get<CustomerEnriched[]>(
+ `/api/customers?email=${encodeURIComponent(customer.email!)}&includeExpandedFields=true`,
+ );
+
+ expect(status).toEqual(200);
+ expect(customers[0].discount).toMatchObject({
+ ...expectedCustomerDiscount,
+ id: customDiscountId,
+ });
+ } finally {
+ await deleteCustomer(api, customerId);
+ await deletePartner(partnerId);
+ }
+});
+
+test("GET /customers?externalId= – custom discount", async ({
+ api,
+ program,
+}) => {
+ let partnerId: string | undefined;
+ let customerId: string | undefined;
+
+ try {
+ const { partner, customer } = await createCustomerWithCustomDiscount({
+ api,
+ program,
+ });
+ partnerId = partner.id;
+ customerId = customer.id;
+
+ const { status, data: customers } = await api.get<CustomerEnriched[]>(
+ `/api/customers?externalId=${encodeURIComponent(customer.externalId!)}&includeExpandedFields=true`,
+ );
+
+ expect(status).toEqual(200);
+ expect(customers[0].discount).toMatchObject({
+ ...expectedCustomerDiscount,
+ id: customDiscountId,
+ });
+ } finally {
+ await deleteCustomer(api, customerId);
+ await deletePartner(partnerId);
+ }
+});
diff --git a/apps/web/ui/modals/delete-discount-code-modal.tsx b/apps/web/ui/modals/delete-discount-code-modal.tsx
index 0406cb0605..2b452cac97 100644
--- a/apps/web/ui/modals/delete-discount-code-modal.tsx
+++ b/apps/web/ui/modals/delete-discount-code-modal.tsx
@@ -3,7 +3,7 @@ import { useApiMutation } from "@/lib/swr/use-api-mutation";
import { DiscountCodeProps } from "@/lib/types";
import { Button, Modal, useMediaQuery } from "@dub/ui";
import { Tag } from "@dub/ui/icons";
-import { FormEvent } from "react";
+import { FormEvent, useState } from "react";
import { toast } from "sonner";
interface DeleteDiscountCodeModalProps {
@@ -12,6 +12,8 @@ interface DeleteDiscountCodeModalProps {
setShowModal: (showModal: boolean) => void;
}
+const DELETE_DISCOUNT_CODE_CONFIRMATION = "delete discount code";
+
export const DeleteDiscountCodeModal = ({
discountCode,
showModal,
@@ -19,6 +21,7 @@ export const DeleteDiscountCodeModal = ({
}: DeleteDiscountCodeModalProps) => {
const { isMobile } = useMediaQuery();
const { makeRequest: deleteDiscountCode, isSubmitting } = useApiMutation();
+ const [inputValue, setInputValue] = useState("");
const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
@@ -62,7 +65,10 @@ export const DeleteDiscountCodeModal = ({
<div className="flex items-center gap-2">
<p className="text-content-emphasis block text-sm font-medium">
To verify, type{" "}
- <span className="font-semibold">delete code</span> below
+ <span className="font-semibold">
+ {DELETE_DISCOUNT_CODE_CONFIRMATION}
+ </span>{" "}
+ below
</p>
</div>
@@ -75,7 +81,9 @@ export const DeleteDiscountCodeModal = ({
className="block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
aria-invalid="true"
autoFocus={!isMobile}
- pattern="delete code"
+ pattern={DELETE_DISCOUNT_CODE_CONFIRMATION}
+ value={inputValue}
+ onChange={(e) => setInputValue(e.target.value)}
/>
</div>
</div>
@@ -96,6 +104,7 @@ export const DeleteDiscountCodeModal = ({
text="Delete discount code"
variant="danger"
loading={isSubmitting}
+ disabled={inputValue !== DELETE_DISCOUNT_CODE_CONFIRMATION}
className="h-9 w-fit"
/>
</div>