dubinc · steven-tey · Nov 8, 2025 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025
diff --git a/apps/web/app/(ee)/api/admin/delete-partner-account/route.ts b/apps/web/app/(ee)/api/admin/delete-partner-account/route.ts
@@ -18,6 +18,7 @@ export const POST = withAdmin(async ({ req }) => {
         select: {
           program: true,
           links: true,
+          groupId: true,
         },
       },
     },
@@ -32,7 +33,7 @@ export const POST = withAdmin(async ({ req }) => {
       "Partner has no commissions yet, deleting program links and customers...",
     );
     if (partner.programs.length > 0) {
-      for (const { program, links } of partner.programs) {
+      for (const { program, links, groupId } of partner.programs) {
         if (links.length > 0) {
           await Promise.allSettled([
             prisma.link.deleteMany({
@@ -42,7 +43,13 @@ export const POST = withAdmin(async ({ req }) => {
                 },
               },
             }),
-            recordLink(links, { deleted: true }),
+            recordLink(
+              links.map((link) => ({
+                ...link,
+                programEnrollment: { groupId },
+              })),
+              { deleted: true },
+            ),
             prisma.customer.deleteMany({
               where: {
                 linkId: {

diff --git a/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts b/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts
@@ -1,6 +1,8 @@
 import { markDomainAsDeleted } from "@/lib/api/domains/mark-domain-deleted";
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { bulkDeletePartners } from "@/lib/api/partners/bulk-delete-partners";
 import { verifyVercelSignature } from "@/lib/cron/verify-vercel";
 import { prisma } from "@dub/prisma";
@@ -33,11 +35,8 @@ export async function GET(req: Request) {
           },
         },
         include: {
-          tags: {
-            select: {
-              tag: true,
-            },
-          },
+          ...includeTags,
+          ...includeProgramEnrollment,
         },
         take: 100,
       }),

diff --git a/apps/web/app/(ee)/api/cron/domains/delete/route.ts b/apps/web/app/(ee)/api/cron/domains/delete/route.ts
@@ -1,6 +1,8 @@
 import { queueDomainDeletion } from "@/lib/api/domains/queue-domain-update";
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { limiter } from "@/lib/cron/limiter";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { storage } from "@/lib/storage";
@@ -38,11 +40,8 @@ export async function POST(req: Request) {
         domain,
       },
       include: {
-        tags: {
-          select: {
-            tag: true,
-          },
-        },
+        ...includeTags,
+        ...includeProgramEnrollment,
       },
       take: 100,
       orderBy: {

diff --git a/apps/web/app/(ee)/api/cron/domains/update/route.ts b/apps/web/app/(ee)/api/cron/domains/update/route.ts
@@ -1,6 +1,8 @@
 import { queueDomainUpdate } from "@/lib/api/domains/queue-domain-update";
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { recordLink } from "@/lib/tinybird";
 import { prisma } from "@dub/prisma";
@@ -67,11 +69,8 @@ export async function POST(req: Request) {
         },
       },
       include: {
-        tags: {
-          select: {
-            tag: true,
-          },
-        },
+        ...includeTags,
+        ...includeProgramEnrollment,
       },
     });
 

diff --git a/apps/web/app/(ee)/api/cron/folders/delete/route.ts b/apps/web/app/(ee)/api/cron/folders/delete/route.ts
@@ -1,5 +1,6 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { queueFolderDeletion } from "@/lib/api/folders/queue-folder-deletion";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
 import { includeTags } from "@/lib/api/links/include-tags";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { recordLink } from "@/lib/tinybird";
@@ -31,7 +32,10 @@ export async function POST(req: Request) {
       orderBy: {
         createdAt: "desc", // TODO we need to add [folderId, createdAt] index on Link table
       },
-      include: includeTags,
+      include: {
+        ...includeTags,
+        ...includeProgramEnrollment,
+      },
     });
 
     if (linksToUpdate.length === 0) {

diff --git a/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/cron/merge-partner-accounts/route.ts
@@ -1,5 +1,6 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
@@ -165,7 +166,10 @@ export async function POST(req: Request) {
           },
           partnerId: targetPartnerId,
         },
-        include: includeTags,
+        include: {
+          ...includeTags,
+          ...includeProgramEnrollment,
+        },
       });
 
       // Bounty submissions to transfer to the target partner

diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
@@ -1,10 +1,13 @@
 import { triggerDraftBountySubmissionCreation } from "@/lib/api/bounties/trigger-draft-bounty-submissions";
 import { DubApiError } from "@/lib/api/errors";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import { qstash } from "@/lib/cron";
+import { recordLink } from "@/lib/tinybird";
 import { prisma } from "@dub/prisma";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
@@ -57,31 +60,49 @@ export const POST = withWorkspace(
 
     if (count > 0) {
       waitUntil(
-        Promise.allSettled([
-          qstash.publishJSON({
-            url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
-            body: {
+        (async () => {
+          const partnerLinks = await prisma.link.findMany({
+            where: {
               programId,
-              groupId: group.id,
-              partnerIds,
-              userId: session.user.id,
+              partnerId: {
+                in: partnerIds,
+              },
+              partnerGroupDefaultLinkId: null,
+            },
+            include: {
+              ...includeTags,
+              ...includeProgramEnrollment,
             },
-          }),
+          });
+
+          await Promise.allSettled([
+            qstash.publishJSON({
+              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
+              body: {
+                programId,
+                groupId: group.id,
+                partnerIds,
+                userId: session.user.id,
+              },
+            }),
 
-          qstash.publishJSON({
-            url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-discount-codes`,
-            body: {
+            qstash.publishJSON({
+              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-discount-codes`,
+              body: {
+                programId,
+                partnerIds,
+                groupId: group.id,
+              },
+            }),
+
+            triggerDraftBountySubmissionCreation({
               programId,
               partnerIds,
-              groupId: group.id,
-            },
-          }),
+            }),
 
-          triggerDraftBountySubmissionCreation({
-            programId,
-            partnerIds,
-          }),
-        ]),
+            recordLink(partnerLinks),
+          ]);
+        })(),
       );
     }
 

diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
@@ -3,11 +3,14 @@ import { isDiscountEquivalent } from "@/lib/api/discounts/is-discount-equivalent
 import { queueDiscountCodeDeletion } from "@/lib/api/discounts/queue-discount-code-deletion";
 import { DubApiError } from "@/lib/api/errors";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
 import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
 import { withWorkspace } from "@/lib/auth";
 import { qstash } from "@/lib/cron";
+import { recordLink } from "@/lib/tinybird";
 import { GroupWithProgramSchema } from "@/lib/zod/schemas/group-with-program";
 import {
   DEFAULT_PARTNER_GROUP,
@@ -334,42 +337,63 @@ export const DELETE = withWorkspace(
       return true;
     });
 
-    const partnerIds = group.partners.map(({ partnerId }) => partnerId);
-
     if (deletedGroup) {
       waitUntil(
-        Promise.allSettled([
-          partnerIds.length > 0 &&
-            qstash.publishJSON({
-              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
-              body: {
-                programId,
-                groupId: defaultGroup.id,
-                partnerIds,
-                userId: session.user.id,
-                isGroupDeleted: true,
+        (async () => {
+          const partnerIds = group.partners.map(({ partnerId }) => partnerId);
+
+          // TODO:
+          // This won't work for larger groups
+          // We should split this into multiple batches
+          const partnerLinks = await prisma.link.findMany({
+            where: {
+              programId,
+              partnerId: {
+                in: partnerIds,
               },
-            }),
+              partnerGroupDefaultLinkId: null,
+            },
+            include: {
+              ...includeTags,
+              ...includeProgramEnrollment,
+            },
+          });
 
-          ...discountCodesToDelete.map((discountCode) =>
-            queueDiscountCodeDeletion(discountCode.id),
-          ),
+          await Promise.allSettled([
+            partnerIds.length > 0 &&
+              qstash.publishJSON({
+                url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
+                body: {
+                  programId,
+                  groupId: defaultGroup.id,
+                  partnerIds,
+                  userId: session.user.id,
+                  isGroupDeleted: true,
+                },
+              }),
 
-          recordAuditLog({
-            workspaceId: workspace.id,
-            programId,
-            action: "group.deleted",
-            description: `Group ${group.name} (${group.id}) deleted`,
-            actor: session.user,
-            targets: [
-              {
-                type: "group",
-                id: group.id,
-                metadata: group,
-              },
-            ],
-          }),
-        ]),
+            ...discountCodesToDelete.map((discountCode) =>
+              queueDiscountCodeDeletion(discountCode.id),
+            ),
+
+            recordAuditLog({
+              workspaceId: workspace.id,
+              programId,
+              action: "group.deleted",
+              description: `Group ${group.name} (${group.id}) deleted`,
+              actor: session.user,
+              targets: [
+                {
+                  type: "group",
+                  id: group.id,
+                  metadata: group,
+                },
+              ],
+            }),
+
+            recordLink(partnerLinks),
+          ]);
+        })(),
       );
     }
 

diff --git a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
@@ -1,5 +1,7 @@
 import { deleteWorkspaceFolders } from "@/lib/api/folders/delete-workspace-folders";
 import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { tokenCache } from "@/lib/auth/token-cache";
 import { isBlacklistedEmail } from "@/lib/edge-config/is-blacklisted-email";
 import { stripe } from "@/lib/stripe";
@@ -37,11 +39,8 @@ export async function customerSubscriptionDeleted(event: Stripe.Event) {
           key: "_root",
         },
         include: {
-          tags: {
-            select: {
-              tag: true,
-            },
-          },
+          ...includeTags,
+          ...includeProgramEnrollment,
         },
       },
       users: {

diff --git a/apps/web/app/api/links/bulk/route.ts b/apps/web/app/api/links/bulk/route.ts
@@ -7,6 +7,8 @@ import {
 } from "@/lib/api/links";
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
 import { bulkUpdateLinks } from "@/lib/api/links/bulk-update-links";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { throwIfLinksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { checkIfLinksHaveFolders } from "@/lib/api/links/utils/check-if-links-have-folders";
 import { combineTagIds } from "@/lib/api/tags/combine-tag-ids";
@@ -507,11 +509,8 @@ export const DELETE = withWorkspace(
         ],
       },
       include: {
-        tags: {
-          select: {
-            tag: true,
-          },
-        },
+        ...includeTags,
+        ...includeProgramEnrollment,
       },
     });
 

diff --git a/apps/web/app/api/tags/[id]/route.ts b/apps/web/app/api/tags/[id]/route.ts
@@ -1,4 +1,6 @@
 import { DubApiError } from "@/lib/api/errors";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
 import { withWorkspace } from "@/lib/auth";
 import { recordLink } from "@/lib/tinybird";
 import { LinkTagSchema, updateTagBodySchema } from "@/lib/zod/schemas/tags";
@@ -71,11 +73,8 @@ export const DELETE = withWorkspace(
             select: {
               link: {
                 include: {
-                  tags: {
-                    select: {
-                      tag: true,
-                    },
-                  },
+                  ...includeTags,
+                  ...includeProgramEnrollment,
                 },
               },
             },