Make device row writes atomic

src/domain/services/circuit-write.service.ts

@@ -171,11 +171,10 @@ export class CircuitWriteService {
     }
     await this.assertValidLinkedProjectDevice(circuitId, input.linkedProjectDeviceId);
 
-    const existingRows = await this.deviceRowRepository.countByCircuit(circuitId);
-    const rowId = await this.deviceRowRepository.create({
+    const rowId = this.deviceRowRepository.createInCircuitTransactional({
       circuitId,
       linkedProjectDeviceId: input.linkedProjectDeviceId,
-      sortOrder: input.sortOrder ?? (existingRows + 1) * 10,
+      sortOrder: input.sortOrder,
       name: input.name,
       displayName: input.displayName,
       phaseType: input.phaseType,
@@ -194,29 +193,6 @@ export class CircuitWriteService {
       overriddenFields: input.overriddenFields,
     });
 
-    // Reserve circuits become active as soon as at least one device row exists.
-    if (Boolean(circuit.isReserve)) {
-      await this.circuitRepository.update(circuit.id, {
-        sectionId: circuit.sectionId,
-        equipmentIdentifier: circuit.equipmentIdentifier,
-        displayName: circuit.displayName ?? undefined,
-        sortOrder: circuit.sortOrder,
-        protectionType: circuit.protectionType ?? undefined,
-        protectionRatedCurrent: circuit.protectionRatedCurrent ?? undefined,
-        protectionCharacteristic: circuit.protectionCharacteristic ?? undefined,
-        cableType: circuit.cableType ?? undefined,
-        cableCrossSection: circuit.cableCrossSection ?? undefined,
-        cableLength: circuit.cableLength ?? undefined,
-        rcdAssignment: circuit.rcdAssignment ?? undefined,
-        terminalDesignation: circuit.terminalDesignation ?? undefined,
-        voltage: circuit.voltage ?? undefined,
-        controlRequirement: circuit.controlRequirement ?? undefined,
-        status: circuit.status ?? undefined,
-        isReserve: false,
-        remark: circuit.remark ?? undefined,
-      });
-    }
-
     return this.deviceRowRepository.findById(rowId);
   }
 
@@ -272,30 +248,7 @@ export class CircuitWriteService {
     if (!circuit) {
       throw new Error("Invalid circuit id.");
     }
-    await this.deviceRowRepository.delete(rowId);
-    const remaining = await this.deviceRowRepository.countByCircuit(current.circuitId);
-    // When last row is removed, keep circuit and mark it reserve instead of deleting it.
-    if (remaining === 0) {
-      await this.circuitRepository.update(circuit.id, {
-        sectionId: circuit.sectionId,
-        equipmentIdentifier: circuit.equipmentIdentifier,
-        displayName: circuit.displayName ?? undefined,
-        sortOrder: circuit.sortOrder,
-        protectionType: circuit.protectionType ?? undefined,
-        protectionRatedCurrent: circuit.protectionRatedCurrent ?? undefined,
-        protectionCharacteristic: circuit.protectionCharacteristic ?? undefined,
-        cableType: circuit.cableType ?? undefined,
-        cableCrossSection: circuit.cableCrossSection ?? undefined,
-        cableLength: circuit.cableLength ?? undefined,
-        rcdAssignment: circuit.rcdAssignment ?? undefined,
-        terminalDesignation: circuit.terminalDesignation ?? undefined,
-        voltage: circuit.voltage ?? undefined,
-        controlRequirement: circuit.controlRequirement ?? undefined,
-        status: circuit.status ?? undefined,
-        isReserve: true,
-        remark: circuit.remark ?? undefined,
-      });
-    }
+    this.deviceRowRepository.deleteFromCircuitTransactional(rowId, circuit.id);
   }
 
   async moveDeviceRow(rowId: string, input: MoveCircuitDeviceRowInput) {