Inject application database contexts

src/db/repositories/circuit-device-row.repository.ts

@@ -1,16 +1,18 @@
 import { and, asc, eq, inArray } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { circuitDeviceRows } from "../schema/circuit-device-rows.js";
 import { circuitLists } from "../schema/circuit-lists.js";
 import { circuits } from "../schema/circuits.js";
 import { distributionBoards } from "../schema/distribution-boards.js";
 
 export class CircuitDeviceRowRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByCircuitList(circuitIds: string[]) {
     if (!circuitIds.length) {
       return [];
     }
-    return db
+    return this.database
       .select()
       .from(circuitDeviceRows)
       .where(inArray(circuitDeviceRows.circuitId, circuitIds))
@@ -18,7 +20,7 @@ export class CircuitDeviceRowRepository {
   }
 
   async listLinkedByProjectDevice(projectId: string, projectDeviceId: string) {
-    return db
+    return this.database
       .select({
         id: circuitDeviceRows.id,
         circuitId: circuitDeviceRows.circuitId,

src/db/repositories/circuit-list.repository.ts

@@ -1,13 +1,17 @@
 import { and, eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { circuitLists } from "../schema/circuit-lists.js";
 
 export class CircuitListRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByProject(projectId: string) {
+    const db = this.database;
     return db.select().from(circuitLists).where(eq(circuitLists.projectId, projectId));
   }
 
   async findById(projectId: string, circuitListId: string) {
+    const db = this.database;
     const [row] = await db
       .select()
       .from(circuitLists)

src/db/repositories/circuit-section.repository.ts

@@ -1,7 +1,7 @@
 import crypto from "node:crypto";
 import { and, asc, eq } from "drizzle-orm";
 import { defaultCircuitSectionDefinitions } from "../../domain/models/distribution-board-structure-project-command.model.js";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { circuitSections } from "../schema/circuit-sections.js";
 
 export function createDefaultCircuitSectionValues(circuitListId: string) {
@@ -13,12 +13,16 @@ export function createDefaultCircuitSectionValues(circuitListId: string) {
 }
 
 export class CircuitSectionRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async findById(sectionId: string) {
+    const db = this.database;
     const [row] = await db.select().from(circuitSections).where(eq(circuitSections.id, sectionId)).limit(1);
     return row ?? null;
   }
 
   async listByCircuitList(circuitListId: string) {
+    const db = this.database;
     return db
       .select()
       .from(circuitSections)
@@ -27,6 +31,7 @@ export class CircuitSectionRepository {
   }
 
   async createDefaults(circuitListId: string) {
+    const db = this.database;
     for (const entry of createDefaultCircuitSectionValues(circuitListId)) {
       const existing = await db
         .select({ id: circuitSections.id })

src/db/repositories/circuit.repository.ts

@@ -1,9 +1,12 @@
 import { asc, eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { circuits } from "../schema/circuits.js";
 
 export class CircuitRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByCircuitList(circuitListId: string) {
+    const db = this.database;
     return db
       .select()
       .from(circuits)
@@ -12,6 +15,7 @@ export class CircuitRepository {
   }
 
   async listBySection(sectionId: string) {
+    const db = this.database;
     return db
       .select()
       .from(circuits)

src/db/repositories/floor.repository.ts

@@ -1,9 +1,12 @@
 import { asc, eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { floors } from "../schema/floors.js";
 
 export class FloorRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByProject(projectId: string) {
+    const db = this.database;
     return db
       .select()
       .from(floors)

src/db/repositories/global-device.repository.ts

@@ -1,6 +1,6 @@
 import crypto from "node:crypto";
 import { eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { globalDevices } from "../schema/global-devices.js";
 import type {
   CreateGlobalDeviceInput,
@@ -8,11 +8,15 @@ import type {
 } from "../../shared/validation/global-device.schemas.js";
 
 export class GlobalDeviceRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async list() {
+    const db = this.database;
     return db.select().from(globalDevices);
   }
 
   async create(input: CreateGlobalDeviceInput) {
+    const db = this.database;
     const id = crypto.randomUUID();
     await db.insert(globalDevices).values({
       id,
@@ -31,6 +35,7 @@ export class GlobalDeviceRepository {
   }
 
   async update(globalDeviceId: string, input: UpdateGlobalDeviceInput) {
+    const db = this.database;
     await db
       .update(globalDevices)
       .set({
@@ -49,11 +54,13 @@ export class GlobalDeviceRepository {
   }
 
   async findById(globalDeviceId: string) {
+    const db = this.database;
     const [row] = await db.select().from(globalDevices).where(eq(globalDevices.id, globalDeviceId)).limit(1);
     return row ?? null;
   }
 
   async delete(globalDeviceId: string) {
+    const db = this.database;
     await db.delete(globalDevices).where(eq(globalDevices.id, globalDeviceId));
   }
 }

src/db/repositories/project-device.repository.ts

@@ -1,5 +1,5 @@
 import { and, eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { projectDevices } from "../schema/project-devices.js";
 import { calculateRowTotalPower } from "../../domain/calculations/circuit-power-calculation.js";
 
@@ -11,12 +11,16 @@ function withTotalPower(row: typeof projectDevices.$inferSelect) {
 }
 
 export class ProjectDeviceRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByProject(projectId: string) {
+    const db = this.database;
     const rows = await db.select().from(projectDevices).where(eq(projectDevices.projectId, projectId));
     return rows.map(withTotalPower);
   }
 
   async findById(projectId: string, projectDeviceId: string) {
+    const db = this.database;
     const [row] = await db
       .select()
       .from(projectDevices)

src/db/repositories/project.repository.ts

@@ -1,17 +1,21 @@
 import crypto from "node:crypto";
 import { eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { projects } from "../schema/projects.js";
 import type {
   CreateProjectInput,
 } from "../../shared/validation/project-structure.schemas.js";
 
 export class ProjectRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async list() {
+    const db = this.database;
     return db.select().from(projects);
   }
 
   async create(input: CreateProjectInput) {
+    const db = this.database;
     const id = crypto.randomUUID();
     const project = {
       id,
@@ -25,6 +29,7 @@ export class ProjectRepository {
   }
 
   async findById(projectId: string) {
+    const db = this.database;
     const [row] = await db.select().from(projects).where(eq(projects.id, projectId)).limit(1);
     return row ?? null;
   }

src/db/repositories/room.repository.ts

@@ -1,9 +1,12 @@
 import { asc, eq } from "drizzle-orm";
-import { db } from "../client.js";
+import type { AppDatabase } from "../database-context.js";
 import { rooms } from "../schema/rooms.js";
 
 export class RoomRepository {
+  constructor(private readonly database: AppDatabase) {}
+
   async listByProject(projectId: string) {
+    const db = this.database;
     return db
       .select()
       .from(rooms)

src/server/composition/application-repositories.ts

@@ -0,0 +1,24 @@
+import { db } from "../../db/client.js";
+import { CircuitDeviceRowRepository } from "../../db/repositories/circuit-device-row.repository.js";
+import { CircuitListRepository } from "../../db/repositories/circuit-list.repository.js";
+import { CircuitSectionRepository } from "../../db/repositories/circuit-section.repository.js";
+import { CircuitRepository } from "../../db/repositories/circuit.repository.js";
+import { DistributionBoardRepository } from "../../db/repositories/distribution-board.repository.js";
+import { FloorRepository } from "../../db/repositories/floor.repository.js";
+import { GlobalDeviceRepository } from "../../db/repositories/global-device.repository.js";
+import { ProjectDeviceRepository } from "../../db/repositories/project-device.repository.js";
+import { ProjectRepository } from "../../db/repositories/project.repository.js";
+import { RoomRepository } from "../../db/repositories/room.repository.js";
+
+export const circuitDeviceRowRepository =
+  new CircuitDeviceRowRepository(db);
+export const circuitListRepository = new CircuitListRepository(db);
+export const circuitSectionRepository = new CircuitSectionRepository(db);
+export const circuitRepository = new CircuitRepository(db);
+export const distributionBoardRepository =
+  new DistributionBoardRepository(db);
+export const floorRepository = new FloorRepository(db);
+export const globalDeviceRepository = new GlobalDeviceRepository(db);
+export const projectDeviceRepository = new ProjectDeviceRepository(db);
+export const projectRepository = new ProjectRepository(db);
+export const roomRepository = new RoomRepository(db);

src/server/composition/circuit-numbering-service.ts

@@ -1,8 +1,10 @@
-import { CircuitRepository } from "../../db/repositories/circuit.repository.js";
-import { CircuitSectionRepository } from "../../db/repositories/circuit-section.repository.js";
 import { CircuitNumberingService } from "../../domain/services/circuit-numbering.service.js";
+import {
+  circuitRepository,
+  circuitSectionRepository,
+} from "./application-repositories.js";
 
 export const circuitNumberingService = new CircuitNumberingService({
-  sectionRepository: new CircuitSectionRepository(),
-  circuitRepository: new CircuitRepository(),
+  sectionRepository: circuitSectionRepository,
+  circuitRepository,
 });

src/server/composition/project-device-sync-service.ts

@@ -1,8 +1,10 @@
-import { CircuitDeviceRowRepository } from "../../db/repositories/circuit-device-row.repository.js";
-import { ProjectDeviceRepository } from "../../db/repositories/project-device.repository.js";
 import { ProjectDeviceSyncService } from "../../domain/services/project-device-sync.service.js";
+import {
+  circuitDeviceRowRepository,
+  projectDeviceRepository,
+} from "./application-repositories.js";
 
 export const projectDeviceSyncService = new ProjectDeviceSyncService({
-  projectDeviceRepository: new ProjectDeviceRepository(),
-  deviceRowRepository: new CircuitDeviceRowRepository(),
+  projectDeviceRepository,
+  deviceRowRepository: circuitDeviceRowRepository,
 });

src/server/controllers/circuit-list.controller.ts

@@ -1,7 +1,5 @@
 import type { Request, Response } from "express";
-import { CircuitListRepository } from "../../db/repositories/circuit-list.repository.js";
-
-const circuitListRepository = new CircuitListRepository();
+import { circuitListRepository } from "../composition/application-repositories.js";
 
 export async function listCircuitListsByProject(req: Request, res: Response) {
   const { projectId } = req.params;

src/server/controllers/circuit-tree.controller.ts

@@ -1,20 +1,16 @@
 import type { Request, Response } from "express";
-import { CircuitRepository } from "../../db/repositories/circuit.repository.js";
-import { CircuitDeviceRowRepository } from "../../db/repositories/circuit-device-row.repository.js";
-import { CircuitListRepository } from "../../db/repositories/circuit-list.repository.js";
-import { CircuitSectionRepository } from "../../db/repositories/circuit-section.repository.js";
-import { ProjectRepository } from "../../db/repositories/project.repository.js";
 import {
   calculateCircuitTotalPower,
   calculateRowTotalPower,
 } from "../../domain/calculations/circuit-power-calculation.js";
 import type { CircuitTreeResponse } from "../../domain/models/circuit-tree.model.js";
-
-const circuitListRepository = new CircuitListRepository();
-const circuitSectionRepository = new CircuitSectionRepository();
-const circuitRepository = new CircuitRepository();
-const circuitDeviceRowRepository = new CircuitDeviceRowRepository();
-const projectRepository = new ProjectRepository();
+import {
+  circuitDeviceRowRepository,
+  circuitListRepository,
+  circuitRepository,
+  circuitSectionRepository,
+  projectRepository,
+} from "../composition/application-repositories.js";
 
 export function isMissingCircuitTreeSchemaError(error: unknown): boolean {
   if (!(error instanceof Error)) {

src/server/controllers/distribution-board.controller.ts

@@ -1,16 +1,13 @@
 import type { Request, Response } from "express";
-import { db } from "../../db/client.js";
-import { DistributionBoardRepository } from "../../db/repositories/distribution-board.repository.js";
 import {
   createDistributionBoardInsertProjectCommand,
   createDistributionBoardStructureSnapshot,
 } from "../../domain/models/distribution-board-structure-project-command.model.js";
 import { createDistributionBoardSchema } from "../../shared/validation/project-structure.schemas.js";
 import { projectCommandService } from "../composition/project-command-stores.js";
+import { distributionBoardRepository } from "../composition/application-repositories.js";
 import { respondWithProjectCommandError } from "./project-command.controller.js";
 
-const distributionBoardRepository = new DistributionBoardRepository(db);
-
 export async function listDistributionBoardsByProject(req: Request, res: Response) {
   const { projectId } = req.params;
   if (typeof projectId !== "string") {

src/server/controllers/floor.controller.ts

@@ -1,15 +1,13 @@
 import type { Request, Response } from "express";
-import { FloorRepository } from "../../db/repositories/floor.repository.js";
 import {
   createProjectFloorInsertProjectCommand,
   createProjectFloorSnapshot,
 } from "../../domain/models/project-location-structure-project-command.model.js";
 import { createFloorSchema } from "../../shared/validation/project-structure.schemas.js";
 import { projectCommandService } from "../composition/project-command-stores.js";
+import { floorRepository } from "../composition/application-repositories.js";
 import { respondWithProjectCommandError } from "./project-command.controller.js";
 
-const floorRepository = new FloorRepository();
-
 export async function listFloorsByProject(req: Request, res: Response) {
   const { projectId } = req.params;
   if (typeof projectId !== "string") {

src/server/controllers/global-device.controller.ts

@@ -1,13 +1,12 @@
 import type { Request, Response } from "express";
-import { GlobalDeviceRepository } from "../../db/repositories/global-device.repository.js";
-import { ProjectDeviceRepository } from "../../db/repositories/project-device.repository.js";
 import {
   createGlobalDeviceSchema,
   updateGlobalDeviceSchema,
 } from "../../shared/validation/global-device.schemas.js";
-
-const globalDeviceRepository = new GlobalDeviceRepository();
-const projectDeviceRepository = new ProjectDeviceRepository();
+import {
+  globalDeviceRepository,
+  projectDeviceRepository,
+} from "../composition/application-repositories.js";
 
 export async function listGlobalDevices(_req: Request, res: Response) {
   const rows = await globalDeviceRepository.list();

src/server/controllers/project-device.controller.ts

@@ -1,7 +1,5 @@
 import { randomUUID } from "node:crypto";
 import type { Request, Response } from "express";
-import { GlobalDeviceRepository } from "../../db/repositories/global-device.repository.js";
-import { ProjectDeviceRepository } from "../../db/repositories/project-device.repository.js";
 import { createProjectDeviceUpdateProjectCommand } from "../../domain/models/project-device-project-command.model.js";
 import {
   createProjectDeviceDeleteProjectCommand,
@@ -10,6 +8,10 @@ import {
 } from "../../domain/models/project-device-structure-project-command.model.js";
 import { projectDeviceSyncService } from "../composition/project-device-sync-service.js";
 import { projectCommandService } from "../composition/project-command-stores.js";
+import {
+  globalDeviceRepository,
+  projectDeviceRepository,
+} from "../composition/application-repositories.js";
 import {
   createProjectDeviceCommandSchema,
   disconnectProjectDeviceRowsSchema,
@@ -20,8 +22,6 @@ import {
 import type { CreateProjectDeviceInput } from "../../shared/validation/project-device.schemas.js";
 import { respondWithProjectCommandError } from "./project-command.controller.js";
 
-const globalDeviceRepository = new GlobalDeviceRepository();
-const projectDeviceRepository = new ProjectDeviceRepository();
 export async function listProjectDevicesByProject(req: Request, res: Response) {
   const { projectId } = req.params;
   if (typeof projectId !== "string") {

src/server/controllers/project.controller.ts

@@ -1,15 +1,13 @@
 import type { Request, Response } from "express";
-import { ProjectRepository } from "../../db/repositories/project.repository.js";
 import {
   createProjectSchema,
   updateProjectSettingsSchema,
 } from "../../shared/validation/project-structure.schemas.js";
 import { createProjectSettingsUpdateProjectCommand } from "../../domain/models/project-settings-project-command.model.js";
 import { projectCommandService } from "../composition/project-command-stores.js";
+import { projectRepository } from "../composition/application-repositories.js";
 import { respondWithProjectCommandError } from "./project-command.controller.js";
 
-const projectRepository = new ProjectRepository();
-
 export async function listProjects(_req: Request, res: Response) {
   const result = await projectRepository.list();
   res.json(result);

src/server/controllers/room.controller.ts

@@ -1,15 +1,13 @@
 import type { Request, Response } from "express";
-import { RoomRepository } from "../../db/repositories/room.repository.js";
 import {
   createProjectRoomInsertProjectCommand,
   createProjectRoomSnapshot,
 } from "../../domain/models/project-location-structure-project-command.model.js";
 import { createRoomSchema } from "../../shared/validation/project-structure.schemas.js";
 import { projectCommandService } from "../composition/project-command-stores.js";
+import { roomRepository } from "../composition/application-repositories.js";
 import { respondWithProjectCommandError } from "./project-command.controller.js";
 
-const roomRepository = new RoomRepository();
-
 export async function listRoomsByProject(req: Request, res: Response) {
   const { projectId } = req.params;
   if (typeof projectId !== "string") {