Improve the query to get the latest tasks for the task list presenter

Author: ericallam

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

@@ -1,14 +1,20 @@
-import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
-import { PrismaClientOrTransaction, type TaskTriggerSource } from "@trigger.dev/database";
-import { $replica, sqlDatabaseSchema } from "~/db.server";
+import {
+  PrismaClientOrTransaction,
+  RuntimeEnvironmentType,
+  type TaskTriggerSource,
+} from "@trigger.dev/database";
+import { $replica } from "~/db.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
 import {
+  AverageDurations,
   ClickHouseEnvironmentMetricsRepository,
+  CurrentRunningStats,
   DailyTaskActivity,
   EnvironmentMetricsRepository,
   PostgrestEnvironmentMetricsRepository,
 } from "~/services/environmentMetricsRepository.server";
 import { singleton } from "~/utils/singleton";
+import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
 
 export type TaskListItem = {
   slug: string;
@@ -25,77 +31,69 @@ export class TaskListPresenter {
     private readonly _replica: PrismaClientOrTransaction
   ) {}
 
-  public async call({ environmentId, projectId }: { environmentId: string; projectId: string }) {
-    const tasks = await this._replica.$queryRaw<
+  public async call({
+    environmentId,
+    environmentType,
+  }: {
+    environmentId: string;
+    environmentType: RuntimeEnvironmentType;
+  }) {
+    const currentWorker = await findCurrentWorkerFromEnvironment(
       {
-        id: string;
-        slug: string;
-        filePath: string;
-        createdAt: Date;
-        triggerSource: TaskTriggerSource;
-      }[]
-    >`
-    WITH non_dev_workers AS (
-      SELECT wd."workerId" AS id
-      FROM ${sqlDatabaseSchema}."WorkerDeploymentPromotion" wdp
-      INNER JOIN ${sqlDatabaseSchema}."WorkerDeployment" wd
-        ON wd.id = wdp."deploymentId"
-      WHERE wdp."environmentId" = ${environmentId}
-        AND wdp."label" = ${CURRENT_DEPLOYMENT_LABEL}
-    ),
-    workers AS (
-      SELECT DISTINCT ON ("runtimeEnvironmentId") id, "runtimeEnvironmentId", version
-      FROM ${sqlDatabaseSchema}."BackgroundWorker"
-      WHERE "runtimeEnvironmentId" = ${environmentId}
-        OR id IN (SELECT id FROM non_dev_workers)
-      ORDER BY "runtimeEnvironmentId", "createdAt" DESC
-    )
-    SELECT tasks.id, slug, "filePath", "triggerSource", tasks."runtimeEnvironmentId", tasks."createdAt"
-    FROM workers
-    JOIN ${sqlDatabaseSchema}."BackgroundWorkerTask" tasks ON tasks."workerId" = workers.id
-    ORDER BY slug ASC;`;
-
-    //then get the activity for each task
-    const activity = this.#getActivity(
-      tasks.map((t) => t.slug),
-      environmentId
+        id: environmentId,
+        type: environmentType,
+      },
+      this._replica
     );
 
-    const runningStats = this.#getRunningStats(
-      tasks.map((t) => t.slug),
-      environmentId
-    );
+    if (!currentWorker) {
+      return {
+        tasks: [],
+        activity: Promise.resolve({} as DailyTaskActivity),
+        runningStats: Promise.resolve({} as CurrentRunningStats),
+        durations: Promise.resolve({} as AverageDurations),
+      };
+    }
 
-    const durations = this.#getAverageDurations(
-      tasks.map((t) => t.slug),
-      environmentId
-    );
+    const tasks = await this._replica.backgroundWorkerTask.findMany({
+      where: {
+        workerId: currentWorker.id,
+      },
+      select: {
+        id: true,
+        slug: true,
+        filePath: true,
+        triggerSource: true,
+        createdAt: true,
+      },
+      orderBy: {
+        slug: "asc",
+      },
+    });
 
-    return { tasks, activity, runningStats, durations };
-  }
+    const slugs = tasks.map((t) => t.slug);
 
-  async #getActivity(tasks: string[], environmentId: string) {
-    return this.environmentMetricsRepository.getDailyTaskActivity({
+    // 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({
       environmentId,
-      days: 6,
-      tasks,
+      days: 6, // This actually means 7 days, because we want to show the current day too
+      tasks: slugs,
     });
-  }
 
-  async #getRunningStats(tasks: string[], environmentId: string) {
-    return this.environmentMetricsRepository.getCurrentRunningStats({
+    const runningStats = this.environmentMetricsRepository.getCurrentRunningStats({
       environmentId,
       days: 6,
-      tasks,
+      tasks: slugs,
     });
-  }
 
-  async #getAverageDurations(tasks: string[], environmentId: string) {
-    return this.environmentMetricsRepository.getAverageDurations({
+    const durations = this.environmentMetricsRepository.getAverageDurations({
       environmentId,
       days: 6,
-      tasks,
+      tasks: slugs,
     });
+
+    return { tasks, activity, runningStats, durations };
   }
 }
 

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

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