Skip to content

Commit 6244106

Browse files
committed
refactor(webapp): replace runsRepositoryFactory with direct RunsRepository instantiation
1 parent e362f07 commit 6244106

File tree

6 files changed

+13
-109
lines changed

6 files changed

+13
-109
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type PrismaClient } from "@trigger.dev/database";
22
import { CreateBulkActionSearchParams } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
33
import { clickhouseClient } from "~/services/clickhouseInstance.server";
4-
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
4+
import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
55
import { getRunFiltersFromRequest } from "../RunFilters.server";
66
import { BasePresenter } from "./basePresenter.server";
77

@@ -24,7 +24,7 @@ export class CreateBulkActionPresenter extends BasePresenter {
2424
Object.fromEntries(new URL(request.url).searchParams)
2525
);
2626

27-
const runsRepository = createRunsRepository({
27+
const runsRepository = new RunsRepository({
2828
clickhouse: clickhouseClient,
2929
prisma: this._replica as PrismaClient,
3030
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { type Direction } from "~/components/ListPagination";
99
import { timeFilters } from "~/components/runs/v3/SharedFilters";
1010
import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
1111
import { getAllTaskIdentifiers } from "~/models/task.server";
12-
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
12+
import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
1313
import { machinePresetFromRun } from "~/v3/machinePresets.server";
1414
import { ServiceValidationError } from "~/v3/services/baseService.server";
1515
import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
@@ -153,7 +153,7 @@ export class NextRunListPresenter {
153153
throw new ServiceValidationError("No environment found");
154154
}
155155

156-
const runsRepository = createRunsRepository({
156+
const runsRepository = new RunsRepository({
157157
clickhouse: this.clickhouse,
158158
prisma: this.replica as PrismaClient,
159159
});

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { startActiveSpan } from "~/v3/tracer.server";
1313
import { logger } from "../logger.server";
1414
import { ClickHouseRunsRepository } from "./clickhouseRunsRepository.server";
1515
import { PostgresRunsRepository } from "./postgresRunsRepository.server";
16+
import { env } from "~/env.server";
1617

1718
export type RunsRepositoryOptions = {
1819
clickhouse: ClickHouse;
@@ -130,7 +131,11 @@ export class RunsRepository implements IRunsRepository {
130131
) {
131132
this.clickHouseRunsRepository = new ClickHouseRunsRepository(options);
132133
this.postgresRunsRepository = new PostgresRunsRepository(options);
133-
this.defaultRepository = options.defaultRepository ?? "clickhouse";
134+
this.defaultRepository =
135+
options.defaultRepository ??
136+
((env.RUN_REPLICATION_ENABLED === "1" && env.RUN_REPLICATION_CLICKHOUSE_URL)
137+
? "clickhouse"
138+
: "postgres");
134139
this.logger = options.logger ?? logger;
135140
}
136141

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {
88
import { getRunFiltersFromRequest } from "~/presenters/RunFilters.server";
99
import { type CreateBulkActionPayload } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
1010
import { clickhouseClient } from "~/services/clickhouseInstance.server";
11-
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
1211
import {
1312
parseRunListInputOptions,
1413
type RunListInputFilters,
14+
RunsRepository,
1515
} from "~/services/runsRepository/runsRepository.server";
1616
import { BaseService } from "../baseService.server";
1717
import { commonWorker } from "~/v3/commonWorker.server";
@@ -38,7 +38,7 @@ export class BulkActionService extends BaseService {
3838
const filters = await getFilters(payload, request);
3939

4040
// Count the runs that will be affected by the bulk action
41-
const runsRepository = createRunsRepository({
41+
const runsRepository = new RunsRepository({
4242
clickhouse: clickhouseClient,
4343
prisma: this._replica as PrismaClient,
4444
});
@@ -145,7 +145,7 @@ export class BulkActionService extends BaseService {
145145
...(group.params && typeof group.params === "object" ? group.params : {}),
146146
});
147147

148-
const runsRepository = createRunsRepository({
148+
const runsRepository = new RunsRepository({
149149
clickhouse: clickhouseClient,
150150
prisma: this._replica as PrismaClient,
151151
});

apps/webapp/test/runsRepositoryFactory.test.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)