fix commission timeseries

Author: steven-tey

apps/web/app/(ee)/api/commissions/timeseries/route.ts

@@ -1,4 +1,5 @@
 import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
 import { withWorkspace } from "@/lib/auth";
 import { sqlGranularityMap } from "@/lib/planetscale/granularity";
@@ -21,20 +22,22 @@ interface Commission {
 
 // GET /api/commissions/timeseries - get commissions timeseries for a program
 export const GET = withWorkspace(async ({ workspace, searchParams }) => {
-  const { programId } = searchParams;
-
-  const program = await getProgramOrThrow({
-    workspaceId: workspace.id,
-    programId,
-  });
+  const programId = getDefaultProgramIdOrThrow(workspace);
 
   const { start, end, interval, timezone } = querySchema.parse(searchParams);
 
   const { startDate, endDate, granularity } = getStartEndDates({
     interval,
     start,
     end,
-    dataAvailableFrom: program.createdAt,
+    dataAvailableFrom:
+      // ideally we should get the first commission event date for dataAvailableFrom
+      interval === "all"
+        ? await getProgramOrThrow({
+            workspaceId: workspace.id,
+            programId,
+          }).then((program) => program.createdAt)
+        : undefined,
   });
 
   const { dateFormat, dateIncrement, startFunction, formatString } =
@@ -47,7 +50,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
       FROM Commission
       WHERE 
         earnings > 0
-        AND programId = ${program.id}
+        AND programId = ${programId}
         AND createdAt >= ${startDate}
         AND createdAt < ${endDate}
       GROUP BY start

apps/web/app/(ee)/api/programs/[programId]/revenue/route.ts

@@ -1,4 +1,5 @@
 import { getAnalytics } from "@/lib/analytics/get-analytics";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
 import { withWorkspace } from "@/lib/auth";
 import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
@@ -14,27 +15,30 @@ const querySchema = analyticsQuerySchema.pick({
 });
 
 // GET /api/programs/[programId]/revenue - get revenue timeseries for a program
-export const GET = withWorkspace(
-  async ({ workspace, params, searchParams }) => {
-    const program = await getProgramOrThrow({
-      workspaceId: workspace.id,
-      programId: params.programId,
-    });
+export const GET = withWorkspace(async ({ workspace, searchParams }) => {
+  const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const parsedParams = querySchema.parse(searchParams);
+  const parsedParams = querySchema.parse(searchParams);
+  const { interval } = parsedParams;
 
-    const response = await getAnalytics({
-      ...parsedParams,
-      workspaceId: workspace.id,
-      programId: program.id,
-      dataAvailableFrom: program.createdAt,
-    });
+  const response = await getAnalytics({
+    ...parsedParams,
+    workspaceId: workspace.id,
+    programId,
+    dataAvailableFrom:
+      // ideally we should get the first commission event date for dataAvailableFrom
+      interval === "all"
+        ? await getProgramOrThrow({
+            workspaceId: workspace.id,
+            programId,
+          }).then((program) => program.createdAt)
+        : undefined,
+  });
 
-    const timeseries = response.map((item) => ({
-      start: item.start,
-      saleAmount: item.saleAmount,
-    }));
+  const timeseries = response.map((item) => ({
+    start: item.start,
+    saleAmount: item.saleAmount,
+  }));
 
-    return NextResponse.json(timeseries);
-  },
-);
+  return NextResponse.json(timeseries);
+});