fix(model-sync-lib): fixed moving within the same parent but across roles

Author: mhuster23

model-sync-lib/src/main/kotlin/org/modelix/model/sync/ModelImporter.kt

@@ -164,22 +164,28 @@ class ModelImporter(private val root: INode, val stats: ImportStats? = null) {
 
         val targetIndices = HashMap<String?, Int>(nodeData.children.size)
         for (child in toBeSortedSpec) {
-            val baseIndex = toBeSortedSpec.filter { it.role == node.roleInParent }.indexOf(child)
+
+            val childrenInRole = existingChildren.filter { it.roleInParent == child.role }
+            val baseIndex = child.getIndexWithinRole(nodeData, childrenInRole.lastIndex)
             var offset = 0
-            offset += existingChildren.filter { it.roleInParent == child.role }.slice(0..baseIndex).count {
+            offset += childrenInRole.slice(0..baseIndex).count {
                 !originalIdToSpec.containsKey(it.originalId()) // node will be deleted
             }
-            offset -= specifiedChildren.filter { it.role == child.role }.slice(0..baseIndex).count {
+            offset -= childrenInRole.slice(0..baseIndex).count {
                 !existingIds.contains(it.originalId()) // node will be moved here
             }
-            val index = baseIndex + offset
-            targetIndices[child.originalId()] = minOf(index, existingChildren.size - 1)
+            val index = if (childrenInRole.isEmpty()) 0 else baseIndex + offset
+            val upperBound = if (existingChildren.isEmpty()) 0 else existingChildren.lastIndex
+            targetIndices[child.originalId()] = minOf(index, upperBound)
         }
 
-        for ((index, child) in existingChildren.withIndex()) {
+        existingChildren.forEach { child ->
+
+            val currentIndex = child.index()
+            val targetRole = originalIdToSpec[child.originalId()]?.role
             val targetIndex = targetIndices[child.originalId()]
-            if (targetIndex != null && targetIndex != index) {
-                node.moveChildWithStats(child.roleInParent, targetIndex, child)
+            if (targetIndex != null && (targetIndex != currentIndex || child.roleInParent != targetRole)) {
+                node.moveChildWithStats(targetRole, targetIndex, child)
             }
         }
     }

model-sync-lib/src/test/kotlin/org/modelix/model/sync/ModelImporterTest.kt

@@ -94,7 +94,7 @@ class ModelImporterTest {
         val stats = importer.stats ?: fail("No import stats found.")
         assertEquals(1, stats.additions.size)
         assertEquals(1, stats.deletions.size)
-        assertEquals(4, stats.moves.size)
+        assertEquals(5, stats.moves.size)
         assertEquals(4, stats.propertyChanges.size)
         assertEquals(3, stats.referenceChanges.size)
     }

model-sync-lib/src/test/resources/model.json

@@ -55,6 +55,13 @@
         "properties": {
           "purpose": "move across parents"
         }
+      },
+      {
+        "id": "node:006",
+        "role": "roleBefore",
+        "properties": {
+          "purpose": "change role"
+        }
       }
     ]
   }

model-sync-lib/src/test/resources/newmodel.json

@@ -58,6 +58,13 @@
         "properties": {
           "purpose": "move across parents"
         }
+      },
+      {
+        "id": "node:006",
+        "role": "roleAfter",
+        "properties": {
+          "purpose": "change role"
+        }
       }
     ]
   }