Added the position filed to the hierarchy to keep the same order in t…

…he report as in the analysis.
monarc-project · Nov 18, 2024 · 82b1423 · 82b1423
1 parent 4b21262
commit 82b1423
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/Entity/InstanceSuperClass.php b/src/Entity/InstanceSuperClass.php
@@ -504,27 +504,30 @@ public function removeAllOperationalInstanceRisks(): self
     public function getHierarchyArray(): array
     {
         if ($this->isRoot()) {
-            return [array_merge($this->getNames(), ['id' => $this->id, 'root' => null, 'parent' => null])];
+            return [array_merge(
+                $this->getNames(),
+                ['id' => $this->id, 'root' => null, 'parent' => null, 'position' => $this->position]
+            )];
         }
 
-        return $this->getParents();
+        return $this->getParentsArray();
     }
 
-    private function getParents(): array
+    private function getParentsArray(): array
     {
         if ($this->isRoot() || $this->getParent() === null) {
-            return [array_merge($this->getNames(), ['id' => $this->getId(), 'root' => null, 'parent' => null])];
+            return [array_merge(
+                $this->getNames(),
+                ['id' => $this->getId(), 'root' => null, 'parent' => null, 'position' => $this->getPosition()]
+            )];
         }
 
-        return array_merge(
-            $this->getParent()->getParents(),
-            [
-                array_merge(
-                    $this->getNames(),
-                    ['id' => $this->getId(), 'root' => $this->getRoot(), 'parent' => $this->getParent()]
-                )
-            ]
-        );
+        return array_merge($this->getParent()->getParentsArray(), [array_merge($this->getNames(), [
+            'id' => $this->getId(),
+            'root' => $this->getRoot(),
+            'parent' => $this->getParent(),
+            'position' => $this->getPosition(),
+        ])]);
     }
 
     /**