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.

code improvements

Pedro Ladeirae91716581d71
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
index f2aa969006..75f49ce5d9 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
@@ -9,7 +9,7 @@ import { prisma } from "@/lib/prisma";
import { NewLinkProps } from "@/lib/types";
import {
PartnerProfileLinkSchema,
- createPartnerProfileLinkSchema,
+ updatePartnerProfileLinkSchema,
} from "@/lib/zod/schemas/partner-profile";
import { getPrettyUrl, toCentsNumber } from "@dub/utils";
import { NextResponse } from "next/server";
@@ -18,7 +18,7 @@ import { NextResponse } from "next/server";
export const PATCH = withPartnerProfile(
async ({ partner, params, req, session }) => {
const { url, key, partnerLinkTitle, partnerLinkComments } =
- createPartnerProfileLinkSchema.parse(await parseRequestBody(req));
+ updatePartnerProfileLinkSchema.parse(await parseRequestBody(req));
const { programId, linkId } = params;
@@ -69,7 +69,9 @@ export const PATCH = withPartnerProfile(
});
}
- const linkUrlChanged = getPrettyUrl(link.url) !== getPrettyUrl(url);
+ const nextUrl = url ?? link.url;
+ const nextKey = key ?? link.key;
+ const linkUrlChanged = getPrettyUrl(link.url) !== getPrettyUrl(nextUrl);
if (linkUrlChanged) {
if (link.partnerGroupDefaultLinkId) {
@@ -79,7 +81,7 @@ export const PATCH = withPartnerProfile(
"You cannot update the destination URL of your default link.",
});
} else {
- validatePartnerLinkUrl({ group, url });
+ validatePartnerLinkUrl({ group, url: nextUrl });
}
}
@@ -93,7 +95,7 @@ export const PATCH = withPartnerProfile(
: null;
// if domain and key are the same, we don't need to check if the key exists
- const skipKeyChecks = link.key.toLowerCase() === key?.toLowerCase();
+ const skipKeyChecks = link.key.toLowerCase() === nextKey.toLowerCase();
const {
link: processedLink,
@@ -119,11 +121,16 @@ export const PATCH = withPartnerProfile(
? link.testStartedAt.toISOString()
: link.testStartedAt,
- // merge in new props
- key: key || undefined,
- url: url || program.url,
- partnerLinkTitle,
- partnerLinkComments,
+ key: nextKey,
+ url: nextUrl,
+ partnerLinkTitle:
+ partnerLinkTitle !== undefined
+ ? partnerLinkTitle
+ : link.partnerLinkTitle,
+ partnerLinkComments:
+ partnerLinkComments !== undefined
+ ? partnerLinkComments
+ : link.partnerLinkComments,
},
workspace: {
id: program.workspaceId,
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index be9e858e13..ac4f6ead3f 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -109,6 +109,9 @@ export const createPartnerProfileLinkSchema = z.object({
.describe("The partner's private comments for the short link."),
});
+export const updatePartnerProfileLinkSchema =
+ createPartnerProfileLinkSchema.partial();
+
export const PartnerProfileLinkSchema = LinkSchema.pick({
id: true,
domain: true,
diff --git a/apps/web/scripts/misc/restore-program-enrollments.ts b/apps/web/scripts/misc/restore-program-enrollments.ts
index f305981615..034064022c 100644
--- a/apps/web/scripts/misc/restore-program-enrollments.ts
+++ b/apps/web/scripts/misc/restore-program-enrollments.ts
@@ -27,6 +27,7 @@ import { includeProgramEnrollment } from "@/lib/api/links/include-program-enroll
import { includeTags } from "@/lib/api/links/include-tags";
// import { prisma, prismaOld } from "@/lib/prisma";
import { prisma, prisma as prismaOld } from "@/lib/prisma";
+import { Prisma } from "@prisma/client";
import "dotenv-flow/config";
import { stripeAppClient } from "../../lib/stripe";
import { recordLink } from "../../lib/tinybird";
@@ -42,7 +43,13 @@ async function main() {
});
const res = await prisma.programEnrollment.createMany({
- data: programEnrollmentsToRestore,
+ data: programEnrollmentsToRestore.map(
+ ({ partnerPreferences, ...enrollment }) => ({
+ ...enrollment,
+ partnerPreferences:
+ partnerPreferences === null ? Prisma.DbNull : partnerPreferences,
+ }),
+ ),
});
console.log(`Restored ${res.count} program enrollments`);