Merge pull request #1852 from dubinc/tenantId

Add support for `tenantId`

apps/web/app/api/cron/cleanup/route.ts

@@ -31,7 +31,11 @@ export async function GET(req: Request) {
           },
         },
         include: {
-          tags: true,
+          tags: {
+            select: {
+              tag: true,
+            },
+          },
         },
         take: 100,
       }),
@@ -63,9 +67,7 @@ export async function GET(req: Request) {
       });
 
       // Post delete cleanup
-      await bulkDeleteLinks({
-        links,
-      });
+      await bulkDeleteLinks(links);
     }
 
     // Delete the domains

apps/web/app/api/cron/domains/delete/route.ts

@@ -39,7 +39,11 @@ export async function POST(req: Request) {
         domain,
       },
       include: {
-        tags: true,
+        tags: {
+          select: {
+            tag: true,
+          },
+        },
       },
       take: 100, // TODO: We can adjust this number based on the performance
     });
@@ -53,19 +57,7 @@ export async function POST(req: Request) {
       linkCache.deleteMany(links),
 
       // Record link in the Tinybird
-      recordLink(
-        links.map((link) => ({
-          link_id: link.id,
-          domain: link.domain,
-          key: link.key,
-          url: link.url,
-          tag_ids: link.tags.map((tag) => tag.id),
-          workspace_id: workspaceId,
-          program_id: link.programId ?? "",
-          created_at: link.createdAt,
-          deleted: true,
-        })),
-      ),
+      recordLink(links),
 
       // Remove image from R2 storage if it exists
       links

apps/web/app/api/cron/domains/transfer/route.ts

@@ -72,16 +72,7 @@ export async function POST(req: Request) {
         }),
 
         recordLink(
-          links.map((link) => ({
-            link_id: link.id,
-            domain: link.domain,
-            key: link.key,
-            url: link.url,
-            tag_ids: [],
-            program_id: link.programId ?? "",
-            workspace_id: newWorkspaceId,
-            created_at: link.createdAt,
-          })),
+          links.map((link) => ({ ...link, projectId: newWorkspaceId })),
         ),
       ]);
 

apps/web/app/api/cron/domains/update/route.ts

@@ -41,7 +41,11 @@ export async function POST(req: Request) {
         domain: newDomain,
       },
       include: {
-        tags: true,
+        tags: {
+          select: {
+            tag: true,
+          },
+        },
       },
       skip: (page - 1) * pageSize,
       take: pageSize,
@@ -59,18 +63,7 @@ export async function POST(req: Request) {
       }),
 
       // update links in Tinybird
-      recordLink(
-        links.map((link) => ({
-          link_id: link.id,
-          domain: link.domain,
-          key: link.key,
-          url: link.url,
-          tag_ids: link.tags.map((tag) => tag.tagId),
-          program_id: link.programId ?? "",
-          workspace_id: link.projectId,
-          created_at: link.createdAt,
-        })),
-      ),
+      recordLink(links),
     ]);
 
     await queueDomainUpdate({

apps/web/app/api/cron/workspaces/delete/route.ts

@@ -37,7 +37,11 @@ export async function POST(req: Request) {
         projectId: workspace.id,
       },
       include: {
-        tags: true,
+        tags: {
+          select: {
+            tag: true,
+          },
+        },
       },
       take: 100, // TODO: We can adjust this number based on the performance
     });
@@ -52,9 +56,7 @@ export async function POST(req: Request) {
           },
         }),
 
-        bulkDeleteLinks({
-          links,
-        }),
+        bulkDeleteLinks(links),
       ]);
 
       console.log(res);

apps/web/app/api/links/[linkId]/transfer/route.ts

