Full-codebase review turned up five real correctness/security bugs and
a dozen smaller inconsistencies; all are fixed here with matching test
coverage:
- BMK uniqueness silently allowed German-umlaut duplicates ("Ä1" vs
"ä1") because the DB's normalized index only folds ASCII case. Added
a shared Unicode-aware pre-check used by every circuit/component
insert and rename path (one of which had no pre-check at all).
- CircuitDeviceRow.simultaneityFactor had no upper bound at the row
level (command model and snapshot/restore schema), unlike every
sibling entity, letting a bad value silently corrupt power totals.
- Grid cell editing silently misread German thousands-separator input
("1.500" parsed as 1.5); "." is now rejected outright with a clear
message instead of guessing.
- The editor's shared command runner (runCommand/applyHistory) had no
re-entrancy guard, so a double click/drop could fire the same
command twice and race a BMK collision or revision conflict. Added a
synchronous ref guard plus isSaving on the buttons that lacked it.
- GET .../next-identifier leaked circuit-numbering state for sections
in other projects (no ownership check, 400 instead of 404). Moved
under /projects/:projectId and scoped it.
Also: added the missing circuits.section_id / circuit_device_rows.
circuit_id indexes (migration 0006), gave FormModal a focus trap /
Escape-to-close / focus restore and rebuilt ProjectSettingsModal on
top of it instead of duplicated markup, removed dead code (3 orphaned
domain model files, an unused persistence helper, a wrapper only used
by its own test), pointed the project page at GET /projects/:id
instead of listing+filtering client-side, closed the gap between the
documented 18 MB CSV limit and the ~17.17 MiB actually enforced, added
missing upper bounds on several free-text fields, filled in nine
missing German labels in the revision timeline, replaced a
key-order-fragile JSON.stringify equality check with a real field
comparison, made an implicit sort-order assumption in three
renumbering helpers explicit, cleared the sidebar's target selection
when it no longer resolves after a tree reload, and fixed
updateGlobalDevice to check-then-write instead of write-then-check.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
187 lines
5.3 KiB
TypeScript
187 lines
5.3 KiB
TypeScript
import { and, eq } from "drizzle-orm";
|
|
import {
|
|
assertCircuitUpdateProjectCommand,
|
|
createCircuitUpdateProjectCommand,
|
|
type CircuitUpdateField,
|
|
type CircuitUpdatePatch,
|
|
type CircuitUpdateValues,
|
|
} from "../../domain/models/circuit-project-command.model.js";
|
|
import type {
|
|
CircuitProjectCommandStore,
|
|
ExecuteCircuitUpdateCommandInput,
|
|
} from "../../domain/ports/circuit-project-command.store.js";
|
|
import type { AppDatabase } from "../database-context.js";
|
|
import { circuitLists } from "../schema/circuit-lists.js";
|
|
import { circuitSections } from "../schema/circuit-sections.js";
|
|
import { circuits } from "../schema/circuits.js";
|
|
import {
|
|
toCircuitPatchValues,
|
|
type CircuitPatchPersistenceInput,
|
|
} from "./circuit.persistence.js";
|
|
import { executeProjectCommandTransactionWithAppliedForward } from "./project-command-transaction.persistence.js";
|
|
import { resolveCircuitVoltage } from "./project-voltage.persistence.js";
|
|
import { circuitDeviceRows } from "../schema/circuit-device-rows.js";
|
|
import { assertEquipmentIdentifierAvailable } from "./equipment-identifier-uniqueness.persistence.js";
|
|
|
|
type CircuitRow = typeof circuits.$inferSelect;
|
|
|
|
export class CircuitProjectCommandRepository
|
|
implements CircuitProjectCommandStore
|
|
{
|
|
constructor(private readonly database: AppDatabase) {}
|
|
|
|
executeUpdate(input: ExecuteCircuitUpdateCommandInput) {
|
|
assertCircuitUpdateProjectCommand(input.command);
|
|
|
|
return executeProjectCommandTransactionWithAppliedForward(
|
|
this.database,
|
|
input,
|
|
(tx) => this.applyCommand(tx, input)
|
|
);
|
|
}
|
|
|
|
private applyCommand(
|
|
tx: AppDatabase,
|
|
input: ExecuteCircuitUpdateCommandInput
|
|
) {
|
|
const current = tx
|
|
.select()
|
|
.from(circuits)
|
|
.where(eq(circuits.id, input.command.payload.circuitId))
|
|
.get();
|
|
if (!current) {
|
|
throw new Error("Invalid circuit id.");
|
|
}
|
|
|
|
const owningList = tx
|
|
.select({ id: circuitLists.id })
|
|
.from(circuitLists)
|
|
.where(
|
|
and(
|
|
eq(circuitLists.id, current.circuitListId),
|
|
eq(circuitLists.projectId, input.projectId)
|
|
)
|
|
)
|
|
.get();
|
|
if (!owningList) {
|
|
throw new Error("Circuit does not belong to project.");
|
|
}
|
|
|
|
const patch = Object.fromEntries(
|
|
input.command.payload.changes.map((change) => [
|
|
change.field,
|
|
change.value,
|
|
])
|
|
) as CircuitPatchPersistenceInput;
|
|
this.assertSectionInCircuitList(tx, current, patch.sectionId);
|
|
if (input.source === "user") {
|
|
if (
|
|
input.command.payload.changes.every(
|
|
(change) => change.field === "voltage"
|
|
)
|
|
) {
|
|
throw new Error("Circuit voltage is derived and cannot be edited.");
|
|
}
|
|
const devicePhaseTypes = tx
|
|
.select({ phaseType: circuitDeviceRows.phaseType })
|
|
.from(circuitDeviceRows)
|
|
.where(eq(circuitDeviceRows.circuitId, current.id))
|
|
.all()
|
|
.map((row) => row.phaseType);
|
|
const derivedVoltage = resolveCircuitVoltage(
|
|
tx,
|
|
input.projectId,
|
|
patch.sectionId ?? current.sectionId,
|
|
devicePhaseTypes
|
|
);
|
|
if (derivedVoltage === current.voltage) {
|
|
delete patch.voltage;
|
|
} else {
|
|
patch.voltage = derivedVoltage;
|
|
}
|
|
}
|
|
this.assertUniqueEquipmentIdentifier(
|
|
tx,
|
|
current,
|
|
patch.equipmentIdentifier
|
|
);
|
|
|
|
const appliedForward = createCircuitUpdateProjectCommand(
|
|
current.id,
|
|
patch as CircuitUpdatePatch
|
|
);
|
|
const inversePatch = Object.fromEntries(
|
|
appliedForward.payload.changes.map((change) => [
|
|
change.field,
|
|
getCircuitFieldValue(current, change.field),
|
|
])
|
|
) as CircuitUpdatePatch;
|
|
const inverse = createCircuitUpdateProjectCommand(
|
|
current.id,
|
|
inversePatch
|
|
);
|
|
|
|
const update = tx
|
|
.update(circuits)
|
|
.set(toCircuitPatchValues(patch))
|
|
.where(eq(circuits.id, current.id))
|
|
.run();
|
|
if (update.changes !== 1) {
|
|
throw new Error("Circuit changed before command execution.");
|
|
}
|
|
|
|
return { forward: appliedForward, inverse };
|
|
}
|
|
|
|
private assertSectionInCircuitList(
|
|
database: AppDatabase,
|
|
circuit: CircuitRow,
|
|
sectionId: string | undefined
|
|
) {
|
|
if (sectionId === undefined || sectionId === circuit.sectionId) {
|
|
return;
|
|
}
|
|
const section = database
|
|
.select({ id: circuitSections.id })
|
|
.from(circuitSections)
|
|
.where(
|
|
and(
|
|
eq(circuitSections.id, sectionId),
|
|
eq(circuitSections.circuitListId, circuit.circuitListId)
|
|
)
|
|
)
|
|
.get();
|
|
if (!section) {
|
|
throw new Error("Section does not belong to circuit list.");
|
|
}
|
|
}
|
|
|
|
private assertUniqueEquipmentIdentifier(
|
|
database: AppDatabase,
|
|
circuit: CircuitRow,
|
|
equipmentIdentifier: string | undefined
|
|
) {
|
|
if (
|
|
equipmentIdentifier === undefined ||
|
|
equipmentIdentifier === circuit.equipmentIdentifier
|
|
) {
|
|
return;
|
|
}
|
|
assertEquipmentIdentifierAvailable(
|
|
database,
|
|
circuit.circuitListId,
|
|
equipmentIdentifier,
|
|
circuit.id
|
|
);
|
|
}
|
|
}
|
|
|
|
function getCircuitFieldValue<TField extends CircuitUpdateField>(
|
|
circuit: CircuitRow,
|
|
field: TField
|
|
): CircuitUpdateValues[TField] {
|
|
if (field === "isReserve") {
|
|
return Boolean(circuit.isReserve) as CircuitUpdateValues[TField];
|
|
}
|
|
return circuit[field] as unknown as CircuitUpdateValues[TField];
|
|
}
|