jappel/leistungsbilanz-ts
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add circuit group commands

Browse Source
This commit is contained in:
Julian Appel
2026-07-30 19:46:55 +02:00
parent 69b020339e
commit 1250f9a6af
16 changed files with 864 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/circuit-group-numbering.test.ts
+1
View File
@@ -8,6 +8,7 @@ import {
getNextGroupedCircuitIdentifier,
parseGroupedEquipmentIdentifier,
} from "../src/domain/services/circuit-group-numbering.js";
import "./circuit-group-structure-project-command.repository.test.js";
describe("circuit group numbering", () => {
it("formats the agreed identifiers including the leading hyphen", () => {
tests/circuit-group-structure-project-command.repository.test.ts
+296
View File
@@ -0,0 +1,296 @@
import path from "node:path";
import assert from "node:assert/strict";
import { describe, it } from "node:test";
import { eq } from "drizzle-orm";
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
import {
createDatabaseContext,
type DatabaseContext,
} from "../src/db/database-context.js";
import { CircuitGroupStructureProjectCommandRepository } from "../src/db/repositories/circuit-group-structure-project-command.repository.js";
import { ProjectHistoryRepository } from "../src/db/repositories/project-history.repository.js";
import { circuitLists } from "../src/db/schema/circuit-lists.js";
import { circuitSections } from "../src/db/schema/circuit-sections.js";
import { circuits } from "../src/db/schema/circuits.js";
import { projectRevisions } from "../src/db/schema/project-revisions.js";
import { projects } from "../src/db/schema/projects.js";
import {
createCircuitGroupDeleteProjectCommand,
createCircuitGroupInsertProjectCommand,
createCircuitGroupUpdateProjectCommand,
type CircuitGroupSnapshot,
} from "../src/domain/models/circuit-group-structure-project-command.model.js";
import { DistributionBoardFixtureRepository } from "./support/distribution-board-fixture.js";
function createTestDatabase(): DatabaseContext {
const context = createDatabaseContext(":memory:");
migrate(context.db, {
migrationsFolder: path.resolve("src", "db", "migrations"),
});
context.db
.insert(projects)
.values([
{ id: "project-1", name: "Projekt" },
{ id: "project-2", name: "Fremdprojekt" },
])
.run();
new DistributionBoardFixtureRepository(
context.db
).createWithCircuitListAndDefaultSections("project-1", "UV-01");
new DistributionBoardFixtureRepository(
context.db
).createWithCircuitListAndDefaultSections("project-2", "UV-02");
return context;
}
function getProjectList(context: DatabaseContext, projectId: string) {
const list = context.db
.select()
.from(circuitLists)
.where(eq(circuitLists.projectId, projectId))
.get();
assert.ok(list);
return list;
}
function groupSnapshot(circuitListId: string): CircuitGroupSnapshot {
return {
id: "group-lighting-2",
circuitListId,
key: "lighting_2",
displayName: "Beleuchtung 2",
prefix: "-1F2.",
sortOrder: 40,
category: "lighting",
groupNumber: 2,
};
}
describe("circuit-group structure project command", () => {
it("inserts, renames and restores a group through persistent history", () => {
const context = createTestDatabase();
try {
const expected = groupSnapshot(
getProjectList(context, "project-1").id
);
const target = {
...expected,
displayName: "Beleuchtung Besprechungsräume",
};
const repository =
new CircuitGroupStructureProjectCommandRepository(context.db);
repository.execute({
projectId: "project-1",
expectedRevision: 0,
source: "user",
command: createCircuitGroupInsertProjectCommand(expected),
});
const updated = repository.execute({
projectId: "project-1",
expectedRevision: 1,
source: "user",
command: createCircuitGroupUpdateProjectCommand(
expected,
target
),
});
assert.equal(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, expected.id))
.get()?.displayName,
target.displayName
);
repository.execute({
projectId: "project-1",
expectedRevision: 2,
source: "undo",
historyTargetChangeSetId: new ProjectHistoryRepository(
context.db
).getNextCommand("project-1", "undo")?.changeSetId,
command: updated.inverse,
});
assert.deepEqual(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, expected.id))
.get(),
expected
);
} finally {
context.close();
}
});
it("deletes only an exact empty group and restores the same UUID", () => {
const context = createTestDatabase();
try {
const snapshot = groupSnapshot(
getProjectList(context, "project-1").id
);
const repository =
new CircuitGroupStructureProjectCommandRepository(context.db);
repository.execute({
projectId: "project-1",
expectedRevision: 0,
source: "user",
command: createCircuitGroupInsertProjectCommand(snapshot),
});
const deleted = repository.execute({
projectId: "project-1",
expectedRevision: 1,
source: "user",
command: createCircuitGroupDeleteProjectCommand(snapshot),
});
assert.equal(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, snapshot.id))
.get(),
undefined
);
repository.execute({
projectId: "project-1",
expectedRevision: 2,
source: "undo",
historyTargetChangeSetId: new ProjectHistoryRepository(
context.db
).getNextCommand("project-1", "undo")?.changeSetId,
command: deleted.inverse,
});
assert.deepEqual(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, snapshot.id))
.get(),
snapshot
);
} finally {
context.close();
}
});
it("rejects foreign lists, invalid prefixes, stale updates and populated deletes", () => {
const context = createTestDatabase();
try {
const snapshot = groupSnapshot(
getProjectList(context, "project-1").id
);
const repository =
new CircuitGroupStructureProjectCommandRepository(context.db);
assert.throws(
() =>
createCircuitGroupInsertProjectCommand({
...snapshot,
prefix: "-1F9.",
}),
/prefix does not match/
);
assert.throws(
() =>
repository.execute({
projectId: "project-2",
expectedRevision: 0,
source: "user",
command: createCircuitGroupInsertProjectCommand(snapshot),
}),
/does not belong/
);
repository.execute({
projectId: "project-1",
expectedRevision: 0,
source: "user",
command: createCircuitGroupInsertProjectCommand(snapshot),
});
context.db
.insert(circuits)
.values({
id: "group-circuit",
circuitListId: snapshot.circuitListId,
sectionId: snapshot.id,
equipmentIdentifier: "-1F2.1",
displayName: "Beleuchtung",
sortOrder: 10,
})
.run();
assert.throws(
() =>
repository.execute({
projectId: "project-1",
expectedRevision: 1,
source: "user",
command: createCircuitGroupDeleteProjectCommand(snapshot),
}),
/Only empty circuit groups/
);
context.db
.update(circuitSections)
.set({ displayName: "Direkt geändert" })
.where(eq(circuitSections.id, snapshot.id))
.run();
assert.throws(
() =>
repository.execute({
projectId: "project-1",
expectedRevision: 1,
source: "user",
command: createCircuitGroupUpdateProjectCommand(snapshot, {
...snapshot,
displayName: "Ziel",
}),
}),
/changed before update/
);
assert.equal(
context.db.select().from(projectRevisions).all().length,
1
);
} finally {
context.close();
}
});
it("rolls back group insertion when history persistence fails", () => {
const context = createTestDatabase();
try {
const snapshot = groupSnapshot(
getProjectList(context, "project-1").id
);
context.sqlite.exec(`
CREATE TRIGGER fail_group_history
BEFORE INSERT ON project_history_stack_entries
BEGIN
SELECT RAISE(ABORT, 'forced group history failure');
END;
`);
assert.throws(
() =>
new CircuitGroupStructureProjectCommandRepository(
context.db
).execute({
projectId: "project-1",
expectedRevision: 0,
source: "user",
command: createCircuitGroupInsertProjectCommand(snapshot),
}),
/forced group history failure/
);
assert.equal(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, snapshot.id))
.get(),
undefined
);
} finally {
context.close();
}
});
});
tests/project-command.service.test.ts
+68
View File
@@ -14,6 +14,7 @@ import { CircuitProjectCommandRepository } from "../src/db/repositories/circuit-
import { CircuitSectionReorderProjectCommandRepository } from "../src/db/repositories/circuit-section-reorder-project-command.repository.js";
import { CircuitSectionRenumberProjectCommandRepository } from "../src/db/repositories/circuit-section-renumber-project-command.repository.js";
import { CircuitStructureProjectCommandRepository } from "../src/db/repositories/circuit-structure-project-command.repository.js";
import { CircuitGroupStructureProjectCommandRepository } from "../src/db/repositories/circuit-group-structure-project-command.repository.js";
import { DistributionBoardFixtureRepository } from "./support/distribution-board-fixture.js";
import { DistributionBoardStructureProjectCommandRepository } from "../src/db/repositories/distribution-board-structure-project-command.repository.js";
import { DistributionBoardComponentStructureProjectCommandRepository } from "../src/db/repositories/distribution-board-component-structure-project-command.repository.js";
@@ -47,6 +48,10 @@ import { createCircuitSectionReorderProjectCommand } from "../src/domain/models/
import { createCircuitSectionsReorderProjectCommand } from "../src/domain/models/circuit-sections-reorder-project-command.model.js";
import { createCircuitSectionRenumberProjectCommand } from "../src/domain/models/circuit-section-renumber-project-command.model.js";
import { createCircuitInsertProjectCommand } from "../src/domain/models/circuit-structure-project-command.model.js";
import {
createCircuitGroupInsertProjectCommand,
createCircuitGroupUpdateProjectCommand,
} from "../src/domain/models/circuit-group-structure-project-command.model.js";
import {
createDistributionBoardInsertProjectCommand,
createDistributionBoardStructureSnapshot,
@@ -131,6 +136,7 @@ function createService(context: DatabaseContext) {
new DistributionBoardComponentStructureProjectCommandRepository(
context.db
),
new CircuitGroupStructureProjectCommandRepository(context.db),
new ProjectHistoryRepository(context.db)
);
}
@@ -1207,6 +1213,68 @@ describe("project command service", () => {
}
});
it("dispatches circuit-group structure commands", () => {
const context = createTestDatabase();
try {
const service = createService(context);
const circuitListId = context.db
.select()
.from(circuitSections)
.get()!.circuitListId;
const expected = {
id: "group-service",
circuitListId,
key: "lighting_2",
displayName: "Beleuchtung 2",
prefix: "-1F2.",
sortOrder: 40,
category: "lighting" as const,
groupNumber: 2,
};
const target = {
...expected,
displayName: "Beleuchtung Nebenräume",
};
service.executeUser({
projectId: "project-1",
expectedRevision: 0,
command: createCircuitGroupInsertProjectCommand(expected),
});
const updated = service.executeUser({
projectId: "project-1",
expectedRevision: 1,
command: createCircuitGroupUpdateProjectCommand(
expected,
target
),
});
assert.equal(updated.history.currentRevision, 2);
assert.equal(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, expected.id))
.get()?.displayName,
target.displayName
);
createService(context).undo({
projectId: "project-1",
expectedRevision: 2,
});
assert.equal(
context.db
.select()
.from(circuitSections)
.where(eq(circuitSections.id, expected.id))
.get()?.displayName,
expected.displayName
);
} finally {
context.close();
}
});
it("dispatches floor and room setup with their persisted inverses", () => {
const context = createTestDatabase();
try {
tests/project-state-restore-command.repository.test.ts
+2
View File
@@ -14,6 +14,7 @@ import { CircuitProjectCommandRepository } from "../src/db/repositories/circuit-
import { CircuitSectionRenumberProjectCommandRepository } from "../src/db/repositories/circuit-section-renumber-project-command.repository.js";
import { CircuitSectionReorderProjectCommandRepository } from "../src/db/repositories/circuit-section-reorder-project-command.repository.js";
import { CircuitStructureProjectCommandRepository } from "../src/db/repositories/circuit-structure-project-command.repository.js";
import { CircuitGroupStructureProjectCommandRepository } from "../src/db/repositories/circuit-group-structure-project-command.repository.js";
import { DistributionBoardFixtureRepository } from "./support/distribution-board-fixture.js";
import { DistributionBoardStructureProjectCommandRepository } from "../src/db/repositories/distribution-board-structure-project-command.repository.js";
import { DistributionBoardComponentStructureProjectCommandRepository } from "../src/db/repositories/distribution-board-component-structure-project-command.repository.js";
@@ -195,6 +196,7 @@ function createService(context: DatabaseContext) {
new DistributionBoardComponentStructureProjectCommandRepository(
context.db
),
new CircuitGroupStructureProjectCommandRepository(context.db),
new ProjectHistoryRepository(context.db)
);
}
tests/project-version-history.test.ts
+18
View File
@@ -139,6 +139,24 @@ describe("project version history presentation", () => {
),
"Verteilergerät bearbeitet"
);
assert.equal(
getProjectRevisionDescription(
revision(8, { commandType: "circuit-group.insert" })
),
"Stromkreisgruppe angelegt"
);
assert.equal(
getProjectRevisionDescription(
revision(9, { commandType: "circuit-group.delete" })
),
"Stromkreisgruppe entfernt"
);
assert.equal(
getProjectRevisionDescription(
revision(10, { commandType: "circuit-group.update" })
),
"Stromkreisgruppe bearbeitet"
);
assert.equal(getProjectSnapshotKindLabel("named"), "Benannt");
assert.equal(
getProjectSnapshotKindLabel("automatic"),