Add circuit reorder history

2026-07-24 08:21:32 +02:00
parent 53282e8c7c
commit 332dfdb5d9
14 changed files with 865 additions and 16 deletions
@@ -11,6 +11,7 @@ import { CircuitDeviceRowProjectCommandRepository } from "../src/db/repositories
 import { CircuitDeviceRowMoveProjectCommandRepository } from "../src/db/repositories/circuit-device-row-move-project-command.repository.js";
 import { CircuitDeviceRowStructureProjectCommandRepository } from "../src/db/repositories/circuit-device-row-structure-project-command.repository.js";
 import { CircuitProjectCommandRepository } from "../src/db/repositories/circuit-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 { DistributionBoardRepository } from "../src/db/repositories/distribution-board.repository.js";
 import { ProjectHistoryRepository } from "../src/db/repositories/project-history.repository.js";
@@ -29,6 +30,7 @@ import {
 } from "../src/domain/models/circuit-device-row-move-project-command.model.js";
 import { createCircuitDeviceRowInsertProjectCommand } from "../src/domain/models/circuit-device-row-structure-project-command.model.js";
 import { createCircuitUpdateProjectCommand } from "../src/domain/models/circuit-project-command.model.js";
+import { createCircuitSectionReorderProjectCommand } from "../src/domain/models/circuit-section-reorder-project-command.model.js";
 import { createCircuitInsertProjectCommand } from "../src/domain/models/circuit-structure-project-command.model.js";
 import { ProjectCommandService } from "../src/domain/services/project-command.service.js";

@@ -84,6 +86,7 @@ function createService(context: DatabaseContext) {
    new CircuitDeviceRowStructureProjectCommandRepository(context.db),
    new CircuitDeviceRowMoveProjectCommandRepository(context.db),
    new CircuitStructureProjectCommandRepository(context.db),
+    new CircuitSectionReorderProjectCommandRepository(context.db),
    new ProjectHistoryRepository(context.db)
  );
 }
@@ -475,6 +478,91 @@ describe("project command service", () => {
    }
  });

+  it("dispatches complete section reorders without changing identifiers", () => {
+    const context = createTestDatabase();
+    try {
+      const firstCircuit = context.db
+        .select()
+        .from(circuits)
+        .where(eq(circuits.id, "circuit-1"))
+        .get();
+      assert.ok(firstCircuit);
+      context.db
+        .insert(circuits)
+        .values({
+          id: "circuit-2",
+          circuitListId: firstCircuit.circuitListId,
+          sectionId: firstCircuit.sectionId,
+          equipmentIdentifier: "-1F2",
+          sortOrder: 20,
+          isReserve: 1,
+        })
+        .run();
+
+      const reordered = createService(context).executeUser({
+        projectId: "project-1",
+        expectedRevision: 0,
+        command: createCircuitSectionReorderProjectCommand(
+          firstCircuit.sectionId,
+          [
+            {
+              circuitId: "circuit-1",
+              expectedSortOrder: 10,
+              targetSortOrder: 20,
+            },
+            {
+              circuitId: "circuit-2",
+              expectedSortOrder: 20,
+              targetSortOrder: 10,
+            },
+          ]
+        ),
+      });
+      assert.equal(reordered.history.undoDepth, 1);
+      assert.deepEqual(
+        context.db
+          .select({
+            id: circuits.id,
+            equipmentIdentifier: circuits.equipmentIdentifier,
+            sortOrder: circuits.sortOrder,
+          })
+          .from(circuits)
+          .all()
+          .sort((left, right) => left.id.localeCompare(right.id)),
+        [
+          {
+            id: "circuit-1",
+            equipmentIdentifier: "-1F1",
+            sortOrder: 20,
+          },
+          {
+            id: "circuit-2",
+            equipmentIdentifier: "-1F2",
+            sortOrder: 10,
+          },
+        ]
+      );
+
+      createService(context).undo({
+        projectId: "project-1",
+        expectedRevision: 1,
+      });
+      assert.deepEqual(
+        context.db
+          .select({ id: circuits.id, sortOrder: circuits.sortOrder })
+          .from(circuits)
+          .all()
+          .sort((left, right) => left.id.localeCompare(right.id)),
+        [
+          { id: "circuit-1", sortOrder: 10 },
+          { id: "circuit-2", sortOrder: 20 },
+        ]
+      );
+    } finally {
+      context.close();
+    }
+  });
+
  it("rejects unavailable history directions without writing a revision", () => {
    const context = createTestDatabase();
    try {