forked from jappel/leistungsbilanz-ts
Fix code-review findings across domain, persistence, server and frontend
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>
This commit is contained in:
parent
fa96be2d42
commit
b45dc5002d
48 changed files with 3263 additions and 526 deletions
|
|
@ -187,12 +187,25 @@ describe("circuit grid model", () => {
|
|||
});
|
||||
|
||||
it("parses numeric drafts and rejects invalid values", () => {
|
||||
assert.equal(parseNumeric("quantity", " 2.5 "), 2.5);
|
||||
assert.equal(parseNumeric("quantity", " 1500 "), 1500);
|
||||
assert.equal(parseNumeric("powerPerUnit", " 1,25 "), 1.25);
|
||||
assert.equal(parseNumeric("quantity", ""), undefined);
|
||||
assert.throws(() => parseNumeric("quantity", "two"), /Ungültiger Zahlenwert/);
|
||||
});
|
||||
|
||||
it("rejects a dot instead of silently misreading it as a thousands separator", () => {
|
||||
// "1.500" typed with German thousands-separator intent (meaning 1500)
|
||||
// must never silently become 1.5 — it must fail loudly instead.
|
||||
assert.throws(
|
||||
() => parseNumeric("cableLength", "1.500"),
|
||||
/Dezimalstellen mit Komma eingeben/
|
||||
);
|
||||
assert.throws(
|
||||
() => parseNumeric("powerPerUnit", "2.5"),
|
||||
/Dezimalstellen mit Komma eingeben/
|
||||
);
|
||||
});
|
||||
|
||||
it("builds nullable circuit command patches from grid drafts", () => {
|
||||
assert.deepEqual(buildCircuitEditPatch("voltage", ""), {
|
||||
voltage: null,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import assert from "node:assert/strict";
|
||||
import { describe, it } from "node:test";
|
||||
import {
|
||||
buildVisibleGridRows,
|
||||
buildVisibleGridRowsWithStructure,
|
||||
filterAndSortCircuitSections,
|
||||
getDistinctFilterValues,
|
||||
|
|
@ -101,7 +100,7 @@ describe("circuit grid projection", () => {
|
|||
];
|
||||
|
||||
const projectedSections = filterAndSortCircuitSections(emptySections, {}, null);
|
||||
const rows = buildVisibleGridRows(projectedSections);
|
||||
const rows = buildVisibleGridRowsWithStructure(projectedSections, { headerComponents: [], footerComponents: [] });
|
||||
|
||||
assert.equal(projectedSections.length, 2);
|
||||
assert.deepEqual(
|
||||
|
|
@ -150,7 +149,7 @@ describe("circuit grid projection", () => {
|
|||
});
|
||||
|
||||
it("builds the compact, grouped, reserve and placeholder row shapes", () => {
|
||||
const rows = buildVisibleGridRows(sections);
|
||||
const rows = buildVisibleGridRowsWithStructure(sections, { headerComponents: [], footerComponents: [] });
|
||||
|
||||
assert.deepEqual(rows.map((row) => row.rowType), [
|
||||
"section",
|
||||
|
|
@ -191,7 +190,7 @@ describe("circuit grid projection", () => {
|
|||
},
|
||||
})),
|
||||
}));
|
||||
const rows = buildVisibleGridRows(protectedSections);
|
||||
const rows = buildVisibleGridRowsWithStructure(protectedSections, { headerComponents: [], footerComponents: [] });
|
||||
const protectionValue = (rowType: string) =>
|
||||
rows
|
||||
.find((row) => row.rowType === rowType)
|
||||
|
|
|
|||
|
|
@ -580,4 +580,43 @@ describe("circuit structure project-command repository", () => {
|
|||
fixture.context.close();
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects a BMK that differs from an existing one only by German umlaut casing", () => {
|
||||
const fixture = createTestDatabase();
|
||||
try {
|
||||
const store = new CircuitStructureProjectCommandRepository(
|
||||
fixture.context.db
|
||||
);
|
||||
store.execute({
|
||||
projectId: "project-1",
|
||||
expectedRevision: 0,
|
||||
source: "user",
|
||||
command: createCircuitInsertProjectCommand(
|
||||
createCircuitSnapshot(fixture, {
|
||||
id: "umlaut-original",
|
||||
equipmentIdentifier: "-1F9Ä",
|
||||
deviceRows: [],
|
||||
})
|
||||
),
|
||||
});
|
||||
assert.throws(
|
||||
() =>
|
||||
store.execute({
|
||||
projectId: "project-1",
|
||||
expectedRevision: 1,
|
||||
source: "user",
|
||||
command: createCircuitInsertProjectCommand(
|
||||
createCircuitSnapshot(fixture, {
|
||||
id: "umlaut-duplicate",
|
||||
equipmentIdentifier: "-1f9ä",
|
||||
deviceRows: [],
|
||||
})
|
||||
),
|
||||
}),
|
||||
/Duplicate equipmentIdentifier in circuit list\./
|
||||
);
|
||||
} finally {
|
||||
fixture.context.close();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
100
tests/circuit.controller.test.ts
Normal file
100
tests/circuit.controller.test.ts
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
import assert from "node:assert/strict";
|
||||
import { describe, it } from "node:test";
|
||||
import { getNextCircuitIdentifier } from "../src/server/controllers/circuit.controller.js";
|
||||
import {
|
||||
circuitListRepository,
|
||||
circuitSectionRepository,
|
||||
} from "../src/server/composition/application-repositories.js";
|
||||
import { circuitNumberingService } from "../src/server/composition/circuit-numbering-service.js";
|
||||
|
||||
function createMockResponse() {
|
||||
let statusCode = 200;
|
||||
let body: unknown;
|
||||
return {
|
||||
response: {
|
||||
status(code: number) {
|
||||
statusCode = code;
|
||||
return this;
|
||||
},
|
||||
json(value: unknown) {
|
||||
body = value;
|
||||
return this;
|
||||
},
|
||||
},
|
||||
getStatusCode: () => statusCode,
|
||||
getBody: () => body,
|
||||
};
|
||||
}
|
||||
|
||||
describe("circuit controller", () => {
|
||||
it("returns the next identifier when the section belongs to the project", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
findList: circuitListRepository.findById,
|
||||
getNextIdentifier: circuitNumberingService.getNextIdentifier,
|
||||
};
|
||||
circuitSectionRepository.findById = async () =>
|
||||
({ id: "section-1", circuitListId: "list-1", prefix: "-1F" }) as never;
|
||||
circuitListRepository.findById = async (projectId: string, circuitListId: string) =>
|
||||
projectId === "project-1" && circuitListId === "list-1"
|
||||
? ({ id: "list-1", projectId: "project-1" } as never)
|
||||
: null;
|
||||
circuitNumberingService.getNextIdentifier = async () => "-1F3";
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "project-1", sectionId: "section-1" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
circuitListRepository.findById = originals.findList;
|
||||
circuitNumberingService.getNextIdentifier = originals.getNextIdentifier;
|
||||
}
|
||||
assert.deepEqual(mock.getBody(), {
|
||||
sectionId: "section-1",
|
||||
nextIdentifier: "-1F3",
|
||||
});
|
||||
});
|
||||
|
||||
it("returns 404 instead of leaking numbering state for a section from another project", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
findList: circuitListRepository.findById,
|
||||
};
|
||||
circuitSectionRepository.findById = async () =>
|
||||
({ id: "section-1", circuitListId: "list-1", prefix: "-1F" }) as never;
|
||||
// The section exists, but its circuit list does not belong to the requesting project.
|
||||
circuitListRepository.findById = async () => null;
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "foreign-project", sectionId: "section-1" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
circuitListRepository.findById = originals.findList;
|
||||
}
|
||||
assert.equal(mock.getStatusCode(), 404);
|
||||
assert.deepEqual(mock.getBody(), { error: "Section not found" });
|
||||
});
|
||||
|
||||
it("returns 404 for a section that does not exist", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
};
|
||||
circuitSectionRepository.findById = async () => null;
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "project-1", sectionId: "missing" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
}
|
||||
assert.equal(mock.getStatusCode(), 404);
|
||||
assert.deepEqual(mock.getBody(), { error: "Section not found" });
|
||||
});
|
||||
});
|
||||
|
|
@ -580,7 +580,7 @@ describe("distribution-board component structure project command", () => {
|
|||
snapshot
|
||||
),
|
||||
}),
|
||||
/UNIQUE constraint failed/
|
||||
/Duplicate equipmentIdentifier in circuit list\./
|
||||
);
|
||||
assert.equal(
|
||||
context.db.select().from(projectRevisions).all().length,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import assert from "node:assert/strict";
|
|||
import { describe, it } from "node:test";
|
||||
import {
|
||||
applyExternalInitialImportSchema,
|
||||
MAX_CSV_CONTENT_BASE64_LENGTH,
|
||||
planExternalInitialImportSchema,
|
||||
previewExternalCsvSchema,
|
||||
updateExternalCsvConfigurationSchema,
|
||||
|
|
@ -74,7 +75,7 @@ describe("external CSV API contracts", () => {
|
|||
assert.equal(
|
||||
previewExternalCsvSchema.safeParse({
|
||||
fileName: "revit.csv",
|
||||
contentBase64: "a".repeat(24_000_001),
|
||||
contentBase64: "a".repeat(MAX_CSV_CONTENT_BASE64_LENGTH + 1),
|
||||
}).success,
|
||||
false
|
||||
);
|
||||
|
|
|
|||
|
|
@ -195,6 +195,30 @@ describe("external initial import project command", () => {
|
|||
}
|
||||
});
|
||||
|
||||
it("rejects a target state with zero classified objects before writing anything", () => {
|
||||
// assertPopulatedInitialState requires at least one object, so a CSV
|
||||
// that classified none must be rejected at command construction, not
|
||||
// reach the persistence layer's bulk insert.
|
||||
const { context, configuration } = createTestContext();
|
||||
try {
|
||||
const target: ExternalModelStateSnapshot = {
|
||||
...initialState(configuration),
|
||||
roomMappings: [],
|
||||
objects: [],
|
||||
};
|
||||
assert.throws(
|
||||
() =>
|
||||
createExternalInitialImportProjectCommand(
|
||||
createEmptyExternalModelState(),
|
||||
target
|
||||
),
|
||||
/at least one object/
|
||||
);
|
||||
} finally {
|
||||
context.close();
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects changed state, checksum drift and row assignment", () => {
|
||||
const { context, configuration } = createTestContext();
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -209,6 +209,13 @@ describe("circuit device-row update project commands", () => {
|
|||
}),
|
||||
/non-negative/
|
||||
);
|
||||
assert.throws(
|
||||
() =>
|
||||
createCircuitDeviceRowUpdateProjectCommand("row-1", {
|
||||
simultaneityFactor: 1.5,
|
||||
}),
|
||||
/must not exceed 1/
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -508,6 +515,14 @@ describe("circuit device-row structure project commands", () => {
|
|||
}),
|
||||
/must not be negative/
|
||||
);
|
||||
assert.throws(
|
||||
() =>
|
||||
createCircuitDeviceRowInsertProjectCommand({
|
||||
...row,
|
||||
simultaneityFactor: 1.5,
|
||||
}),
|
||||
/must not exceed 1/
|
||||
);
|
||||
assert.throws(
|
||||
() => createCircuitDeviceRowDeleteProjectCommand("", "circuit-1"),
|
||||
/rowId/
|
||||
|
|
|
|||
|
|
@ -191,6 +191,32 @@ describe("project version history presentation", () => {
|
|||
),
|
||||
"Stromkreisgruppe vollständig wiederhergestellt"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(16, { commandType: "circuit-protection.update" })
|
||||
),
|
||||
"Stromkreisschutz bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(17, { commandType: "project-floor.update" })
|
||||
),
|
||||
"Geschoss bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(18, { commandType: "project-room.update" })
|
||||
),
|
||||
"Raum bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(19, {
|
||||
commandType: "external-object.update-row-assignment",
|
||||
})
|
||||
),
|
||||
"Externe Objektzuordnung geändert"
|
||||
);
|
||||
assert.equal(getProjectSnapshotKindLabel("named"), "Benannt");
|
||||
assert.equal(
|
||||
getProjectSnapshotKindLabel("automatic"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue