Merge pull request dubinc#2318 from dubinc/fix-partner-customer-events

Refactor `getCustomerEvents` to include optional linkIds parameter

Author: steven-tey

apps/web/app/api/customers/[id]/activity/route.ts

@@ -30,13 +30,9 @@ export const GET = withWorkspace(async ({ workspace, params, session }) => {
   }
 
   let [events, link] = await Promise.all([
-    getCustomerEvents(
-      { customerId: customer.id, clickId: customer.clickId },
-      {
-        sortOrder: "desc",
-        interval: "1y",
-      },
-    ),
+    getCustomerEvents({
+      customerId: customer.id,
+    }),
 
     prisma.link.findUniqueOrThrow({
       where: {

apps/web/app/api/partner-profile/programs/[programId]/customers/[customerId]/activity/route.ts

@@ -1,6 +1,5 @@
 import { getCustomerEvents } from "@/lib/analytics/get-customer-events";
 import { DubApiError } from "@/lib/api/errors";
-import { decodeLinkIfCaseSensitive } from "@/lib/api/links/case-sensitivity";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { withPartnerProfile } from "@/lib/auth/partner";
 import { customerActivityResponseSchema } from "@/lib/zod/schemas/customer-activity";
@@ -11,87 +10,33 @@ import { NextResponse } from "next/server";
 export const GET = withPartnerProfile(async ({ partner, params }) => {
   const { customerId, programId } = params;
 
-  const { program } = await getProgramEnrollmentOrThrow({
+  const { program, links } = await getProgramEnrollmentOrThrow({
     partnerId: partner.id,
     programId: programId,
   });
 
-  if (program.slug === "framer") {
-    throw new DubApiError({
-      code: "forbidden",
-      message: "Framer program does not support customer activity",
-    });
-  }
-
   const customer = await prisma.customer.findUnique({
     where: {
       id: customerId,
     },
-    include: {
-      link: {
-        include: {
-          programEnrollment: {
-            include: {
-              partner: true,
-              program: true,
-            },
-          },
-        },
-      },
-    },
   });
 
-  if (
-    !customer ||
-    ![
-      customer?.link?.programEnrollment?.programId,
-      customer?.link?.programEnrollment?.program.slug,
-    ].includes(program.id)
-  ) {
+  if (!customer || customer?.projectId !== program.workspaceId) {
     throw new DubApiError({
       code: "not_found",
       message:
         "Customer not found. Make sure you're using the correct customer ID (e.g. `cus_3TagGjzRzmsFJdH8od2BNCsc`).",
     });
   }
 
-  if (!customer.linkId) {
-    return NextResponse.json(
-      customerActivityResponseSchema.parse({
-        customer,
-        events: [],
-        ltv: 0,
-        timeToLead: null,
-        timeToSale: null,
-        link: null,
-      }),
-    );
-  }
-
-  let [events, link] = await Promise.all([
-    getCustomerEvents(
-      { customerId: customer.id, clickId: customer.clickId },
-      {
-        sortOrder: "desc",
-        interval: "1y",
-      },
-    ),
-
-    prisma.link.findUniqueOrThrow({
-      where: {
-        id: customer.linkId!,
-      },
-      select: {
-        id: true,
-        domain: true,
-        key: true,
-        shortLink: true,
-        folderId: true,
-      },
-    }),
-  ]);
+  const events = await getCustomerEvents({
+    customerId: customer.id,
+    linkIds: links.map((link) => link.id),
+  });
 
-  link = decodeLinkIfCaseSensitive(link);
+  // get the first partner link that this customer interacted with
+  const firstLinkId = events[events.length - 1].link_id;
+  const link = links.find((link) => link.id === firstLinkId);
 
   // Find the LTV of the customer
   // TODO: Calculate this from all events, not limited

apps/web/app/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts

@@ -16,38 +16,13 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
     programId: programId,
   });
 
-  if (program.slug === "framer") {
-    throw new DubApiError({
-      code: "forbidden",
-      message: "Framer program does not support customer profile",
-    });
-  }
-
   const customer = await prisma.customer.findUnique({
     where: {
       id: customerId,
     },
-    include: {
-      link: {
-        include: {
-          programEnrollment: {
-            include: {
-              partner: true,
-              program: true,
-            },
-          },
-        },
-      },
-    },
   });
 
-  if (
-    !customer ||
-    ![
-      customer?.link?.programEnrollment?.programId,
-      customer?.link?.programEnrollment?.program.slug,
-    ].includes(program.id)
-  ) {
+  if (!customer || customer?.projectId !== program.workspaceId) {
     throw new DubApiError({
       code: "not_found",
       message:
@@ -63,14 +38,6 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
       transformCustomer({
         ...customer,
         email: customer.email || customer.name || generateRandomName(),
-        link: customer.link
-          ? {
-              ...customer.link,
-              programEnrollment: customer.link.programEnrollment
-                ? { ...customer.link.programEnrollment, program: undefined }
-                : null,
-            }
-          : null,
       }),
     ),
   );

apps/web/app/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page.tsx

@@ -1,16 +1,8 @@
 import { PageContent } from "@/ui/layout/page-content";
 import { MaxWidthWrapper } from "@dub/ui";
-import { redirect } from "next/navigation";
 import { ProgramCustomerPageClient } from "./page-client";
 
-export default function ProgramCustomer({
-  params,
-}: {
-  params: { programSlug: string; customerId: string };
-}) {
-  if (params.programSlug === "framer") {
-    redirect("/programs/framer");
-  }
+export default function ProgramCustomer() {
   return (
     <PageContent hideReferButton>
       <MaxWidthWrapper className="flex flex-col gap-6">

apps/web/lib/analytics/get-customer-events.ts

@@ -10,38 +10,23 @@ import {
 } from "../zod/schemas/clicks";
 import { leadEventResponseSchema } from "../zod/schemas/leads";
 import { saleEventResponseSchema } from "../zod/schemas/sales";
-import { EventsFilters } from "./types";
-import { getStartEndDates } from "./utils/get-start-end-dates";
-
-export const getCustomerEvents = async (
-  { customerId, clickId }: { customerId: string; clickId?: string | null },
-  params: Pick<
-    EventsFilters,
-    "sortOrder" | "start" | "end" | "dataAvailableFrom" | "interval"
-  >,
-) => {
-  let { sortOrder, start, end, dataAvailableFrom, interval } = params;
-
-  const { startDate, endDate } = getStartEndDates({
-    interval,
-    start,
-    end,
-    dataAvailableFrom,
-  });
 
+export const getCustomerEvents = async ({
+  customerId,
+  linkIds,
+}: {
+  customerId: string;
+  linkIds?: string[];
+}) => {
   const pipe = tb.buildPipe({
     pipe: "v2_customer_events",
     parameters: z.any(), // TODO
     data: z.any(), // TODO
   });
 
   const response = await pipe({
-    ...params,
     customerId,
-    ...(clickId ? { clickId } : {}),
-    order: sortOrder,
-    start: startDate.toISOString().replace("T", " ").replace("Z", ""),
-    end: endDate.toISOString().replace("T", " ").replace("Z", ""),
+    ...(linkIds ? { linkIds } : {}),
   });
 
   const linksMap = await getLinksMap(response.data.map((d) => d.link_id));

apps/web/lib/zod/schemas/partner-profile.ts

@@ -82,7 +82,6 @@ export const PartnerProfileCustomerSchema = CustomerEnrichedSchema.pick({
   id: true,
   createdAt: true,
   country: true,
-  link: true,
 }).extend({
   email: z
     .string()

packages/tinybird/pipes/v2_customer_events.pipe

@@ -4,7 +4,7 @@ DESCRIPTION >
 
 TAGS "Dub Endpoints"
 
-NODE click_events
+NODE lead_events
 SQL >
 
     %
@@ -30,23 +30,28 @@ SQL >
         ip,
         CONCAT(country, '-', region) as region_processed,
         splitByString('?', referer_url)[1] as referer_url_processed,
-        'click' as event
-    FROM dub_click_events_id
+        'lead' as event,
+        event_id,
+        event_name,
+        metadata
+    FROM dub_lead_events_mv
     WHERE
-        click_id
+        customer_id
         = {{
             String(
-                clickId,
-                '8bBSF1CbVlXRCMJY',
-                description="The unique ID for a given click event",
+                customerId,
+                'cus_1JRJNSVARH220RCNJ2K5SAX9Q',
+                description="The unique ID for a given customer",
                 required=True,
             )
         }}
+        {% if defined(linkIds) %} AND link_id IN ({{ Array(linkIds, 'link_id') }}) {% end %}
+    ORDER BY timestamp {% if order == 'asc' %} ASC {% else %} DESC {% end %}
     LIMIT {{ Int32(limit, 100) }}
 
 
 
-NODE lead_events
+NODE click_events
 SQL >
 
     %
@@ -72,23 +77,11 @@ SQL >
         ip,
         CONCAT(country, '-', region) as region_processed,
         splitByString('?', referer_url)[1] as referer_url_processed,
-        'lead' as event,
-        event_id,
-        event_name
-    FROM dub_lead_events_mv
+        'click' as event
+    FROM dub_click_events_id
     WHERE
-        customer_id
-        = {{
-            String(
-                customerId,
-                'cm1a18x7w0001aqhx744lrtxp',
-                description="The unique ID for a given customer",
-                required=True,
-            )
-        }}
-        AND timestamp >= {{ DateTime(start, '2025-01-01 00:00:00') }}
-        AND timestamp < {{ DateTime(end, '2025-06-30 00:00:00') }}
-    ORDER BY timestamp {% if order == 'asc' %} ASC {% else %} DESC {% end %}
+        click_id IN (SELECT DISTINCT click_id FROM lead_events)
+        {% if defined(linkIds) %} AND link_id IN ({{ Array(linkIds, 'link_id') }}) {% end %}
     LIMIT {{ Int32(limit, 100) }}
 
 
@@ -122,6 +115,7 @@ SQL >
         'sale' as event,
         event_id,
         event_name,
+        metadata,
         amount as saleAmount,
         invoice_id,
         payment_processor
@@ -131,13 +125,12 @@ SQL >
         = {{
             String(
                 customerId,
-                'cm1a18x7w0001aqhx744lrtxp',
+                'cus_1JRJNSVARH220RCNJ2K5SAX9Q',
                 description="The unique ID for a given customer",
                 required=True,
             )
         }}
-        AND timestamp >= {{ DateTime(start, '2025-01-01 00:00:00') }}
-        AND timestamp < {{ DateTime(end, '2025-06-30 00:00:00') }}
+        {% if defined(linkIds) %} AND link_id IN ({{ Array(linkIds, 'link_id') }}) {% end %}
     LIMIT {{ Int32(limit, 100) }}
 
 
@@ -146,26 +139,25 @@ NODE endpoint
 SQL >
 
     %
-        SELECT *
-        FROM
-            (
-                {% if defined(clickId) %}
-                    SELECT
-                        *,
-                        NULL AS event_id,
-                        NULL AS event_name,
-                        NULL AS saleAmount,
-                        NULL AS invoice_id,
-                        NULL AS payment_processor
-                    FROM click_events
-                    UNION ALL
-                {% end %}
-                SELECT *, NULL AS saleAmount, NULL AS invoice_id, NULL AS payment_processor
-                FROM lead_events
-                UNION ALL
-                SELECT *
-                FROM sale_events
-            )
-        ORDER BY timestamp {% if order == 'asc' %} ASC {% else %} DESC {% end %}
+    SELECT *
+    FROM
+        (
+            SELECT *, NULL AS saleAmount, NULL AS invoice_id, NULL AS payment_processor
+            FROM lead_events
+            UNION ALL
+            SELECT
+                *,
+                NULL AS event_id,
+                NULL AS event_name,
+                NULL AS metadata,
+                NULL AS saleAmount,
+                NULL AS invoice_id,
+                NULL AS payment_processor
+            FROM click_events
+            UNION ALL
+            SELECT *
+            FROM sale_events
+        )
+    ORDER BY timestamp {% if order == 'asc' %} ASC {% else %} DESC {% end %}