read replica for all remaining v3 presenters

nicktrn · nicktrn · commit 2a4bb9c6fbab · 2024-06-08T16:52:20.000+01:00
diff --git a/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts b/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts
@@ -1,17 +1,11 @@
-import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { sortEnvironments } from "~/utils/environmentSort";
+import { BasePresenter } from "./basePresenter.server";
 
-export class ApiKeysPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class ApiKeysPresenter extends BasePresenter {
   public async call({ userId, projectSlug }: { userId: User["id"]; projectSlug: Project["slug"] }) {
-    const environments = await this.#prismaClient.runtimeEnvironment.findMany({
+    const environments = await this._replica.runtimeEnvironment.findMany({
       select: {
         id: true,
         apiKey: true,
diff --git a/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts
@@ -1,22 +1,17 @@
 import { WorkerDeploymentStatus } from "@trigger.dev/database";
-import { sqlDatabaseSchema, PrismaClient, prisma } from "~/db.server";
+import { sqlDatabaseSchema } from "~/db.server";
 import { Organization } from "~/models/organization.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { getUsername } from "~/utils/username";
+import { BasePresenter } from "./basePresenter.server";
 
 const pageSize = 20;
 
 export type DeploymentList = Awaited<ReturnType<DeploymentListPresenter["call"]>>;
 export type DeploymentListItem = DeploymentList["deployments"][0];
 
-export class DeploymentListPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class DeploymentListPresenter extends BasePresenter {
   public async call({
     userId,
     projectSlug,
@@ -28,7 +23,7 @@ export class DeploymentListPresenter {
     organizationSlug: Organization["slug"];
     page?: number;
   }) {
-    const project = await this.#prismaClient.project.findFirstOrThrow({
+    const project = await this._replica.project.findFirstOrThrow({
       select: {
         id: true,
         environments: {
@@ -63,13 +58,13 @@ export class DeploymentListPresenter {
       },
     });
 
-    const totalCount = await this.#prismaClient.workerDeployment.count({
+    const totalCount = await this._replica.workerDeployment.count({
       where: {
         projectId: project.id,
       },
     });
 
-    const labeledDeployments = await this.#prismaClient.workerDeploymentPromotion.findMany({
+    const labeledDeployments = await this._replica.workerDeploymentPromotion.findMany({
       where: {
         environmentId: {
           in: project.environments.map((env) => env.id),
@@ -81,7 +76,7 @@ export class DeploymentListPresenter {
       },
     });
 
-    const deployments = await this.#prismaClient.$queryRaw<
+    const deployments = await this._replica.$queryRaw<
       {
         id: string;
         shortCode: string;
diff --git a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts
@@ -4,28 +4,22 @@ import {
   TaskMetadataFailedToParseData,
   groupTaskMetadataIssuesByTask,
 } from "@trigger.dev/core/v3";
-import { WorkerDeployment, WorkerDeploymentStatus } from "@trigger.dev/database";
+import { WorkerDeployment } from "@trigger.dev/database";
 import { z } from "zod";
-import { PrismaClient, prisma } from "~/db.server";
 import { Organization } from "~/models/organization.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { safeJsonParse } from "~/utils/json";
 import { getUsername } from "~/utils/username";
+import { BasePresenter } from "./basePresenter.server";
 
 export type ErrorData = {
   name: string;
   message: string;
   stack?: string;
 };
 
-export class DeploymentPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class DeploymentPresenter extends BasePresenter {
   public async call({
     userId,
     projectSlug,
@@ -37,7 +31,7 @@ export class DeploymentPresenter {
     organizationSlug: Organization["slug"];
     deploymentShortCode: WorkerDeployment["shortCode"];
   }) {
-    const project = await this.#prismaClient.project.findFirstOrThrow({
+    const project = await this._replica.project.findFirstOrThrow({
       select: {
         id: true,
         organizationId: true,
@@ -55,7 +49,7 @@ export class DeploymentPresenter {
       },
     });
 
-    const deployment = await this.#prismaClient.workerDeployment.findUniqueOrThrow({
+    const deployment = await this._replica.workerDeployment.findUniqueOrThrow({
       where: {
         projectId_shortCode: {
           projectId: project.id,
diff --git a/apps/webapp/app/presenters/v3/EditSchedulePresenter.server.ts b/apps/webapp/app/presenters/v3/EditSchedulePresenter.server.ts
@@ -1,6 +1,6 @@
 import { RuntimeEnvironmentType } from "@trigger.dev/database";
-import { PrismaClient, prisma } from "~/db.server";
 import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
+import { BasePresenter } from "./basePresenter.server";
 
 type EditScheduleOptions = {
   userId: string;
@@ -16,16 +16,10 @@ type Environment = {
   userName?: string;
 };
 
-export class EditSchedulePresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class EditSchedulePresenter extends BasePresenter {
   public async call({ userId, projectSlug, friendlyId }: EditScheduleOptions) {
     // Find the project scoped to the organization
-    const project = await this.#prismaClient.project.findFirstOrThrow({
+    const project = await this._replica.project.findFirstOrThrow({
       select: {
         id: true,
         environments: {
@@ -59,7 +53,7 @@ export class EditSchedulePresenter {
       },
     });
 
-    const possibleTasks = await this.#prismaClient.backgroundWorkerTask.findMany({
+    const possibleTasks = await this._replica.backgroundWorkerTask.findMany({
       distinct: ["slug"],
       where: {
         projectId: project.id,
@@ -83,7 +77,7 @@ export class EditSchedulePresenter {
       return undefined;
     }
 
-    const schedule = await this.#prismaClient.taskSchedule.findFirst({
+    const schedule = await this._replica.taskSchedule.findFirst({
       select: {
         id: true,
         friendlyId: true,
diff --git a/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts b/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts
@@ -1,21 +1,15 @@
-import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { sortEnvironments } from "~/utils/environmentSort";
 import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
+import { BasePresenter } from "./basePresenter.server";
 
 type Result = Awaited<ReturnType<EnvironmentVariablesPresenter["call"]>>;
 export type EnvironmentVariableWithSetValues = Result["environmentVariables"][number];
 
-export class EnvironmentVariablesPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class EnvironmentVariablesPresenter extends BasePresenter {
   public async call({ userId, projectSlug }: { userId: User["id"]; projectSlug: Project["slug"] }) {
-    const project = await this.#prismaClient.project.findUnique({
+    const project = await this._replica.project.findUnique({
       select: {
         id: true,
       },
@@ -35,7 +29,7 @@ export class EnvironmentVariablesPresenter {
       throw new Error("Project not found");
     }
 
-    const environmentVariables = await this.#prismaClient.environmentVariable.findMany({
+    const environmentVariables = await this._replica.environmentVariable.findMany({
       select: {
         id: true,
         key: true,
@@ -65,7 +59,7 @@ export class EnvironmentVariablesPresenter {
       },
     });
 
-    const environments = await this.#prismaClient.runtimeEnvironment.findMany({
+    const environments = await this._replica.runtimeEnvironment.findMany({
       select: {
         id: true,
         type: true,
@@ -99,7 +93,7 @@ export class EnvironmentVariablesPresenter {
       (e) => e.orgMember?.userId === userId || e.orgMember === null
     );
 
-    const repository = new EnvironmentVariablesRepository(this.#prismaClient);
+    const repository = new EnvironmentVariablesRepository(this._replica);
     const variables = await repository.getProject(project.id);
 
     return {
diff --git a/apps/webapp/app/presenters/v3/RunPresenter.server.ts b/apps/webapp/app/presenters/v3/RunPresenter.server.ts
@@ -1,20 +1,14 @@
 import { millisecondsToNanoseconds } from "@trigger.dev/core/v3";
 import { createTreeFromFlatItems, flattenTree } from "~/components/primitives/TreeView/TreeView";
-import { PrismaClient, prisma } from "~/db.server";
 import { getUsername } from "~/utils/username";
 import { eventRepository } from "~/v3/eventRepository.server";
+import { BasePresenter } from "./basePresenter.server";
 
 type Result = Awaited<ReturnType<RunPresenter["call"]>>;
 export type Run = Result["run"];
 export type RunEvent = NonNullable<Result["trace"]>["events"][0];
 
-export class RunPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class RunPresenter extends BasePresenter {
   public async call({
     userId,
     projectSlug,
@@ -26,7 +20,7 @@ export class RunPresenter {
     organizationSlug: string;
     runFriendlyId: string;
   }) {
-    const run = await this.#prismaClient.taskRun.findFirstOrThrow({
+    const run = await this._replica.taskRun.findFirstOrThrow({
       select: {
         id: true,
         number: true,
diff --git a/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts b/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts
@@ -1,27 +1,21 @@
 import { TaskRun } from "@trigger.dev/database";
 import { eventStream } from "remix-utils/sse/server";
-import { PrismaClient, prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
 import { throttle } from "~/utils/throttle";
 import { eventRepository } from "~/v3/eventRepository.server";
+import { BasePresenter } from "./basePresenter.server";
 
 const pingInterval = 1000;
 
-export class RunStreamPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class RunStreamPresenter extends BasePresenter {
   public async call({
     request,
     runFriendlyId,
   }: {
     request: Request;
     runFriendlyId: TaskRun["friendlyId"];
   }) {
-    const run = await this.#prismaClient.taskRun.findUnique({
+    const run = await this._replica.taskRun.findUnique({
       where: {
         friendlyId: runFriendlyId,
       },
diff --git a/apps/webapp/app/presenters/v3/TaskPresenter.server.ts b/apps/webapp/app/presenters/v3/TaskPresenter.server.ts
@@ -1,15 +1,9 @@
 import { BackgroundWorkerTask } from "@trigger.dev/database";
-import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
+import { BasePresenter } from "./basePresenter.server";
 
-export class TaskPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class TaskPresenter extends BasePresenter {
   public async call({
     userId,
     taskFriendlyId,
@@ -19,7 +13,7 @@ export class TaskPresenter {
     taskFriendlyId: BackgroundWorkerTask["friendlyId"];
     projectSlug: Project["slug"];
   }) {
-    const task = await this.#prismaClient.backgroundWorkerTask.findFirst({
+    const task = await this._replica.backgroundWorkerTask.findFirst({
       select: {
         id: true,
         slug: true,
diff --git a/apps/webapp/app/presenters/v3/TasksStreamPresenter.server.ts b/apps/webapp/app/presenters/v3/TasksStreamPresenter.server.ts
@@ -16,10 +16,10 @@ type RunWithAttempts = {
 const pingInterval = 1000;
 
 export class TasksStreamPresenter {
-  #prismaClient: PrismaClient;
+  _replica: PrismaClient;
 
   constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
+    this._replica = prismaClient;
   }
 
   public async call({
@@ -33,7 +33,7 @@ export class TasksStreamPresenter {
     projectSlug: string;
     userId: string;
   }) {
-    const project = await this.#prismaClient.project.findUnique({
+    const project = await this._replica.project.findUnique({
       where: {
         slug: projectSlug,
         organization: {
diff --git a/apps/webapp/app/presenters/v3/TestPresenter.server.ts b/apps/webapp/app/presenters/v3/TestPresenter.server.ts
@@ -4,6 +4,7 @@ import { TestSearchParams } from "~/routes/_app.orgs.$organizationSlug.projects.
 import { sortEnvironments } from "~/utils/environmentSort";
 import { createSearchParams } from "~/utils/searchParams";
 import { findCurrentWorkerDeployment } from "~/v3/models/workerDeployment.server";
+import { BasePresenter } from "./basePresenter.server";
 
 type TaskListOptions = {
   userId: string;
@@ -15,16 +16,10 @@ export type TaskList = Awaited<ReturnType<TestPresenter["call"]>>;
 export type TaskListItem = NonNullable<TaskList["tasks"]>[0];
 export type SelectedEnvironment = NonNullable<TaskList["selectedEnvironment"]>;
 
-export class TestPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
-
+export class TestPresenter extends BasePresenter {
   public async call({ userId, projectSlug, url }: TaskListOptions) {
     // Find the project scoped to the organization
-    const project = await this.#prismaClient.project.findFirstOrThrow({
+    const project = await this._replica.project.findFirstOrThrow({
       select: {
         id: true,
         environments: {
@@ -107,7 +102,7 @@ export class TestPresenter {
 
   async #getTasks(envId: string, isDev: boolean) {
     if (isDev) {
-      return await this.#prismaClient.$queryRaw<
+      return await this._replica.$queryRaw<
         {
           id: string;
           version: string;
diff --git a/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts b/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts
diff --git a/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts b/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts
diff --git a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
