fix(service, test): checkmissingtransitionsafterdeletion test

-transition are not check anymore when the user add and
 delete stop from the trainrunsection tab component

Author: Math-R

src/app/services/data/trainrunsection.service.spec.ts

@@ -140,14 +140,15 @@ describe("TrainrunSectionService", () => {
 
     trainrunSectionService.deleteTrainrunSection(
       trainrunSectionService.getTrainrunSections()[1].getId(),
+      true,
+      true,
     );
 
     expect(nodeA.getTransitions().length).toBe(1);
     expect(nodeB.getTransitions().length).toBe(0);
     expect(nodeC.getTransitions().length).toBe(0);
     expect(nodeD.getTransitions().length).toBe(1);
     expect(nodeE.getTransitions().length).toBe(1);
-
     const transA_AB2 = nodeA.getTransition(tsAB.getId());
     const transA_EA2 = nodeA.getTransition(tsEA.getId());
     expect(transA_AB2.getId()).toBe(transA_EA2.getId());

src/app/services/data/trainrunsection.service.ts

@@ -681,8 +681,13 @@ export class TrainrunSectionService implements OnDestroy {
     }
   }
 
-  deleteTrainrunSection(trainrunSectionId: number, enforceUpdate = true) {
+  deleteTrainrunSection(
+    trainrunSectionId: number,
+    enforceUpdate = true,
+    checkAllTransitions = false,
+  ) {
     const trainrunSection = this.getTrainrunSectionFromId(trainrunSectionId);
+    const trainrun = trainrunSection.getTrainrun();
     const sourceNodeId = trainrunSection.getSourceNodeId();
     const targetNodeId = trainrunSection.getTargetNodeId();
     this.deleteTrainrunSectionAndCleanupNodes(trainrunSection, false);
@@ -702,6 +707,12 @@ export class TrainrunSectionService implements OnDestroy {
           false,
         );
       });
+    if (
+      checkAllTransitions &&
+      this.getAllTrainrunSectionsForTrainrun(trainrun.getId()).length > 0
+    ) {
+      this.checkMissingTransitionsAfterDeletion(trainrun);
+    }
     if (enforceUpdate) {
       this.nodeService.transitionsUpdated();
       this.nodeService.connectionsUpdated();
@@ -1160,40 +1171,25 @@ export class TrainrunSectionService implements OnDestroy {
 
   checkMissingTransitionsAfterDeletion(trainrun: Trainrun) {
     const trainrunSections = this.getAllTrainrunSectionsForTrainrun(trainrun.getId());
+
+    const nodesSeen = new Map<number, Node>();
     trainrunSections.forEach((ts) => {
-      const sourceNode = ts.getSourceNode();
-      const targetNode = ts.getTargetNode();
-
-      const srcPortsWithoutTransitions = sourceNode
-        .getPorts()
-        .filter(
-          (port) =>
-            port.getTrainrunSection().getTrainrunId() === trainrun.getId() &&
-            sourceNode.getTransitionFromPortId(port.getId()) === undefined,
-        );
-      const trgPortsWithoutTransitions = targetNode
-        .getPorts()
-        .filter(
-          (port) =>
-            port.getTrainrunSection().getTrainrunId() === trainrun.getId() &&
-            targetNode.getTransitionFromPortId(port.getId()) === undefined,
-        );
+      nodesSeen.set(ts.getSourceNode().getId(), ts.getSourceNode());
+      nodesSeen.set(ts.getTargetNode().getId(), ts.getTargetNode());
+    });
 
-      if (srcPortsWithoutTransitions.length > 1) {
-        this.nodeService.addTransitionToNodes(
-          sourceNode.getId(),
-          targetNode.getId(),
-          srcPortsWithoutTransitions[0].getTrainrunSection(),
-        );
-      }
+    nodesSeen.forEach((node) => {
+      const freePorts = node.getFreePortsForTrainrun(trainrun.getId());
+      if (freePorts.length !== 2) return;
 
-      if (trgPortsWithoutTransitions.length > 1) {
-        this.nodeService.addTransitionToNodes(
-          sourceNode.getId(),
-          targetNode.getId(),
-          trgPortsWithoutTransitions[0].getTrainrunSection(),
-        );
-      }
+      const ts1 = freePorts[0].getTrainrunSection();
+      const ts2 = freePorts[1].getTrainrunSection();
+
+      // Skip natural terminal nodes of circular paths (e.g. A in A-B-C-A):
+      // if the trainrun still forms a cycle, no transition should be created.
+      if (this.trainrunService.isStartEqualsEndNode(ts1.getId())) return;
+
+      this.nodeService.addTransitionToNodeForTrainrunSections(node.getId(), ts1, ts2);
     });
   }
 

src/app/view/editor-main-view/data-views/editor.keyEvents.ts

@@ -543,7 +543,7 @@ export class EditorKeyEvents {
         if (ts.getSourceNode().selected() && ts.getTargetNode().selected()) {
           newTrainrunSectionToModify.push(ts);
         } else {
-          this.trainrunSectionService.deleteTrainrunSection(ts.getId(), false);
+          this.trainrunSectionService.deleteTrainrunSection(ts.getId(), false, true);
         }
       });
     });
@@ -751,7 +751,7 @@ export class EditorKeyEvents {
     });
     visibleTrainrunSections = visibleTrainrunSections.filter((v, i, a) => a.indexOf(v) === i);
     visibleTrainrunSections.forEach((trainrunSectionId: number) => {
-      this.trainrunSectionService.deleteTrainrunSection(trainrunSectionId, false);
+      this.trainrunSectionService.deleteTrainrunSection(trainrunSectionId, false, true);
     });
 
     let selectedNodeDeleted = false;

src/app/view/editor-main-view/editor-main-view.component.ts

@@ -217,7 +217,7 @@ export class EditorMainViewComponent implements AfterViewInit, OnDestroy {
       },
     );
     this.editorView.bindDeleteTrainrunSection((trainrunSection: TrainrunSection) =>
-      this.trainrunSectionService.deleteTrainrunSection(trainrunSection.getId()),
+      this.trainrunSectionService.deleteTrainrunSection(trainrunSection.getId(), true, true),
     );
     this.editorView.bindSetTrainrunSectionAsSelected((trainrunSection: TrainrunSection) => {
       this.trainrunService.setTrainrunAsSelected(trainrunSection.getTrainrun().getId());