The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
return current tags from the create partner response
Kiran Kd90d279e827e
diff --git a/apps/web/lib/api/partners/create-and-enroll-partner.ts b/apps/web/lib/api/partners/create-and-enroll-partner.tsindex e87bec078c..d914398d77 100644--- a/apps/web/lib/api/partners/create-and-enroll-partner.ts+++ b/apps/web/lib/api/partners/create-and-enroll-partner.ts@@ -14,7 +14,11 @@ import { waitUntil } from "@vercel/functions";import { DubApiError } from "../errors";import { getGroupOrThrow } from "../groups/get-group-or-throw";import { throwIfInvalidPartnerTags } from "../partner-tags/throw-if-invalid-partner-tags";-import { createOrGetProgramEnrollment } from "./create-or-get-program-enrollment";+import {+ createOrGetProgramEnrollment,+ partnerTagsFromEnrollment,+ programPartnerTagsInclude,+} from "./create-or-get-program-enrollment";import { createPartnerDefaultLinks } from "./create-partner-default-links";import { getOrCreatePartner } from "./get-or-create-partner";import { queuePartnerSearchSync } from "./queue-partner-search-sync";@@ -68,6 +72,7 @@ export const createAndEnrollPartner = async ({},},links: true,+ programPartnerTags: programPartnerTagsInclude(program.id),},});@@ -84,6 +89,7 @@ export const createAndEnrollPartner = async ({...programEnrollment,id: programEnrollment.partner.id,links: programEnrollment.links,+ tags: partnerTagsFromEnrollment(programEnrollment.programPartnerTags),...polyfillSocialMediaFields(programEnrollment.partner.platforms),});// else, if the passed tenantId is different from the existing enrollment...@@ -108,6 +114,7 @@ export const createAndEnrollPartner = async ({},},links: true,+ programPartnerTags: programPartnerTagsInclude(program.id),},});@@ -116,6 +123,9 @@ export const createAndEnrollPartner = async ({...updatedProgramEnrollment,id: updatedProgramEnrollment.partner.id,links: updatedProgramEnrollment.links,+ tags: partnerTagsFromEnrollment(+ updatedProgramEnrollment.programPartnerTags,+ ),...polyfillSocialMediaFields(updatedProgramEnrollment.partner.platforms,),@@ -187,6 +197,7 @@ export const createAndEnrollPartner = async ({...programEnrollment,id: programEnrollment.partner.id,links: programEnrollment.links,+ tags: partnerTagsFromEnrollment(programEnrollment.programPartnerTags),...polyfillSocialMediaFields(programEnrollment.partner.platforms),});}@@ -202,6 +213,9 @@ export const createAndEnrollPartner = async ({});}+ // Queue an index update because a new enrollment was created.+ waitUntil(queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }));+// Create the partner links based on group defaultsconst links = await createPartnerDefaultLinks({workspace: {@@ -232,17 +246,12 @@ export const createAndEnrollPartner = async ({...programEnrollment,id: programEnrollment.partner.id,links,- ...(partnerTags.length > 0 && { tags: partnerTags }),+ tags: partnerTags,...polyfillSocialMediaFields(programEnrollment.partner.platforms),});waitUntil(Promise.allSettled([- // Queue an index update because a new enrollment was created.- queuePartnerSearchSync({- enrollmentIds: [programEnrollment.id],- }),-// Status is always "invited" or "approved" here — no caller passes "pending"prisma.project.update({where: {diff --git a/apps/web/lib/api/partners/create-or-get-program-enrollment.ts b/apps/web/lib/api/partners/create-or-get-program-enrollment.tsindex c2b2b2c295..8620c4c9d4 100644--- a/apps/web/lib/api/partners/create-or-get-program-enrollment.ts+++ b/apps/web/lib/api/partners/create-or-get-program-enrollment.ts@@ -3,6 +3,37 @@ import { prisma } from "@/lib/prisma";import { Prisma, ProgramEnrollment } from "@prisma/client";import { DubApiError } from "../errors";+export function programPartnerTagsInclude(programId: string) {+ return {+ // Deleted tags have a null programId until background cleanup removes their associations.+ where: {+ partnerTag: {+ programId,+ },+ },+ include: {+ partnerTag: {+ select: {+ id: true,+ name: true,+ },+ },+ },+ } satisfies Prisma.ProgramEnrollmentInclude["programPartnerTags"];+}++type EnrollmentProgramPartnerTags = Prisma.ProgramEnrollmentGetPayload<{+ include: {+ programPartnerTags: ReturnType<typeof programPartnerTagsInclude>;+ };+}>["programPartnerTags"];++export function partnerTagsFromEnrollment(+ programPartnerTags: EnrollmentProgramPartnerTags,+) {+ return programPartnerTags.map(({ partnerTag }) => partnerTag);+}+// Attempts to create a program enrollment.// If another request creates it concurrently, returns the existing enrollment.export async function createOrGetProgramEnrollment({@@ -91,6 +122,7 @@ export async function createOrGetProgramEnrollment({platforms: true,},},+ programPartnerTags: programPartnerTagsInclude(programId),},});diff --git a/apps/web/playwright/api/partners/partners.spec.ts b/apps/web/playwright/api/partners/partners.spec.tsindex 67fc71505f..46098ec09f 100644--- a/apps/web/playwright/api/partners/partners.spec.ts+++ b/apps/web/playwright/api/partners/partners.spec.ts@@ -371,3 +371,52 @@ test("POST /partners – with tagNames", async ({ api, program }) => {await deletePartnerTag(partnerTagId);}});++test("POST /partners – existing enrollment returns current tags", async ({+ api,+ program,+}) => {+ let partnerId: string | undefined;+ let assignedTagId: string | undefined;+ let otherTagId: string | undefined;++ try {+ const assignedTag = await createPartnerTag(program.id);+ const otherTag = await createPartnerTag(program.id);+ assignedTagId = assignedTag.id;+ otherTagId = otherTag.id;+ const email = randomPartnerEmail();++ const { status: firstStatus, data: firstData } = await createPartner(api, {+ email,+ tagNames: [assignedTag.name],+ });+ partnerId = firstData.id;++ expect(firstStatus).toEqual(201);++ const { status, data } = await createPartner(api, {+ email,+ tagNames: [otherTag.name],+ });++ expect(status).toEqual(201);+ const parsed = EnrolledPartnerSchema.parse(data);+ expect(parsed.id).toEqual(partnerId);+ expect(parsed.tags).toEqual([+ {+ id: assignedTag.id,+ name: assignedTag.name,+ },+ ]);+ } finally {+ if (partnerId) {+ await prisma.programPartnerTag.deleteMany({+ where: { partnerId },+ });+ }+ await deletePartner(partnerId);+ await deletePartnerTag(assignedTagId);+ await deletePartnerTag(otherTagId);+ }+});