Added 1B, 2 and added bootstrap again for site

src/db/migrations/meta/_journal.json

@@ -57,6 +57,13 @@
       "when": 1777680000000,
       "tag": "0007_consumer_device_link",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "6",
+      "when": 1777800000000,
+      "tag": "0008_circuit_first_model",
+      "breakpoints": true
     }
   ]
 }

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

@@ -1,9 +1,19 @@
 import crypto from "node:crypto";
-import { asc, inArray } from "drizzle-orm";
+import { asc, eq, inArray } from "drizzle-orm";
 import { db } from "../client.js";
 import { circuitDeviceRows } from "../schema/circuit-device-rows.js";
 
 export class CircuitDeviceRowRepository {
+  async findById(rowId: string) {
+    const [row] = await db.select().from(circuitDeviceRows).where(eq(circuitDeviceRows.id, rowId)).limit(1);
+    return row ?? null;
+  }
+
+  async countByCircuit(circuitId: string) {
+    const rows = await db.select({ id: circuitDeviceRows.id }).from(circuitDeviceRows).where(eq(circuitDeviceRows.circuitId, circuitId));
+    return rows.length;
+  }
+
   async listByCircuitList(circuitIds: string[]) {
     if (!circuitIds.length) {
       return [];
@@ -26,6 +36,7 @@ export class CircuitDeviceRowRepository {
     connectionKind?: string;
     costGroup?: string;
     category?: string;
+    level?: string;
     roomId?: string;
     roomNumberSnapshot?: string;
     roomNameSnapshot?: string;
@@ -34,9 +45,11 @@ export class CircuitDeviceRowRepository {
     simultaneityFactor: number;
     cosPhi?: number;
     remark?: string;
+    overriddenFields?: string;
   }) {
+    const id = crypto.randomUUID();
     await db.insert(circuitDeviceRows).values({
-      id: crypto.randomUUID(),
+      id,
       circuitId: input.circuitId,
       linkedProjectDeviceId: input.linkedProjectDeviceId ?? null,
       legacyConsumerId: input.legacyConsumerId ?? null,
@@ -47,6 +60,7 @@ export class CircuitDeviceRowRepository {
       connectionKind: input.connectionKind ?? null,
       costGroup: input.costGroup ?? null,
       category: input.category ?? null,
+      level: input.level ?? null,
       roomId: input.roomId ?? null,
       roomNumberSnapshot: input.roomNumberSnapshot ?? null,
       roomNameSnapshot: input.roomNameSnapshot ?? null,
@@ -55,7 +69,58 @@ export class CircuitDeviceRowRepository {
       simultaneityFactor: input.simultaneityFactor,
       cosPhi: input.cosPhi ?? null,
       remark: input.remark ?? null,
-      overriddenFields: null,
+      overriddenFields: input.overriddenFields ?? null,
     });
+    return id;
+  }
+
+  async update(
+    rowId: string,
+    input: {
+      linkedProjectDeviceId?: string;
+      name: string;
+      displayName: string;
+      phaseType?: string;
+      connectionKind?: string;
+      costGroup?: string;
+      category?: string;
+      level?: string;
+      roomId?: string;
+      roomNumberSnapshot?: string;
+      roomNameSnapshot?: string;
+      quantity: number;
+      powerPerUnit: number;
+      simultaneityFactor: number;
+      cosPhi?: number;
+      remark?: string;
+      overriddenFields?: string;
+    }
+  ) {
+    await db
+      .update(circuitDeviceRows)
+      .set({
+        linkedProjectDeviceId: input.linkedProjectDeviceId ?? null,
+        name: input.name,
+        displayName: input.displayName,
+        phaseType: input.phaseType ?? null,
+        connectionKind: input.connectionKind ?? null,
+        costGroup: input.costGroup ?? null,
+        category: input.category ?? null,
+        level: input.level ?? null,
+        roomId: input.roomId ?? null,
+        roomNumberSnapshot: input.roomNumberSnapshot ?? null,
+        roomNameSnapshot: input.roomNameSnapshot ?? null,
+        quantity: input.quantity,
+        powerPerUnit: input.powerPerUnit,
+        simultaneityFactor: input.simultaneityFactor,
+        cosPhi: input.cosPhi ?? null,
+        remark: input.remark ?? null,
+        overriddenFields: input.overriddenFields ?? null,
+      })
+      .where(eq(circuitDeviceRows.id, rowId));
+  }
+
+  async delete(rowId: string) {
+    await db.delete(circuitDeviceRows).where(eq(circuitDeviceRows.id, rowId));
   }
 }

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

@@ -53,4 +53,13 @@ export class CircuitListRepository {
       .limit(1);
     return row ?? null;
   }
+
+  async findByIdByListIdOnly(circuitListId: string) {
+    const [row] = await db
+      .select()
+      .from(circuitLists)
+      .where(eq(circuitLists.id, circuitListId))
+      .limit(1);
+    return row ?? null;
+  }
 }

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

@@ -4,6 +4,11 @@ import { db } from "../client.js";
 import { circuitSections } from "../schema/circuit-sections.js";
 
 export class CircuitSectionRepository {
+  async findById(sectionId: string) {
+    const [row] = await db.select().from(circuitSections).where(eq(circuitSections.id, sectionId)).limit(1);
+    return row ?? null;
+  }
+
   async listByCircuitList(circuitListId: string) {
     return db
       .select()
@@ -39,4 +44,3 @@ export class CircuitSectionRepository {
     }
   }
 }
-

src/db/repositories/circuit.repository.ts

@@ -1,9 +1,14 @@
 import crypto from "node:crypto";
-import { asc, eq } from "drizzle-orm";
+import { and, asc, eq, ne } from "drizzle-orm";
 import { db } from "../client.js";
 import { circuits } from "../schema/circuits.js";
 
 export class CircuitRepository {
+  async findById(circuitId: string) {
+    const [row] = await db.select().from(circuits).where(eq(circuits.id, circuitId)).limit(1);
+    return row ?? null;
+  }
+
   async listByCircuitList(circuitListId: string) {
     return db
       .select()
@@ -26,6 +31,10 @@ export class CircuitRepository {
     cableLength?: number;
     voltage?: number;
     remark?: string;
+    rcdAssignment?: string;
+    terminalDesignation?: string;
+    status?: string;
+    isReserve?: boolean;
   }) {
     const id = crypto.randomUUID();
     await db.insert(circuits).values({
@@ -41,10 +50,86 @@ export class CircuitRepository {
       cableType: input.cableType ?? null,
       cableCrossSection: input.cableCrossSection ?? null,
       cableLength: input.cableLength ?? null,
+      rcdAssignment: input.rcdAssignment ?? null,
+      terminalDesignation: input.terminalDesignation ?? null,
       voltage: input.voltage ?? null,
+      status: input.status ?? null,
+      isReserve: input.isReserve ? 1 : 0,
       remark: input.remark ?? null,
     });
     return id;
   }
-}
 
+  async update(
+    circuitId: string,
+    input: {
+      sectionId: string;
+      equipmentIdentifier: string;
+      displayName?: string;
+      sortOrder: number;
+      protectionType?: string;
+      protectionRatedCurrent?: number;
+      protectionCharacteristic?: string;
+      cableType?: string;
+      cableCrossSection?: string;
+      cableLength?: number;
+      rcdAssignment?: string;
+      terminalDesignation?: string;
+      voltage?: number;
+      status?: string;
+      isReserve: boolean;
+      remark?: string;
+    }
+  ) {
+    await db
+      .update(circuits)
+      .set({
+        sectionId: input.sectionId,
+        equipmentIdentifier: input.equipmentIdentifier,
+        displayName: input.displayName ?? null,
+        sortOrder: input.sortOrder,
+        protectionType: input.protectionType ?? null,
+        protectionRatedCurrent: input.protectionRatedCurrent ?? null,
+        protectionCharacteristic: input.protectionCharacteristic ?? null,
+        cableType: input.cableType ?? null,
+        cableCrossSection: input.cableCrossSection ?? null,
+        cableLength: input.cableLength ?? null,
+        rcdAssignment: input.rcdAssignment ?? null,
+        terminalDesignation: input.terminalDesignation ?? null,
+        voltage: input.voltage ?? null,
+        status: input.status ?? null,
+        isReserve: input.isReserve ? 1 : 0,
+        remark: input.remark ?? null,
+      })
+      .where(eq(circuits.id, circuitId));
+  }
+
+  async delete(circuitId: string) {
+    await db.delete(circuits).where(eq(circuits.id, circuitId));
+  }
+
+  async existsByEquipmentIdentifier(circuitListId: string, equipmentIdentifier: string, excludeCircuitId?: string) {
+    const rows = await db
+      .select({ id: circuits.id })
+      .from(circuits)
+      .where(
+        excludeCircuitId
+          ? and(
+              eq(circuits.circuitListId, circuitListId),
+              eq(circuits.equipmentIdentifier, equipmentIdentifier),
+              ne(circuits.id, excludeCircuitId)
+            )
+          : and(eq(circuits.circuitListId, circuitListId), eq(circuits.equipmentIdentifier, equipmentIdentifier))
+      )
+      .limit(1);
+    return Boolean(rows.length);
+  }
+
+  async listBySection(sectionId: string) {
+    return db
+      .select()
+      .from(circuits)
+      .where(eq(circuits.sectionId, sectionId))
+      .orderBy(asc(circuits.sortOrder), asc(circuits.equipmentIdentifier));
+  }
+}