@@ -80,17 +80,7 @@ export const POST = withWorkspace(
     waitUntil(
       Promise.all([
         linkCache.set({ ...link, projectId: newWorkspaceId }),
-
-        recordLink({
-          link_id: link.id,
-          domain: link.domain,
-          key: link.key,
-          url: link.url,
-          tag_ids: [],
-          program_id: link.programId ?? "",
-          workspace_id: newWorkspaceId,
-          created_at: link.createdAt,
-        }),
+        recordLink({ ...link, projectId: newWorkspaceId }),
         // increment new workspace usage
         prisma.project.update({
           where: {

apps/web/app/api/links/bulk/route.ts

@@ -395,7 +395,11 @@ export const DELETE = withWorkspace(
         ],
       },
       include: {
-        tags: true,
+        tags: {
+          select: {
+            tag: true,
+          },
+        },
       },
     });
 
@@ -406,11 +410,7 @@ export const DELETE = withWorkspace(
       },
     });
 
-    waitUntil(
-      bulkDeleteLinks({
-        links,
-      }),
-    );
+    waitUntil(bulkDeleteLinks(links));
 
     return NextResponse.json(
       {

apps/web/app/api/links/route.ts

@@ -35,6 +35,7 @@ export const GET = withWorkspace(
       includeWebhooks,
       includeDashboard,
       linkIds,
+      tenantId,
     } = getLinksQuerySchemaExtended.parse(searchParams);
 
     if (domain) {
@@ -57,6 +58,7 @@ export const GET = withWorkspace(
       includeWebhooks,
       includeDashboard,
       linkIds,
+      tenantId,
     });
 
     return NextResponse.json(response, {

apps/web/app/api/stripe/webhook/customer-subscription-deleted.ts

@@ -26,7 +26,11 @@ export async function customerSubscriptionDeleted(event: Stripe.Event) {
           key: "_root",
         },
         include: {
-          tags: true,
+          tags: {
+            select: {
+              tag: true,
+            },
+          },
         },
       },
       users: {
@@ -138,14 +142,8 @@ export async function customerSubscriptionDeleted(event: Stripe.Event) {
     // record root domain link for all domains from Tinybird
     recordLink(
       workspaceLinks.map((link) => ({
-        link_id: link.id,
-        domain: link.domain,
-        key: link.key,
-        url: link.url,
-        tag_ids: link.tags.map((tag) => tag.tagId),
-        program_id: link.programId ?? "",
-        workspace_id: link.projectId,
-        created_at: link.createdAt,
+        ...link,
+        url: "",
       })),
     ),
     log({

apps/web/app/api/tags/[id]/route.ts

@@ -3,6 +3,7 @@ import { withWorkspace } from "@/lib/auth";
 import { recordLink } from "@/lib/tinybird";
 import { TagSchema, updateTagBodySchema } from "@/lib/zod/schemas/tags";
 import { prisma } from "@dub/prisma";
+import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
 // PATCH /api/workspaces/[idOrSlug]/tags/[id] – update a tag for a workspace
@@ -69,13 +70,12 @@ export const DELETE = withWorkspace(
           links: {
             select: {
               link: {
-                select: {
-                  id: true,
-                  domain: true,
-                  key: true,
-                  url: true,
-                  programId: true,
-                  createdAt: true,
+                include: {
+                  tags: {
+                    select: {
+                      tag: true,
+                    },
+                  },
                 },
               },
             },
@@ -91,17 +91,13 @@ export const DELETE = withWorkspace(
       }
 
       // update links metadata in tinybird after deleting a tag
-      await recordLink(
-        response.links.map(({ link }) => ({
-          link_id: link.id,
-          domain: link.domain,
-          key: link.key,
-          url: link.url,
-          tag_ids: [],
-          program_id: link.programId ?? "",
-          workspace_id: workspace.id,
-          created_at: link.createdAt,
-        })),
+      waitUntil(
+        recordLink(
+          response.links.map(({ link }) => ({
+            ...link,
+            tags: link.tags.filter(({ tag }) => tag.id !== id),
+          })),
+        ),
       );
 
       return NextResponse.json({ id });

apps/web/lib/actions/partners/approve-partner.ts

@@ -61,24 +61,16 @@ export const approvePartnerAction = authActionClient
           programId,
         },
         include: {
-          tags: true,
+          tags: {
+            select: {
+              tag: true,
+            },
+          },
         },
       }),
     ]);
 
-    waitUntil(
-      recordLink({
-        domain: updatedLink.domain,
-        key: updatedLink.key,
-        link_id: updatedLink.id,
-        created_at: updatedLink.createdAt,
-        url: updatedLink.url,
-        tag_ids: updatedLink.tags.map((t) => t.tagId),
-        program_id: program.id,
-        workspace_id: workspace.id,
-        deleted: false,
-      }),
-    );
+    waitUntil(recordLink(updatedLink));
 
     // TODO: [partners] Notify partner of approval?
 

apps/web/lib/actions/partners/invite-partner.ts

@@ -39,6 +39,5 @@ export const invitePartnerAction = authActionClient
       email,
       program,
       link,
-      workspace,
     });
   });

apps/web/lib/api/links/bulk-delete-links.ts

@@ -1,14 +1,10 @@
 import { storage } from "@/lib/storage";
-import { recordLink } from "@/lib/tinybird";
+import { recordLinkTB, transformLinkTB } from "@/lib/tinybird";
 import { R2_URL } from "@dub/utils";
-import { Link } from "@prisma/client";
 import { linkCache } from "./cache";
+import { ExpandedLink } from "./utils";
 
-export async function bulkDeleteLinks({
-  links,
-}: {
-  links: (Link & { tags: { tagId: string }[] })[];
-}) {
+export async function bulkDeleteLinks(links: ExpandedLink[]) {
   if (links.length === 0) {
     return;
   }
@@ -18,16 +14,9 @@ export async function bulkDeleteLinks({
     linkCache.deleteMany(links),
 
     // Record the links deletion in Tinybird
-    recordLink(
+    recordLinkTB(
       links.map((link) => ({
-        link_id: link.id,
-        domain: link.domain,
-        key: link.key,
-        url: link.url,
-        tag_ids: link.tags.map(({ tagId }) => tagId),
-        program_id: link.programId ?? "",
-        workspace_id: link.projectId,
-        created_at: link.createdAt,
+        ...transformLinkTB(link),
         deleted: true,
       })),
     ),

apps/web/lib/api/links/create-link.ts

@@ -133,20 +133,11 @@ export async function createLink(link: ProcessedLinkProps) {
   const uploadedImageUrl = `${R2_URL}/images/${response.id}`;
 
   waitUntil(
-    Promise.all([
+    Promise.allSettled([
       // cache link in Redis
       linkCache.set(response),
       // record link in Tinybird
-      recordLink({
-        link_id: response.id,
-        domain: response.domain,
-        key: response.key,
-        url: response.url,
-        tag_ids: response.tags.map(({ tag }) => tag.id),
-        program_id: link.programId ?? "",
-        workspace_id: response.projectId,
-        created_at: response.createdAt,
-      }),
+      recordLink(response),
       // Upload image to R2 and update the link with the uploaded image URL when
       // proxy is enabled and image is set and not stored in R2
       ...(proxy && image && !isStored(image)