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.

Only fall back on email unique conflicts when creating partners

Kiran Kaa015155c43d
diff --git a/apps/web/lib/api/partners/create-and-enroll-partner.ts b/apps/web/lib/api/partners/create-and-enroll-partner.ts
index d1b9c6340c..377cfd1558 100644
--- a/apps/web/lib/api/partners/create-and-enroll-partner.ts
+++ b/apps/web/lib/api/partners/create-and-enroll-partner.ts
@@ -137,25 +137,23 @@ export const createAndEnrollPartner = async ({
});
}
- const [group, { partner: existingOrNewPartner }] = await Promise.all([
- getGroupOrThrow({
- programId: program.id,
- groupId: finalGroupId,
- includeExpandedFields: true,
- }),
+ const group = await getGroupOrThrow({
+ programId: program.id,
+ groupId: finalGroupId,
+ includeExpandedFields: true,
+ });
- getOrCreatePartner({
+ const { partner: existingOrNewPartner } = await getOrCreatePartner({
+ email: partner.email,
+ create: {
+ id: createId({ prefix: "pn_" }),
+ name: partner.name || partner.email,
email: partner.email,
- create: {
- id: createId({ prefix: "pn_" }),
- name: partner.name || partner.email,
- email: partner.email,
- image: partner.image && !isStored(partner.image) ? null : partner.image,
- country: partner.country,
- description: partner.description,
- },
- }),
- ]);
+ image: partner.image && !isStored(partner.image) ? null : partner.image,
+ country: partner.country,
+ description: partner.description,
+ },
+ });
const { programEnrollment, created } = await createOrGetProgramEnrollment({
partnerId: existingOrNewPartner.id,
diff --git a/apps/web/lib/api/partners/get-or-create-partner.ts b/apps/web/lib/api/partners/get-or-create-partner.ts
index 7454dd11e6..89f0952667 100644
--- a/apps/web/lib/api/partners/get-or-create-partner.ts
+++ b/apps/web/lib/api/partners/get-or-create-partner.ts
@@ -30,6 +30,10 @@ export async function getOrCreatePartner({
name: typeof create.name === "string" ? create.name : null,
});
+ if (!username) {
+ throw new Error("Failed to generate a unique partner username.");
+ }
+
const partner = await prisma.partner.create({
data: {
...create,
@@ -46,11 +50,18 @@ export async function getOrCreatePartner({
error instanceof Prisma.PrismaClientKnownRequestError &&
error.code === "P2002"
) {
+ const target = error.meta?.target as string | undefined;
+
console.info(
"[getOrCreatePartner] Unique constraint conflict (P2002), falling back to find",
- { target: error.meta?.target },
+ { target },
);
+ // Only fall back to "find by email" when the conflict was actually on email, not username
+ if (!target || !target.includes("email")) {
+ throw error;
+ }
+
const partner = await prisma.partner.findUniqueOrThrow({
where: {
email,