The task stats need org id and project id too

Author: matt-aitken

apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

@@ -1,16 +1,16 @@
 import {
-  PrismaClientOrTransaction,
-  RuntimeEnvironmentType,
+  type PrismaClientOrTransaction,
+  type RuntimeEnvironmentType,
   type TaskTriggerSource,
 } from "@trigger.dev/database";
 import { $replica } from "~/db.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
 import {
-  AverageDurations,
+  type AverageDurations,
   ClickHouseEnvironmentMetricsRepository,
-  CurrentRunningStats,
-  DailyTaskActivity,
-  EnvironmentMetricsRepository,
+  type CurrentRunningStats,
+  type DailyTaskActivity,
+  type EnvironmentMetricsRepository,
   PostgrestEnvironmentMetricsRepository,
 } from "~/services/environmentMetricsRepository.server";
 import { singleton } from "~/utils/singleton";
@@ -32,9 +32,13 @@ export class TaskListPresenter {
   ) {}
 
   public async call({
+    organizationId,
+    projectId,
     environmentId,
     environmentType,
   }: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     environmentType: RuntimeEnvironmentType;
   }) {
@@ -76,18 +80,24 @@ export class TaskListPresenter {
     // IMPORTANT: Don't await these, we want to return the promises
     // so we can defer the loading of the data
     const activity = this.environmentMetricsRepository.getDailyTaskActivity({
+      organizationId,
+      projectId,
       environmentId,
       days: 6, // This actually means 7 days, because we want to show the current day too
       tasks: slugs,
     });
 
     const runningStats = this.environmentMetricsRepository.getCurrentRunningStats({
+      organizationId,
+      projectId,
       environmentId,
       days: 6,
       tasks: slugs,
     });
 
     const durations = this.environmentMetricsRepository.getAverageDurations({
+      organizationId,
+      projectId,
       environmentId,
       days: 6,
       tasks: slugs,

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx

@@ -125,6 +125,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   try {
     const { tasks, activity, runningStats, durations } = await taskListPresenter.call({
+      organizationId: project.organizationId,
+      projectId: project.id,
       environmentId: environment.id,
       environmentType: environment.type,
     });

apps/webapp/app/services/environmentMetricsRepository.server.ts

@@ -10,18 +10,24 @@ export type AverageDurations = Record<string, number>;
 
 export interface EnvironmentMetricsRepository {
   getDailyTaskActivity(options: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
   }): Promise<DailyTaskActivity>;
 
   getCurrentRunningStats(options: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
   }): Promise<CurrentRunningStats>;
 
   getAverageDurations(options: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
@@ -177,10 +183,14 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
   constructor(private readonly options: ClickHouseEnvironmentMetricsRepositoryOptions) {}
 
   public async getDailyTaskActivity({
+    organizationId,
+    projectId,
     environmentId,
     days,
     tasks,
   }: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
@@ -190,6 +200,8 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
     }
 
     const [queryError, activity] = await this.options.clickhouse.taskRuns.getTaskActivity({
+      organizationId,
+      projectId,
       environmentId,
       days,
     });
@@ -210,10 +222,14 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
   }
 
   public async getCurrentRunningStats({
+    organizationId,
+    projectId,
     environmentId,
     days,
     tasks,
   }: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
@@ -223,6 +239,8 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
     }
 
     const [queryError, stats] = await this.options.clickhouse.taskRuns.getCurrentRunningStats({
+      organizationId,
+      projectId,
       environmentId,
       days,
     });
@@ -242,10 +260,14 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
   }
 
   public async getAverageDurations({
+    organizationId,
+    projectId,
     environmentId,
     days,
     tasks,
   }: {
+    organizationId: string;
+    projectId: string;
     environmentId: string;
     days: number;
     tasks: string[];
@@ -255,6 +277,8 @@ export class ClickHouseEnvironmentMetricsRepository implements EnvironmentMetric
     }
 
     const [queryError, durations] = await this.options.clickhouse.taskRuns.getAverageDurations({
+      organizationId,
+      projectId,
       environmentId,
       days,
     });

apps/webapp/test/runsRepository.test.ts

@@ -72,6 +72,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
       });
 
       expect(runs).toHaveLength(1);
@@ -180,6 +181,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         tasks: ["task-1", "task-2"],
       });
 
@@ -290,6 +292,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         versions: ["1.0.0", "3.0.0"],
       });
 
