Make initial circuit creation atomic

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

@@ -3,10 +3,12 @@ import { and, eq } from "drizzle-orm";
 import type {
   CircuitDeviceRowTransactionStore,
   CreateCircuitDeviceRowTransactionInput,
+  CreateCircuitWithDeviceRowsTransactionInput,
 } from "../../domain/ports/circuit-device-row-transaction.store.js";
 import type { AppDatabase } from "../database-context.js";
 import { circuitDeviceRows } from "../schema/circuit-device-rows.js";
 import { circuits } from "../schema/circuits.js";
+import { toCircuitCreateValues } from "./circuit.persistence.js";
 import {
   toCircuitDeviceRowCreateValues,
 } from "./circuit-device-row.persistence.js";
@@ -53,6 +55,42 @@ export class CircuitDeviceRowTransactionRepository
     return id;
   }
 
+  createCircuitWithDeviceRows(input: CreateCircuitWithDeviceRowsTransactionInput) {
+    if (input.deviceRows.length === 0) {
+      throw new Error("Mindestens eine Gerätezeile ist erforderlich.");
+    }
+
+    const circuitId = crypto.randomUUID();
+    const rowIds = input.deviceRows.map(() => crypto.randomUUID());
+    this.database.transaction((tx) => {
+      tx
+        .insert(circuits)
+        .values(
+          toCircuitCreateValues(circuitId, {
+            ...input.circuit,
+            isReserve: false,
+          })
+        )
+        .run();
+
+      for (let index = 0; index < input.deviceRows.length; index += 1) {
+        const row = input.deviceRows[index];
+        tx
+          .insert(circuitDeviceRows)
+          .values(
+            toCircuitDeviceRowCreateValues(rowIds[index], {
+              ...row,
+              circuitId,
+              sortOrder: row.sortOrder ?? (index + 1) * 10,
+            })
+          )
+          .run();
+      }
+    });
+
+    return { circuitId, rowIds };
+  }
+
   deleteFromCircuit(rowId: string, expectedCircuitId: string) {
     this.database.transaction((tx) => {
       const [row] = tx

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

@@ -13,11 +13,6 @@ import {
   type CircuitDeviceRowPatchInput,
   type CircuitDeviceRowUpdateInput,
 } from "./circuit-device-row.persistence.js";
-import {
-  toCircuitCreateValues,
-  type CircuitCreatePersistenceInput,
-} from "./circuit.repository.js";
-
 export type {
   CircuitDeviceRowCreateInput,
   CircuitDeviceRowPatchInput,
@@ -37,13 +32,6 @@ export interface CircuitDeviceRowsBulkMoveInput {
   };
 }
 
-export interface CircuitWithDeviceRowsCreateInput {
-  circuit: CircuitCreatePersistenceInput;
-  deviceRows: Array<
-    Omit<CircuitDeviceRowCreateInput, "circuitId" | "sortOrder"> & { sortOrder?: number }
-  >;
-}
-
 export class CircuitDeviceRowRepository {
   async findById(rowId: string) {
     const [row] = await db.select().from(circuitDeviceRows).where(eq(circuitDeviceRows.id, rowId)).limit(1);
@@ -131,42 +119,6 @@ export class CircuitDeviceRowRepository {
     return id;
   }
 
-  createCircuitWithDeviceRowsTransactional(input: CircuitWithDeviceRowsCreateInput) {
-    if (input.deviceRows.length === 0) {
-      throw new Error("Mindestens eine Gerätezeile ist erforderlich.");
-    }
-
-    const circuitId = crypto.randomUUID();
-    const rowIds = input.deviceRows.map(() => crypto.randomUUID());
-    db.transaction((tx) => {
-      tx
-        .insert(circuits)
-        .values(
-          toCircuitCreateValues(circuitId, {
-            ...input.circuit,
-            isReserve: false,
-          })
-        )
-        .run();
-
-      for (let index = 0; index < input.deviceRows.length; index += 1) {
-        const row = input.deviceRows[index];
-        tx
-          .insert(circuitDeviceRows)
-          .values(
-            toCircuitDeviceRowCreateValues(rowIds[index], {
-              ...row,
-              circuitId,
-              sortOrder: row.sortOrder ?? (index + 1) * 10,
-            })
-          )
-          .run();
-      }
-    });
-
-    return { circuitId, rowIds };
-  }
-
   async update(
     rowId: string,
     input: CircuitDeviceRowUpdateInput

src/db/repositories/circuit.persistence.ts

@@ -0,0 +1,44 @@
+export interface CircuitCreatePersistenceInput {
+  circuitListId: string;
+  sectionId: string;
+  equipmentIdentifier: string;
+  displayName?: string;
+  sortOrder: number;
+  protectionType?: string;
+  protectionRatedCurrent?: number;
+  protectionCharacteristic?: string;
+  cableType?: string;
+  cableCrossSection?: string;
+  cableLength?: number;
+  voltage?: number;
+  controlRequirement?: string;
+  remark?: string;
+  rcdAssignment?: string;
+  terminalDesignation?: string;
+  status?: string;
+  isReserve?: boolean;
+}
+
+export function toCircuitCreateValues(id: string, input: CircuitCreatePersistenceInput) {
+  return {
+    id,
+    circuitListId: input.circuitListId,
+    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,
+    controlRequirement: input.controlRequirement ?? null,
+    status: input.status ?? null,
+    isReserve: input.isReserve ? 1 : 0,
+    remark: input.remark ?? null,
+  };
+}

src/db/repositories/circuit.repository.ts

@@ -2,27 +2,13 @@ import crypto from "node:crypto";
 import { and, asc, eq, inArray, ne } from "drizzle-orm";
 import { db } from "../client.js";
 import { circuits } from "../schema/circuits.js";
+import {
+  toCircuitCreateValues,
+  type CircuitCreatePersistenceInput,
+} from "./circuit.persistence.js";
 
-export interface CircuitCreatePersistenceInput {
-  circuitListId: string;
-  sectionId: string;
-  equipmentIdentifier: string;
-  displayName?: string;
-  sortOrder: number;
-  protectionType?: string;
-  protectionRatedCurrent?: number;
-  protectionCharacteristic?: string;
-  cableType?: string;
-  cableCrossSection?: string;
-  cableLength?: number;
-  voltage?: number;
-  controlRequirement?: string;
-  remark?: string;
-  rcdAssignment?: string;
-  terminalDesignation?: string;
-  status?: string;
-  isReserve?: boolean;
-}
+export type { CircuitCreatePersistenceInput } from "./circuit.persistence.js";
+export { toCircuitCreateValues } from "./circuit.persistence.js";
 
 export interface CircuitPatchPersistenceInput {
   sectionId?: string;
@@ -44,30 +30,6 @@ export interface CircuitPatchPersistenceInput {
   isReserve?: boolean;
 }
 
-export function toCircuitCreateValues(id: string, input: CircuitCreatePersistenceInput) {
-  return {
-    id,
-    circuitListId: input.circuitListId,
-    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,
-    controlRequirement: input.controlRequirement ?? null,
-    status: input.status ?? null,
-    isReserve: input.isReserve ? 1 : 0,
-    remark: input.remark ?? null,
-  };
-}
-
 function toCircuitPatchValues(input: CircuitPatchPersistenceInput) {
   const values: Partial<typeof circuits.$inferInsert> = {};
   const has = (field: keyof CircuitPatchPersistenceInput) =>