+
+
+ setMaxSocketsPerCircuit(event.target.value)
+ }
+ placeholder="keine Grenze"
+ step="1"
+ type="number"
+ value={maxSocketsPerCircuit}
+ />
+
+ Vorgabe des Auftraggebers. Gilt bei der Zuordnung von
+ Revit-Steckdosen; leer bedeutet keine Grenze.
+
+
Deckblatt
@@ -487,3 +520,19 @@ export function ProjectSettingsModal({
function toNullableString(value: string) {
return value.trim() || null;
}
+
+function isSocketLimitInputValid(value: string) {
+ const trimmed = value.trim();
+ if (trimmed === "") return true;
+ const parsed = Number(trimmed);
+ return (
+ Number.isInteger(parsed) &&
+ parsed >= 1 &&
+ parsed <= maxSocketsPerCircuitUpperBound
+ );
+}
+
+function toNullableSocketLimit(value: string) {
+ const trimmed = value.trim();
+ return trimmed === "" ? null : Number(trimmed);
+}
diff --git a/src/frontend/components/revit-device-type-card.tsx b/src/frontend/components/revit-device-type-card.tsx
new file mode 100644
index 0000000..4114c17
--- /dev/null
+++ b/src/frontend/components/revit-device-type-card.tsx
@@ -0,0 +1,86 @@
+"use client";
+
+import type { ExternalModelConfiguration } from "../../external-model/configuration/external-model-configuration";
+import { circuitGroupCategoryLabels } from "../../shared/constants/circuit-group";
+
+/**
+ * Device types of the Revit configuration with their socket flag. Only
+ * device types marked as socket count towards the project's socket limit
+ * per circuit.
+ */
+export function RevitDeviceTypeCard({
+ configuration,
+ isSaving,
+ onSave,
+}: {
+ configuration: ExternalModelConfiguration;
+ isSaving: boolean;
+ onSave: (configuration: ExternalModelConfiguration) => Promise
;
+}) {
+ const ruleCounts = new Map();
+ for (const rule of configuration.familyTypeRules) {
+ ruleCounts.set(rule.deviceTypeId, (ruleCounts.get(rule.deviceTypeId) ?? 0) + 1);
+ }
+
+ function toggleSocket(deviceTypeId: string, isSocket: boolean) {
+ void onSave({
+ ...configuration,
+ deviceTypes: configuration.deviceTypes.map((deviceType) =>
+ deviceType.id === deviceTypeId ? { ...deviceType, isSocket } : deviceType
+ ),
+ });
+ }
+
+ return (
+
+
+
+ Gerätearten ({configuration.deviceTypes.length})
+
+
+ {configuration.deviceTypes.length === 0 ? (
+
+ Gerätearten entstehen bei der Familienzuordnung im Import.
+
+ ) : (
+ <>
+
+ Als „Steckdose“ markierte Gerätearten zählen für den
+ Höchstwert je Stromkreis aus den Projekteinstellungen.
+
+
+
+ )}
+
+
+ );
+}
diff --git a/src/frontend/components/revit-follow-up-import-wizard.tsx b/src/frontend/components/revit-follow-up-import-wizard.tsx
index 8b561c5..b639362 100644
--- a/src/frontend/components/revit-follow-up-import-wizard.tsx
+++ b/src/frontend/components/revit-follow-up-import-wizard.tsx
@@ -40,7 +40,7 @@ export function RevitFollowUpImportWizard({ projectId, expectedRevision, initial
if (!file) return;
const next = structuredClone(configuration);
const targetTypeId = deviceTypeId ?? createClientId();
- if (!deviceTypeId) next.deviceTypes.push({ id: targetTypeId, name: familyAndType, category, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: null, costGroup: null } });
+ if (!deviceTypeId) next.deviceTypes.push({ id: targetTypeId, name: familyAndType, category, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: null, costGroup: null }, ...(next.schemaVersion === 2 ? { isSocket: quantityRule === "socketCount" } : {}) });
next.familyTypeRules.push({ id: createClientId(), exactFamilyAndType: familyAndType, deviceTypeId: targetTypeId, quantityRule });
setConfiguration(next); await loadPlan(file, next);
}
diff --git a/src/frontend/components/revit-initial-import-wizard.tsx b/src/frontend/components/revit-initial-import-wizard.tsx
index 8a4fc4d..b23ca2d 100644
--- a/src/frontend/components/revit-initial-import-wizard.tsx
+++ b/src/frontend/components/revit-initial-import-wizard.tsx
@@ -44,7 +44,7 @@ export function RevitInitialImportWizard({ projectId, expectedRevision, initialC
if (!file) return;
const deviceTypeId = createClientId();
const next = structuredClone(configuration);
- next.deviceTypes.push({ id: deviceTypeId, name: familyAndType, category, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: null, costGroup: null } });
+ next.deviceTypes.push({ id: deviceTypeId, name: familyAndType, category, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: null, costGroup: null }, ...(next.schemaVersion === 2 ? { isSocket: quantityRule === "socketCount" } : {}) });
next.familyTypeRules.push({ id: createClientId(), exactFamilyAndType: familyAndType, deviceTypeId, quantityRule });
setConfiguration(next);
await loadPlan(file, next);
diff --git a/src/frontend/types.ts b/src/frontend/types.ts
index 09459ba..8cd677f 100644
--- a/src/frontend/types.ts
+++ b/src/frontend/types.ts
@@ -194,6 +194,7 @@ export interface ProjectDto {
workStage: string | null;
projectLead: string | null;
projectEditor: string | null;
+ maxSocketsPerCircuit: number | null;
currentRevision: number;
}
diff --git a/src/frontend/utils/api.ts b/src/frontend/utils/api.ts
index e3cfab0..8727ff4 100644
--- a/src/frontend/utils/api.ts
+++ b/src/frontend/utils/api.ts
@@ -446,7 +446,7 @@ export function updateProjectSettings(
singlePhaseVoltageV: number;
threePhaseVoltageV: number;
enabledDistributionBoardSupplyTypes: ProjectDto["enabledDistributionBoardSupplyTypes"];
- } & Partial>
+ } & Partial>
) {
return request(
`/api/projects/${projectId}`,
diff --git a/src/frontend/utils/revit-xlsx-settings.ts b/src/frontend/utils/revit-xlsx-settings.ts
index 6c05c14..ea42704 100644
--- a/src/frontend/utils/revit-xlsx-settings.ts
+++ b/src/frontend/utils/revit-xlsx-settings.ts
@@ -2,7 +2,7 @@ import type { ExternalModelConfiguration } from "../../external-model/configurat
export function createDefaultRevitXlsxConfiguration(): ExternalModelConfiguration {
return {
- schemaVersion: 1,
+ schemaVersion: 2,
layout: { headerRow: 1, firstDataRow: 3, firstDataColumn: 1 },
circuitMode: "combined",
columns: {
diff --git a/src/server/controllers/external-model-configuration.controller.ts b/src/server/controllers/external-model-configuration.controller.ts
index 0a4166a..ecb6bf6 100644
--- a/src/server/controllers/external-model-configuration.controller.ts
+++ b/src/server/controllers/external-model-configuration.controller.ts
@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
import type { Request, Response } from "express";
import { createExternalModelConfigurationUpdateProjectCommand } from "../../domain/models/external-model-configuration-project-command.model.js";
import { assertExternalModelConfiguration } from "../../external-model/configuration/external-model-configuration.js";
+import { withSocketDeviceTypeFlags } from "../../shared/revit/socket-device-types.js";
import { parseExternalXlsx } from "../../external-model/xlsx/external-xlsx-transport.js";
import { externalModelConfigurationRepository } from "../composition/application-repositories.js";
import { projectCommandService } from "../composition/project-command-stores.js";
@@ -11,7 +12,16 @@ export function getExternalModelConfiguration(req: Request, res: Response) {
const projectId = String(req.params.projectId ?? "");
const result = externalModelConfigurationRepository.getByProject(projectId);
if (!result.projectExists) return res.status(404).json({ error: "Projekt nicht gefunden." });
- return res.json({ configuration: result.configuration });
+ // Clients always edit version 2; a stored version 1 is upgraded here so a
+ // later save writes the explicit socket flags.
+ return res.json({
+ configuration: result.configuration === null
+ ? null
+ : {
+ ...result.configuration,
+ configuration: withSocketDeviceTypeFlags(result.configuration.configuration),
+ },
+ });
}
export function updateExternalModelConfiguration(req: Request, res: Response) {
diff --git a/src/server/controllers/project.controller.ts b/src/server/controllers/project.controller.ts
index e3cd43e..3bcdde8 100644
--- a/src/server/controllers/project.controller.ts
+++ b/src/server/controllers/project.controller.ts
@@ -70,6 +70,10 @@ export async function updateProjectSettings(req: Request, res: Response) {
command: createProjectSettingsUpdateProjectCommand({
...settings,
...coverValues,
+ maxSocketsPerCircuit:
+ settings.maxSocketsPerCircuit === undefined
+ ? current.maxSocketsPerCircuit
+ : settings.maxSocketsPerCircuit,
}),
});
const project = await projectRepository.findById(projectId);
diff --git a/src/shared/constants/socket-limit.ts b/src/shared/constants/socket-limit.ts
new file mode 100644
index 0000000..eaa5faa
--- /dev/null
+++ b/src/shared/constants/socket-limit.ts
@@ -0,0 +1,19 @@
+/**
+ * Client-specific highest number of effective sockets per circuit. It is an
+ * ordinary project setting (`project.update-settings`, logical snapshots and
+ * project transfer); `null` means no limit. Only Revit objects whose device
+ * type is marked as socket count towards it.
+ */
+export const maxSocketsPerCircuitUpperBound = 1000;
+
+export function isValidMaxSocketsPerCircuit(
+ value: unknown
+): value is number | null {
+ return (
+ value === null ||
+ (typeof value === "number" &&
+ Number.isInteger(value) &&
+ value >= 1 &&
+ value <= maxSocketsPerCircuitUpperBound)
+ );
+}
diff --git a/src/shared/revit/socket-device-types.ts b/src/shared/revit/socket-device-types.ts
new file mode 100644
index 0000000..c23f7c4
--- /dev/null
+++ b/src/shared/revit/socket-device-types.ts
@@ -0,0 +1,61 @@
+/**
+ * Socket classification of Revit device types, shared by API and frontend.
+ *
+ * Configuration schema version 2 stores an explicit `isSocket` flag per
+ * device type. Version 1 has no flag; there a device type counts as socket
+ * when one of its family rules takes the quantity from the socket-count
+ * column. This file has no imports because Turbopack resolves frontend
+ * imports without the `.js` suffix the API build needs.
+ */
+
+export const socketFlagConfigurationSchemaVersion = 2 as const;
+
+export interface SocketClassificationConfiguration {
+ schemaVersion: number;
+ deviceTypes: ReadonlyArray<{ id: string; isSocket?: boolean }>;
+ familyTypeRules: ReadonlyArray<{ deviceTypeId: string; quantityRule: string }>;
+}
+
+export function deriveSocketDeviceTypeIds(
+ familyTypeRules: SocketClassificationConfiguration["familyTypeRules"]
+): Set {
+ return new Set(
+ familyTypeRules
+ .filter((rule) => rule.quantityRule === "socketCount")
+ .map((rule) => rule.deviceTypeId)
+ );
+}
+
+export function resolveSocketDeviceTypeIds(
+ configuration: SocketClassificationConfiguration | null
+): Set {
+ if (configuration === null) return new Set();
+ if (configuration.schemaVersion >= socketFlagConfigurationSchemaVersion) {
+ return new Set(
+ configuration.deviceTypes
+ .filter((deviceType) => deviceType.isSocket === true)
+ .map((deviceType) => deviceType.id)
+ );
+ }
+ return deriveSocketDeviceTypeIds(configuration.familyTypeRules);
+}
+
+/** Returns a version-2 configuration; version 1 derives the socket flags. */
+export function withSocketDeviceTypeFlags<
+ T extends SocketClassificationConfiguration & {
+ deviceTypes: Array<{ id: string; isSocket?: boolean }>;
+ },
+>(configuration: T): T {
+ if (configuration.schemaVersion >= socketFlagConfigurationSchemaVersion) {
+ return configuration;
+ }
+ const socketIds = deriveSocketDeviceTypeIds(configuration.familyTypeRules);
+ return {
+ ...configuration,
+ schemaVersion: socketFlagConfigurationSchemaVersion,
+ deviceTypes: configuration.deviceTypes.map((deviceType) => ({
+ ...deviceType,
+ isSocket: socketIds.has(deviceType.id),
+ })),
+ };
+}
diff --git a/src/shared/validation/project-structure.schemas.ts b/src/shared/validation/project-structure.schemas.ts
index 65ee156..6c70b54 100644
--- a/src/shared/validation/project-structure.schemas.ts
+++ b/src/shared/validation/project-structure.schemas.ts
@@ -8,6 +8,7 @@ import {
projectCoverFieldMaxLengths,
type ProjectCoverField,
} from "../constants/project-cover.js";
+import { maxSocketsPerCircuitUpperBound } from "../constants/socket-limit.js";
import { expectedProjectRevisionSchema } from "./project-command.schemas.js";
// Empty text is stored as null so "not entered" has one representation.
@@ -53,6 +54,14 @@ export const updateProjectSettingsSchema = z
workStage: optionalCoverValueSchema("workStage"),
projectLead: optionalCoverValueSchema("projectLead"),
projectEditor: optionalCoverValueSchema("projectEditor"),
+ // Socket limit per circuit; null = no limit, omitted = unchanged.
+ maxSocketsPerCircuit: z
+ .number()
+ .int()
+ .min(1)
+ .max(maxSocketsPerCircuitUpperBound)
+ .nullable()
+ .optional(),
})
.strict();
diff --git a/tests/external-follow-up-import-project-command.repository.test.ts b/tests/external-follow-up-import-project-command.repository.test.ts
index 8b7f6cc..a01deb2 100644
--- a/tests/external-follow-up-import-project-command.repository.test.ts
+++ b/tests/external-follow-up-import-project-command.repository.test.ts
@@ -29,7 +29,7 @@ import { createRevitXlsxFixture, externalXlsxTestConfiguration, loadXlsxWorkbook
const deviceTypeA = "10000000-0000-4000-8000-000000000001";
const deviceTypeB = "10000000-0000-4000-8000-000000000002";
-const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: 0.9, costGroup: null } }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 1, cosPhi: null, costGroup: null } }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
+const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: 0.9, costGroup: null }, isSocket: true }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 1, cosPhi: null, costGroup: null }, isSocket: false }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
const catalogs = { floors: [], rooms: [], distributionBoards: [], projectDevices: [] };
describe("external follow-up import project command", () => {
diff --git a/tests/external-model-configuration.test.ts b/tests/external-model-configuration.test.ts
index 7c1066a..1430691 100644
--- a/tests/external-model-configuration.test.ts
+++ b/tests/external-model-configuration.test.ts
@@ -14,6 +14,10 @@ import {
assertExternalModelConfiguration,
createDefaultExternalModelConfiguration,
} from "../src/external-model/configuration/external-model-configuration.js";
+import {
+ resolveSocketDeviceTypeIds,
+ withSocketDeviceTypeFlags,
+} from "../src/shared/revit/socket-device-types.js";
const deviceTypeId = "10000000-0000-4000-8000-000000000001";
const ruleId = "20000000-0000-4000-8000-000000000001";
@@ -25,6 +29,7 @@ function configuration() {
name: "Steckdose",
category: "single_phase",
defaults: { powerPerUnitW: 200, simultaneityFactor: null, cosPhi: 0.95, costGroup: "440" },
+ isSocket: true,
});
value.familyTypeRules.push({
id: ruleId,
@@ -61,6 +66,27 @@ describe("external model configuration", () => {
assert.throws(() => assertExternalModelConfiguration(unknownType), /unbekannte Ger.*teart/);
});
+ it("requires the socket flag in version 2 and keeps version 1 readable", () => {
+ const missingFlag = configuration();
+ delete missingFlag.deviceTypes[0]!.isSocket;
+ assert.throws(() => assertExternalModelConfiguration(missingFlag), /unbekannte oder fehlende Felder/);
+
+ const legacy = { ...configuration(), schemaVersion: 1 as const };
+ assert.throws(() => assertExternalModelConfiguration(legacy), /unbekannte oder fehlende Felder/);
+ delete legacy.deviceTypes[0]!.isSocket;
+ assert.doesNotThrow(() => assertExternalModelConfiguration(legacy));
+
+ assert.deepEqual([...resolveSocketDeviceTypeIds(legacy)], [deviceTypeId]);
+ const upgraded = withSocketDeviceTypeFlags(legacy);
+ assert.equal(upgraded.schemaVersion, 2);
+ assert.equal(upgraded.deviceTypes[0]!.isSocket, true);
+ assert.doesNotThrow(() => assertExternalModelConfiguration(upgraded));
+
+ const notSocket = configuration();
+ notSocket.deviceTypes[0]!.isSocket = false;
+ assert.equal(resolveSocketDeviceTypeIds(notSocket).size, 0);
+ });
+
it("persists changes without an independent configuration revision", () => {
const context = createTestDatabase();
try {
diff --git a/tests/external-xlsx-follow-up-import.test.ts b/tests/external-xlsx-follow-up-import.test.ts
index eb88fa0..d23bc3d 100644
--- a/tests/external-xlsx-follow-up-import.test.ts
+++ b/tests/external-xlsx-follow-up-import.test.ts
@@ -12,7 +12,7 @@ const deviceTypeA = "10000000-0000-4000-8000-000000000001";
const deviceTypeB = "10000000-0000-4000-8000-000000000002";
const newWorksharingId = "AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE-00000003";
const catalogs = { floors: [], rooms: [], distributionBoards: [], projectDevices: [] };
-const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: 0.9, costGroup: null } }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 1, cosPhi: null, costGroup: null } }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
+const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: 1, cosPhi: 0.9, costGroup: null }, isSocket: true }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 1, cosPhi: null, costGroup: null }, isSocket: false }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
async function initialState() {
const bytes = await createRevitXlsxFixture();
diff --git a/tests/external-xlsx-initial-import.test.ts b/tests/external-xlsx-initial-import.test.ts
index df17e23..450a7f2 100644
--- a/tests/external-xlsx-initial-import.test.ts
+++ b/tests/external-xlsx-initial-import.test.ts
@@ -23,8 +23,8 @@ function configured() {
...createDefaultExternalModelConfiguration(),
...externalXlsxTestConfiguration,
deviceTypes: [
- { id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: null, cosPhi: 0.9, costGroup: "440" } },
- { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 0.8, cosPhi: null, costGroup: null } },
+ { id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: null, simultaneityFactor: null, cosPhi: 0.9, costGroup: "440" }, isSocket: true },
+ { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 0.8, cosPhi: null, costGroup: null }, isSocket: false },
],
familyTypeRules: [
{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const },
diff --git a/tests/project-command.service.test.ts b/tests/project-command.service.test.ts
index 67106e7..bdc5119 100644
--- a/tests/project-command.service.test.ts
+++ b/tests/project-command.service.test.ts
@@ -1081,6 +1081,7 @@ describe("project command service", () => {
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
}),
});
assert.equal(updated.history.currentRevision, 1);
diff --git a/tests/project-settings-project-command.repository.test.ts b/tests/project-settings-project-command.repository.test.ts
index 52dd16d..fbf3815 100644
--- a/tests/project-settings-project-command.repository.test.ts
+++ b/tests/project-settings-project-command.repository.test.ts
@@ -56,6 +56,7 @@ function getSettings(context: DatabaseContext) {
workStage: projects.workStage,
projectLead: projects.projectLead,
projectEditor: projects.projectEditor,
+ maxSocketsPerCircuit: projects.maxSocketsPerCircuit,
currentRevision: projects.currentRevision,
})
.from(projects)
@@ -91,6 +92,7 @@ function settings(
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
...overrides,
};
}
@@ -231,6 +233,7 @@ describe("project settings project-command repository", () => {
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
},
},
]);
@@ -307,6 +310,7 @@ describe("project settings project-command repository", () => {
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
});
const undoStep = history.getNextCommand("project-1", "undo");
@@ -339,6 +343,7 @@ describe("project settings project-command repository", () => {
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
currentRevision: 2,
});
assert.deepEqual(getDerivedVoltages(context), {
@@ -382,6 +387,7 @@ describe("project settings project-command repository", () => {
workStage: null,
projectLead: null,
projectEditor: null,
+ maxSocketsPerCircuit: null,
currentRevision: 3,
});
assert.deepEqual(getDerivedVoltages(context), {
@@ -495,7 +501,7 @@ describe("project settings project-command repository", () => {
projectLead: "P. Leitung",
projectEditor: "B. Arbeiter",
});
- assert.equal(forward.inverse.schemaVersion, 3);
+ assert.equal(forward.inverse.schemaVersion, 4);
const undoStep = new ProjectHistoryRepository(
context.db
@@ -543,6 +549,7 @@ describe("project settings project-command repository", () => {
workStage: _workStage,
projectLead: _projectLead,
projectEditor: _projectEditor,
+ maxSocketsPerCircuit: _maxSocketsPerCircuit,
...versionTwoPayload
} = settings({ name: "Stand aus Version 2" });
const forward = repository.executeUpdate({
@@ -570,6 +577,83 @@ describe("project settings project-command repository", () => {
}
});
+ it("persists the socket limit with undo and keeps it for version 3 commands", () => {
+ const context = createTestDatabase();
+ try {
+ const repository = new ProjectSettingsProjectCommandRepository(
+ context.db
+ );
+ const readLimit = () =>
+ context.db
+ .select({ maxSocketsPerCircuit: projects.maxSocketsPerCircuit })
+ .from(projects)
+ .where(eq(projects.id, "project-1"))
+ .get()?.maxSocketsPerCircuit;
+ const forward = repository.executeUpdate({
+ projectId: "project-1",
+ expectedRevision: 0,
+ source: "user",
+ command: createProjectSettingsUpdateProjectCommand(
+ settings({ maxSocketsPerCircuit: 8 })
+ ),
+ });
+ assert.equal(readLimit(), 8);
+ assert.equal(forward.inverse.schemaVersion, 4);
+ assert.equal(
+ (forward.inverse.payload as { maxSocketsPerCircuit: unknown })
+ .maxSocketsPerCircuit,
+ null
+ );
+
+ const {
+ maxSocketsPerCircuit: _maxSocketsPerCircuit,
+ ...versionThreePayload
+ } = settings({ name: "Stand aus Version 3" });
+ const versionThree = repository.executeUpdate({
+ projectId: "project-1",
+ expectedRevision: 1,
+ source: "user",
+ command: {
+ schemaVersion: 3,
+ type: "project.update-settings",
+ payload: versionThreePayload,
+ },
+ });
+ assert.equal(readLimit(), 8);
+ assert.equal(versionThree.inverse.schemaVersion, 3);
+ assert.equal(
+ "maxSocketsPerCircuit" in versionThree.inverse.payload,
+ false
+ );
+
+ const history = new ProjectHistoryRepository(context.db);
+ for (const expectedRevision of [2, 3]) {
+ const undoStep = history.getNextCommand("project-1", "undo");
+ assert.ok(undoStep);
+ repository.executeUpdate({
+ projectId: "project-1",
+ expectedRevision,
+ source: "undo",
+ historyTargetChangeSetId: undoStep.changeSetId,
+ command: undoStep.command as never,
+ });
+ }
+ assert.equal(readLimit(), null);
+
+ for (const invalid of [0, 2.5, 1001]) {
+ assert.throws(
+ () =>
+ createProjectSettingsUpdateProjectCommand(
+ settings({ maxSocketsPerCircuit: invalid })
+ ),
+ /invalid values/
+ );
+ }
+ } finally {
+ context.close();
+ }
+ });
+
it("persists the project supply-type selection and rejects disabling an in-use type", () => {
const context = createTestDatabase();
try {
diff --git a/tests/project-snapshot.repository.test.ts b/tests/project-snapshot.repository.test.ts
index b85485c..6336894 100644
--- a/tests/project-snapshot.repository.test.ts
+++ b/tests/project-snapshot.repository.test.ts
@@ -474,7 +474,7 @@ describe("project snapshot repository", () => {
for (const room of payload.rooms) {
delete room.areaM2;
}
- for (const field of ["siteAddress", "workStage", "projectLead", "projectEditor"]) {
+ for (const field of ["siteAddress", "workStage", "projectLead", "projectEditor", "maxSocketsPerCircuit"]) {
delete payload.project[field];
}
for (const board of payload.distributionBoards) {
diff --git a/tests/project-state-snapshot.test.ts b/tests/project-state-snapshot.test.ts
index e7ea64a..1123cfc 100644
--- a/tests/project-state-snapshot.test.ts
+++ b/tests/project-state-snapshot.test.ts
@@ -13,10 +13,19 @@ import { createDefaultExternalCsvConfiguration } from "../src/external-model/csv
import { externalCsvTestColumns } from "./fixtures/revit-csv-fixtures.js";
import { zodIssues } from "./support/zod-assertions.js";
-/** Removes the fields introduced by snapshot schema version 9. */
+/** Removes the field introduced by snapshot schema version 11. */
+function withoutVersionElevenFields(
+ snapshot: T
+): T {
+ delete (snapshot.project as Record).maxSocketsPerCircuit;
+ return snapshot;
+}
+
+/** Removes the fields introduced by snapshot schema versions 9 to 11. */
function withoutVersionNineFields<
- T extends { distributionBoards: object[] },
+ T extends { project: object; distributionBoards: object[] },
>(snapshot: T): T {
+ withoutVersionElevenFields(snapshot);
const record = snapshot as Record;
record.externalCsvConfiguration = null;
delete record.externalModelConfiguration;
@@ -29,7 +38,7 @@ function withoutVersionNineFields<
/** Removes the fields introduced by snapshot schema version 7. */
function withoutVersionSevenFields<
- T extends { floors: object[]; distributionBoards: object[] },
+ T extends { project: object; floors: object[]; distributionBoards: object[] },
>(snapshot: T): T {
withoutVersionNineFields(snapshot);
delete (snapshot as Record).buildings;
@@ -82,6 +91,7 @@ function minimalSnapshot() {
workStage: "LPH 5" as string | null,
projectLead: "P. Leitung" as string | null,
projectEditor: null as string | null,
+ maxSocketsPerCircuit: null as number | null,
},
distributionBoards: [],
externalModelConfiguration: null,
@@ -351,6 +361,24 @@ describe("project state snapshot model", () => {
});
});
+ it("keeps the socket limit in version 11 and upgrades version 10 without a limit", () => {
+ const current = structuredClone(minimalSnapshot());
+ current.project.maxSocketsPerCircuit = 8;
+ assert.equal(parseProjectStateSnapshot(current).project.maxSocketsPerCircuit, 8);
+
+ const previous = withoutVersionElevenFields(structuredClone(minimalSnapshot()));
+ previous.schemaVersion = 10 as typeof previous.schemaVersion;
+ const upgraded = parseProjectStateSnapshot(previous);
+ assert.equal(upgraded.schemaVersion, projectStateSnapshotSchemaVersion);
+ assert.equal(upgraded.project.maxSocketsPerCircuit, null);
+
+ const invalid = structuredClone(minimalSnapshot());
+ invalid.project.maxSocketsPerCircuit = 0;
+ assert.throws(() => parseProjectStateSnapshot(invalid));
+ const missing = withoutVersionElevenFields(structuredClone(minimalSnapshot()));
+ assert.throws(() => parseProjectStateSnapshot(missing));
+ });
+
it("upgrades snapshot version 3 with an empty external model", () => {
const previous = withoutVersionSixFields(structuredClone(minimalSnapshot()));
previous.schemaVersion = 3 as typeof previous.schemaVersion;
diff --git a/tests/revit-xlsx-end-to-end.test.ts b/tests/revit-xlsx-end-to-end.test.ts
index ec6f5f5..c15475f 100644
--- a/tests/revit-xlsx-end-to-end.test.ts
+++ b/tests/revit-xlsx-end-to-end.test.ts
@@ -48,7 +48,7 @@ const circuitId = "circuit-e2e";
const rowId = "row-e2e";
const deviceTypeA = "10000000-0000-4000-8000-000000000001";
const deviceTypeB = "10000000-0000-4000-8000-000000000002";
-const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: 125, simultaneityFactor: 1, cosPhi: 0.9, costGroup: "440" } }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 0.8, cosPhi: null, costGroup: null } }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
+const configuration = { ...createDefaultExternalModelConfiguration(), ...externalXlsxTestConfiguration, deviceTypes: [{ id: deviceTypeA, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: 125, simultaneityFactor: 1, cosPhi: 0.9, costGroup: "440" }, isSocket: true }, { id: deviceTypeB, name: "Leuchte", category: "lighting" as const, defaults: { powerPerUnitW: 40, simultaneityFactor: 0.8, cosPhi: null, costGroup: null }, isSocket: false }], familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId: deviceTypeA, quantityRule: "socketCount" as const }, { id: "20000000-0000-4000-8000-000000000002", exactFamilyAndType: "Leuchte: Decke", deviceTypeId: deviceTypeB, quantityRule: "one" as const }] };
describe("Linear XLSX end-to-end", () => {
it("survives return, follow-up, snapshot restore, duplicate and restart undo/redo", async () => {
diff --git a/tests/revit-xlsx-scale.test.ts b/tests/revit-xlsx-scale.test.ts
index 386916f..8eb3d35 100644
--- a/tests/revit-xlsx-scale.test.ts
+++ b/tests/revit-xlsx-scale.test.ts
@@ -29,7 +29,7 @@ const deviceTypeId = "10000000-0000-4000-8000-000000000001";
const configuration = {
...createDefaultExternalModelConfiguration(),
...externalXlsxTestConfiguration,
- deviceTypes: [{ id: deviceTypeId, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: 125, simultaneityFactor: 1, cosPhi: 0.9, costGroup: "440" } }],
+ deviceTypes: [{ id: deviceTypeId, name: "Steckdose", category: "single_phase" as const, defaults: { powerPerUnitW: 125, simultaneityFactor: 1, cosPhi: 0.9, costGroup: "440" }, isSocket: true }],
familyTypeRules: [{ id: "20000000-0000-4000-8000-000000000001", exactFamilyAndType: "Steckdose: Standard", deviceTypeId, quantityRule: "socketCount" as const }],
};