Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type PrismaClient } from "@trigger.dev/database";
import { CreateBulkActionSearchParams } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
import { clickhouseClient } from "~/services/clickhouseInstance.server";
import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
import { getRunFiltersFromRequest } from "../RunFilters.server";
import { BasePresenter } from "./basePresenter.server";

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

const runsRepository = new RunsRepository({
const runsRepository = createRunsRepository({
clickhouse: clickhouseClient,
prisma: this._replica as PrismaClient,
});
Expand Down
4 changes: 2 additions & 2 deletions apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { type Direction } from "~/components/ListPagination";
import { timeFilters } from "~/components/runs/v3/SharedFilters";
import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
import { getAllTaskIdentifiers } from "~/models/task.server";
import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
import { machinePresetFromRun } from "~/v3/machinePresets.server";
import { ServiceValidationError } from "~/v3/services/baseService.server";
import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
Expand Down Expand Up @@ -153,7 +153,7 @@ export class NextRunListPresenter {
throw new ServiceValidationError("No environment found");
}

const runsRepository = new RunsRepository({
const runsRepository = createRunsRepository({
clickhouse: this.clickhouse,
prisma: this.replica as PrismaClient,
});
Expand Down
22 changes: 22 additions & 0 deletions apps/webapp/app/services/runsRepositoryFactory.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { ClickHouse } from "@internal/clickhouse";
import type { PrismaClient } from "@trigger.dev/database";
import { env } from "~/env.server";
import { RunsRepository } from "./runsRepository/runsRepository.server";

export function createRunsRepository(options: {
clickhouse: ClickHouse;
prisma: PrismaClient;
}): RunsRepository {
const isReplicationEnabled = env.RUN_REPLICATION_ENABLED === "1";
const isClickHouseConfigured = !!env.RUN_REPLICATION_CLICKHOUSE_URL;

const defaultRepository = isReplicationEnabled && isClickHouseConfigured
? "clickhouse"
: "postgres";

return new RunsRepository({
...options,
defaultRepository,
});
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

6 changes: 3 additions & 3 deletions apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
import { getRunFiltersFromRequest } from "~/presenters/RunFilters.server";
import { type CreateBulkActionPayload } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
import { clickhouseClient } from "~/services/clickhouseInstance.server";
import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
import {
parseRunListInputOptions,
type RunListInputFilters,
RunsRepository,
} from "~/services/runsRepository/runsRepository.server";
import { BaseService } from "../baseService.server";
import { commonWorker } from "~/v3/commonWorker.server";
Expand All @@ -38,7 +38,7 @@ export class BulkActionService extends BaseService {
const filters = await getFilters(payload, request);

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

const runsRepository = new RunsRepository({
const runsRepository = createRunsRepository({
clickhouse: clickhouseClient,
prisma: this._replica as PrismaClient,
});
Expand Down
86 changes: 86 additions & 0 deletions apps/webapp/test/runsRepositoryFactory.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
vi.mock("~/env.server", () => ({
env: {},
}));
vi.mock("~/db.server", () => ({
prisma: {},
$replica: {},
}));

import { createRunsRepository } from "~/services/runsRepositoryFactory.server";
import type { ClickHouse } from "@internal/clickhouse";
import type { PrismaClient } from "@trigger.dev/database";

describe("createRunsRepository", () => {
let mockClickhouse: ClickHouse;
let mockPrisma: PrismaClient;
let originalEnv: Record<string, unknown>;

beforeEach(async () => {
const envModule = await import("~/env.server");
originalEnv = { ...envModule.env };

mockClickhouse = {} as ClickHouse;
mockPrisma = {} as PrismaClient;
});

afterEach(async () => {
const envModule = await import("~/env.server");
Object.assign(envModule.env, originalEnv);
});

it("should default to postgres when RUN_REPLICATION_ENABLED is not set", async () => {
const envModule = await import("~/env.server");
envModule.env.RUN_REPLICATION_ENABLED = "0";
envModule.env.RUN_REPLICATION_CLICKHOUSE_URL = "http://localhost:8123";

const repository = createRunsRepository({
clickhouse: mockClickhouse,
prisma: mockPrisma,
});

expect(repository).toBeDefined();
expect(repository.listRuns).toBeDefined();
});

it("should default to postgres when RUN_REPLICATION_CLICKHOUSE_URL is not set", async () => {
const envModule = await import("~/env.server");
envModule.env.RUN_REPLICATION_ENABLED = "1";
envModule.env.RUN_REPLICATION_CLICKHOUSE_URL = undefined;

const repository = createRunsRepository({
clickhouse: mockClickhouse,
prisma: mockPrisma,
});

expect(repository).toBeDefined();
expect(repository.listRuns).toBeDefined();
});

it("should default to clickhouse when both conditions are met", async () => {
const envModule = await import("~/env.server");
envModule.env.RUN_REPLICATION_ENABLED = "1";
envModule.env.RUN_REPLICATION_CLICKHOUSE_URL = "http://localhost:8123";

const repository = createRunsRepository({
clickhouse: mockClickhouse,
prisma: mockPrisma,
});

expect(repository).toBeDefined();
expect(repository.listRuns).toBeDefined();
});

it("should create a valid RunsRepository instance", () => {
const repository = createRunsRepository({
clickhouse: mockClickhouse,
prisma: mockPrisma,
});

expect(repository.listRuns).toBeDefined();
expect(repository.countRuns).toBeDefined();
expect(typeof repository.listRuns).toBe("function");
expect(typeof repository.countRuns).toBe("function");
});
});

Loading