The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Fix: Adding Comments to Partner Network Partners throws UI toast error + minor DRY refactor
David Clarke46fa4154b7a
diff --git a/apps/web/app/(ee)/api/messages/route.ts b/apps/web/app/(ee)/api/messages/route.tsindex 179cac421e..e7729a0d2e 100644--- a/apps/web/app/(ee)/api/messages/route.ts+++ b/apps/web/app/(ee)/api/messages/route.ts@@ -1,3 +1,4 @@+import { partnerReachableByProgramWhereInput } from "@/lib/api/partners/partner-reachable-by-program-where-input";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { withWorkspace } from "@/lib/auth";import {@@ -26,11 +27,7 @@ export const GET = withWorkspace(? {id: partnerId,// Partner is either approved or trusted in the partner network, enrolled in the program, or already has a message with the program- OR: [- { networkStatus: { in: ["approved", "trusted"] } },- { programs: { some: { programId } } },- { messages: { some: { programId } } },- ],+ ...partnerReachableByProgramWhereInput(programId),}: {// Partner has messages with the programdiff --git a/apps/web/lib/actions/partners/create-partner-comment.ts b/apps/web/lib/actions/partners/create-partner-comment.tsindex cf8ae5079c..c3ee9c932b 100644--- a/apps/web/lib/actions/partners/create-partner-comment.ts+++ b/apps/web/lib/actions/partners/create-partner-comment.ts@@ -1,7 +1,8 @@"use server";+import { DubApiError } from "@/lib/api/errors";+import { partnerReachableByProgramWhereInput } from "@/lib/api/partners/partner-reachable-by-program-where-input";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { prisma } from "@dub/prisma";import {PartnerCommentSchema,@@ -24,12 +25,24 @@ export const createPartnerCommentAction = authActionClientconst programId = getDefaultProgramIdOrThrow(workspace);- await getProgramEnrollmentOrThrow({- partnerId,- programId,- include: {},+ // Allow commenting on partners that are enrolled in the program OR+ // discoverable via the partner network, so the team can discuss a partner+ // (e.g. whether to invite them) before they're enrolled.+ const partner = await prisma.partner.findFirst({+ where: {+ id: partnerId,+ ...partnerReachableByProgramWhereInput(programId),+ },+ select: { id: true },});+ if (!partner) {+ throw new DubApiError({+ code: "not_found",+ message: "Partner not found.",+ });+ }+const comment = await prisma.partnerComment.create({data: {programId,diff --git a/apps/web/lib/actions/partners/message-partner.ts b/apps/web/lib/actions/partners/message-partner.tsindex 723d05a458..8ccce4b858 100644--- a/apps/web/lib/actions/partners/message-partner.ts+++ b/apps/web/lib/actions/partners/message-partner.ts@@ -3,6 +3,7 @@import { createId } from "@/lib/api/create-id";import { DubApiError } from "@/lib/api/errors";import { getNetworkInvitesUsage } from "@/lib/api/partners/get-network-invites-usage";+import { partnerReachableByProgramWhereInput } from "@/lib/api/partners/partner-reachable-by-program-where-input";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { qstash } from "@/lib/cron";import { getPlanCapabilities } from "@/lib/plan-capabilities";@@ -46,27 +47,7 @@ export const messagePartnerAction = authActionClientconst { _count, programs } = await prisma.partner.findFirstOrThrow({where: {id: partnerId,- OR: [- {- networkStatus: {- in: ["approved", "trusted"],- },- },- {- programs: {- some: {- programId,- },- },- },- {- messages: {- some: {- programId,- },- },- },- ],+ ...partnerReachableByProgramWhereInput(programId),},include: {_count: {diff --git a/apps/web/lib/api/partners/partner-reachable-by-program-where-input.ts b/apps/web/lib/api/partners/partner-reachable-by-program-where-input.tsnew file mode 100644index 0000000000..6783e499d5--- /dev/null+++ b/apps/web/lib/api/partners/partner-reachable-by-program-where-input.ts@@ -0,0 +1,17 @@+import { Prisma } from "@dub/prisma/client";++/**+ * Prisma `where` input for partners reachable by a program: approved/trusted+ * in the partner network, enrolled in the program, or already has a message+ * thread with the program. Spread into a `prisma.partner` query alongside an+ * `id` filter; callers are still responsible for action-specific authorization.+ */+export const partnerReachableByProgramWhereInput = (+ programId: string,+): Prisma.PartnerWhereInput => ({+ OR: [+ { networkStatus: { in: ["approved", "trusted"] } },+ { programs: { some: { programId } } },+ { messages: { some: { programId } } },+ ],+});