The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Soft-delete group discounts on delete and fix detach remapping.
Kiran K7dcb0047a6fe
diff --git a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts b/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.tsindex 84fecfd483..d1c034b996 100644--- a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts+++ b/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts@@ -9,9 +9,9 @@ export const dynamic = "force-dynamic";const STALE_AFTER_MINUTES = 30;-// Safety net for leftover rows after request-path updates:-// - Rewards: rewards/process normally hard-deletes once enrollments are cleared,-// but a newer reward change can skip stale jobs (e.g. delete then create).+// Hard-deletes leftover rows after request-path soft-deletes / unassigns:+// - Rewards: rewards/process clears enrollments on delete; this cron hard-deletes+// once nothing still references the soft-deleted reward (programId null).// - LinkReward: update-partner-link nulls override IDs instead of deleting the row.// Discount deletes SetNull LinkReward.discountId the same way.diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.tsindex 28541b2c3c..81300bccd0 100644--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts@@ -1,4 +1,3 @@-import { DubApiError } from "@/lib/api/errors";import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";import { movePartnersToGroup } from "@/lib/api/groups/move-partners-to-group";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";@@ -23,19 +22,10 @@ export const POST = withWorkspace(includeExpandedFields: true,});- let { partnerIds, groupMoveDisabledAt } = addPartnersToGroupSchema.parse(+ const { partnerIds, groupMoveDisabledAt } = addPartnersToGroupSchema.parse(await parseRequestBody(req),);- partnerIds = [...new Set(partnerIds)];-- if (partnerIds.length === 0) {- throw new DubApiError({- code: "bad_request",- message: "At least one partner ID is required.",- });- }-const count = await movePartnersToGroup({workspaceId: workspace.id,programId,diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsxindex f104bb8fd2..15b25d27bc 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx@@ -89,16 +89,17 @@ export function GroupsTable() {error: countError,} = useGroupsCount();- const { partnersCount: partnersCountByGroup } = usePartnersCount<- | {- groupId: string;- _count: number;- }[]- | undefined- >({- groupBy: "groupId",- ignoreParams: true,- });+ const { partnersCount: partnersCountByGroup, loading: partnersCountLoading } =+ usePartnersCount<+ | {+ groupId: string;+ _count: number;+ }[]+ | undefined+ >({+ groupBy: "groupId",+ ignoreParams: true,+ });const partnersCountByGroupId = useMemo(() => {const map = new Map<string, number>();@@ -190,6 +191,7 @@ export function GroupsTable() {row={row}currentDefaultGroup={currentDefaultGroup}partnersCount={partnersCountByGroupId.get(row.original.id) ?? 0}+ partnersCountLoading={partnersCountLoading}/>),},@@ -273,10 +275,12 @@ function RowMenuButton({row,currentDefaultGroup,partnersCount,+ partnersCountLoading,}: {row: Row<GroupExtendedProps>;currentDefaultGroup: GroupExtendedProps | undefined;partnersCount: number;+ partnersCountLoading: boolean;}) {const router = useRouter();const { slug } = useParams();@@ -297,14 +301,13 @@ function RowMenuButton({role,});- const partnersTooltip =- partnersCount > 0- ? "Move all partners to another group before deleting."- : undefined;-const deleteGroupDisabledReason = permissionsError? String(permissionsError)- : partnersTooltip;+ : partnersCountLoading+ ? true+ : partnersCount > 0+ ? "Move all partners to another group before deleting."+ : undefined;return (<>@@ -434,7 +437,9 @@ function MenuItem({return (<DynamicTooltipWrappertooltipProps={- disabledTooltip ? { content: disabledTooltip, side: "left" } : undefined+ typeof disabledTooltip === "string"+ ? { content: disabledTooltip, side: "left" }+ : undefined}><div>diff --git a/apps/web/lib/api/groups/delete-group.ts b/apps/web/lib/api/groups/delete-group.tsindex 29699d1d93..f6b2594071 100644--- a/apps/web/lib/api/groups/delete-group.ts+++ b/apps/web/lib/api/groups/delete-group.ts@@ -1,3 +1,4 @@+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";import { prisma } from "@/lib/prisma";import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";import { PartnerGroup } from "@prisma/client";@@ -47,6 +48,15 @@ export async function deletePartnerGroup(});}+ const discounts = await prisma.discount.findMany({+ where: {+ groupId: group.id,+ },+ select: {+ id: true,+ },+ });+await prisma.$transaction([// Soft delete rewardsprisma.reward.updateMany({@@ -59,11 +69,14 @@ export async function deletePartnerGroup(},}),- // Delete discounts- prisma.discount.deleteMany({+ // Soft delete discounts (detach workflow hard-deletes after remapping)+ prisma.discount.updateMany({where: {groupId: group.id,},+ data: {+ programId: null,+ },}),// Delete group move workflow@@ -86,9 +99,32 @@ export async function deletePartnerGroup(]);waitUntil(- removeGroupIdFromMoveRules({- programId: group.programId,- groupId: group.id,- }),+ Promise.allSettled([+ removeGroupIdFromMoveRules({+ programId: group.programId,+ groupId: group.id,+ }),++ // An empty group (no enrollments with this `groupId`)+ // can still own discount rows referenced by codes/enrollments/LinkReward+ // for partners who already moved if remaps are in-flight+ ...(discounts.length > 0+ ? [+ dispatchWorkflows(+ discounts.map((discount) => ({+ name: "detach-discount-workflow" as const,+ payload: {+ programId: group.programId,+ discountId: discount.id,+ },+ options: {+ label: discount.id,+ deduplicationId: `detach-discount-${discount.id}`,+ },+ })),+ ),+ ]+ : []),+ ]),);}diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.tsindex 8b9ba026ef..860058af7f 100644--- a/apps/web/lib/api/groups/move-partners-to-group.ts+++ b/apps/web/lib/api/groups/move-partners-to-group.ts@@ -2,7 +2,7 @@ import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-dimport { qstash } from "@/lib/cron";import { prisma } from "@/lib/prisma";import { recordLink } from "@/lib/tinybird";-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";import { PartnerGroup, WorkspaceRole } from "@prisma/client";import { waitUntil } from "@vercel/functions";import { buildProgramEnrollmentChangeSet } from "../activity-log/build-program-enrollment-change-set";@@ -10,6 +10,7 @@ import {trackActivityLog,TrackActivityLogInput,} from "../activity-log/track-activity-log";+import { DubApiError } from "../errors";import { getWorkspaceUsers } from "../get-workspace-users";import { includeProgramEnrollment } from "../links/include-program-enrollment";import { includeTags } from "../links/include-tags";@@ -32,7 +33,6 @@ interface MovePartnersToGroupParams {| "customRewardId"| "discountId">;- isGroupDeleted?: boolean;groupMoveDisabledAt?: Date | null;}@@ -42,11 +42,15 @@ export async function movePartnersToGroup({partnerIds,userId,group,- isGroupDeleted = false,groupMoveDisabledAt,}: MovePartnersToGroupParams): Promise<number> {+ partnerIds = [...new Set(partnerIds)];+if (partnerIds.length === 0) {- return 0;+ throw new DubApiError({+ code: "bad_request",+ message: "At least one partner ID is required.",+ });}const programEnrollments = await prisma.programEnrollment.findMany({@@ -73,7 +77,7 @@ export async function movePartnersToGroup({return 0;}- partnerIds = programEnrollments.map(({ partnerId }) => partnerId);+ partnerIds = pluck(programEnrollments, "partnerId");const { count } = await prisma.programEnrollment.updateMany({where: {@@ -81,6 +85,9 @@ export async function movePartnersToGroup({in: partnerIds,},programId,+ groupId: {+ not: group.id,+ },},data: {groupId: group.id,@@ -99,7 +106,12 @@ export async function movePartnersToGroup({}// Queue an index update because the enrollments moved group (filterable field)- waitUntil(queuePartnerSearchSync({ partnerIds, programId }));+ waitUntil(+ queuePartnerSearchSync({+ partnerIds,+ programId,+ }),+ );waitUntil((async () => {@@ -184,7 +196,6 @@ export async function movePartnersToGroup({.filter(({ status }) => status !== "pending").map(({ partnerId }) => partnerId),userId: workspaceUserId,- isGroupDeleted,},}),diff --git a/apps/web/lib/discounts/detach-discount.ts b/apps/web/lib/discounts/detach-discount.tsindex 91aef7a5c8..85c3c61686 100644--- a/apps/web/lib/discounts/detach-discount.ts+++ b/apps/web/lib/discounts/detach-discount.ts@@ -23,9 +23,10 @@ export async function detachDiscountFromProgramEnrollments({id: discountId,},select: {- defaultForPartnerGroup: {+ id: true,+ partnerGroup: {select: {- id: true,+ discountId: true,},},},@@ -36,7 +37,11 @@ export async function detachDiscountFromProgramEnrollments({return;}- const groupDiscountId = discount.defaultForPartnerGroup?.id ?? null;+ // Restore enrollments to the owning group's current default, or clear them+ // if this discount was the group default+ const groupDiscountId = discount.partnerGroup?.discountId ?? null;+ const restoredDiscountId =+ groupDiscountId !== discount.id ? groupDiscountId : null;while (true) {const where: Prisma.ProgramEnrollmentWhereInput = {@@ -74,7 +79,7 @@ export async function detachDiscountFromProgramEnrollments({discountId,},data: {- discountId: groupDiscountId,+ discountId: restoredDiscountId,},});diff --git a/apps/web/lib/rewards/delete-orphaned-rewards.ts b/apps/web/lib/rewards/delete-orphaned-rewards.tsindex 0b40740906..2ebe54455d 100644--- a/apps/web/lib/rewards/delete-orphaned-rewards.ts+++ b/apps/web/lib/rewards/delete-orphaned-rewards.ts@@ -18,7 +18,7 @@ export async function deleteOrphanedRewards(cutoff: Date) {},},orderBy: {- updatedAt: "asc",+ updatedAt: "desc",},take: 50,});