@@ -400,6 +403,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         statuses: ["PENDING", "COMPLETED_SUCCESSFULLY"],
       });
 
@@ -510,6 +514,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         tags: ["urgent"],
       });
 
@@ -619,6 +624,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         scheduleId: "schedule_1",
       });
 
@@ -712,6 +718,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         isTest: true,
       });
 
@@ -723,6 +730,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         isTest: false,
       });
 
@@ -816,6 +824,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         rootOnly: true,
       });
 
@@ -945,6 +954,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         batchId: batchRun1.id,
       });
 
@@ -1052,6 +1062,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         runFriendlyIds: ["run_abc", "run_xyz"],
       });
 
@@ -1159,6 +1170,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         runIds: [run1.id, run3.id],
       });
 
@@ -1273,6 +1285,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         from: yesterday.getTime(),
         to: now.getTime(),
       });
@@ -1393,6 +1406,7 @@ describe("RunsRepository", () => {
         page: { size: 10 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
         tasks: ["task-1"],
         versions: ["1.0.0"],
         statuses: ["COMPLETED_SUCCESSFULLY"],
@@ -1476,6 +1490,7 @@ describe("RunsRepository", () => {
         page: { size: 2 },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
       });
 
       expect(firstPage.runs).toHaveLength(2);
@@ -1491,6 +1506,7 @@ describe("RunsRepository", () => {
         },
         projectId: project.id,
         environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
       });
 
       expect(secondPage.runs).toHaveLength(2);

internal-packages/clickhouse/src/taskRuns.ts

@@ -113,6 +113,8 @@ export const TaskActivityQueryResult = z.object({
 export type TaskActivityQueryResult = z.infer<typeof TaskActivityQueryResult>;
 
 export const TaskActivityQueryParams = z.object({
+  organizationId: z.string(),
+  projectId: z.string(),
   environmentId: z.string(),
   days: z.number().int(),
 });
@@ -128,7 +130,9 @@ export function getTaskActivityQueryBuilder(ch: ClickhouseReader, settings?: Cli
           count() as count
       FROM trigger_dev.task_runs_v2 FINAL
       WHERE
-          environment_id = {environmentId: String}
+          organization_id = {organizationId: String}
+          AND project_id = {projectId: String}
+          AND environment_id = {environmentId: String}
           AND created_at >= today() - {days: Int64}
           AND _is_deleted = 0
       GROUP BY
@@ -155,6 +159,8 @@ export const CurrentRunningStatsQueryResult = z.object({
 export type CurrentRunningStatsQueryResult = z.infer<typeof CurrentRunningStatsQueryResult>;
 
 export const CurrentRunningStatsQueryParams = z.object({
+  organizationId: z.string(),
+  projectId: z.string(),
   environmentId: z.string(),
   days: z.number().int(),
 });
@@ -169,7 +175,9 @@ export function getCurrentRunningStats(ch: ClickhouseReader, settings?: ClickHou
         count() as count
     FROM trigger_dev.task_runs_v2 FINAL
     WHERE
-        environment_id = {environmentId: String}
+        organization_id = {organizationId: String}
+        AND project_id = {projectId: String}
+        AND environment_id = {environmentId: String}
         AND status IN ('PENDING', 'WAITING_FOR_DEPLOY', 'WAITING_TO_RESUME', 'QUEUED', 'EXECUTING')
         AND _is_deleted = 0
         AND created_at >= now() - INTERVAL {days: Int64} DAY
@@ -193,6 +201,8 @@ export const AverageDurationsQueryResult = z.object({
 export type AverageDurationsQueryResult = z.infer<typeof AverageDurationsQueryResult>;
 
 export const AverageDurationsQueryParams = z.object({
+  organizationId: z.string(),
+  projectId: z.string(),
   environmentId: z.string(),
   days: z.number().int(),
 });
@@ -206,7 +216,9 @@ export function getAverageDurations(ch: ClickhouseReader, settings?: ClickHouseS
         avg(toUnixTimestamp(completed_at) - toUnixTimestamp(started_at)) as duration
     FROM trigger_dev.task_runs_v2 FINAL
     WHERE
-        environment_id = {environmentId: String}
+        organization_id = {organizationId: String}
+        AND project_id = {projectId: String}
+        AND environment_id = {environmentId: String}
         AND created_at >= today() - {days: Int64}
         AND status IN ('COMPLETED_SUCCESSFULLY', 'COMPLETED_WITH_ERRORS')
         AND started_at IS NOT NULL