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.

address CR feedback

Steven Tey7c2fb6cca8f4
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 3ac7c8e794..81c3218afc 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -1082,7 +1082,7 @@ const partnerMergedAccountSchema = z.object({
export const partnerMergedWebhookSchema = z.object({
sourcePartner: partnerMergedAccountSchema.describe(
- "The source partner account that was merged away. Its enrollment in this program no longer exists; use `target.id` instead.",
+ "The source partner account that was merged away. Its enrollment in this program no longer exists; use `targetPartner.id` instead.",
),
targetPartner: partnerMergedAccountSchema.describe(
"The target partner account that the source account was merged into.",
diff --git a/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts
index cc4ffa0e2c..7b9812a9b9 100644
--- a/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts
+++ b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts
@@ -64,18 +64,21 @@ describe.sequential("Workflow - MergePartnerAccounts", async () => {
"Overlap merge upgrades target status from pending to approved",
{ timeout: VITEST_TEST_TIMEOUT_MS },
async () => {
- const source = await createEnrolledPartner("upgrade-source");
- const target = await createEnrolledPartner("upgrade-target");
+ const sourcePartner = await createEnrolledPartner("upgrade-source");
+ const targetPartner = await createEnrolledPartner("upgrade-target");
const { status: pendingStatus } = await http.post({
path: "/e2e/partners/pending-program-application",
- body: { partnerId: target.id },
+ body: { partnerId: targetPartner.id },
});
expect(pendingStatus).toEqual(200);
const { status: triggerStatus } = await http.post({
path: "/e2e/trigger-merge-accounts",
- body: { sourceEmail: source.email, targetEmail: target.email },
+ body: {
+ sourceEmail: sourcePartner.email,
+ targetEmail: targetPartner.email,
+ },
});
expect(triggerStatus).toEqual(200);
@@ -84,8 +87,10 @@ describe.sequential("Workflow - MergePartnerAccounts", async () => {
while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
const [sourceRes, targetRes] = await Promise.all([
- http.get({ path: `/partners/${source.id}` }),
- http.get<EnrolledPartnerProps>({ path: `/partners/${target.id}` }),
+ http.get({ path: `/partners/${sourcePartner.id}` }),
+ http.get<EnrolledPartnerProps>({
+ path: `/partners/${targetPartner.id}`,
+ }),
]);
lastTargetStatus =