fix(model-sync-lib): fixed sync of child node order within roles

Author: mhuster23

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

@@ -123,7 +123,7 @@ class ModelImporter(private val root: INode) {
 
     private fun syncAllChildOrders(root: INode, rootData: NodeData) {
         syncChildOrder(root, rootData)
-        for ((node, data) in root.allChildren.zip(rootData.children)) {
+        for ((node, data) in root.allChildren zip rootData.children) {
             syncAllChildOrders(node, data)
         }
     }
@@ -133,15 +133,22 @@ class ModelImporter(private val root: INode) {
         val specifiedChildren = nodeData.children
         require(existingChildren.size == specifiedChildren.size)
 
-        for ((actualNode, specifiedNode) in existingChildren zip specifiedChildren) {
-            val actualId = actualNode.originalId()
-            if (actualId != specifiedNode.originalId() ) {
-                val targetIndex = specifiedChildren.indexOfFirst { actualId == it.originalId() }
-                node.moveChild(actualNode.roleInParent, targetIndex, actualNode)
-            }
+        val targetIndices = HashMap<String?, Int>(nodeData.children.size)
+        for (specifiedChild in specifiedChildren) {
+            val index = specifiedChild.getIndexWithinRole(nodeData)
+            targetIndices[specifiedChild.originalId()] = index
+        }
+
+        for (child in existingChildren) {
+            val targetIndex = targetIndices[child.originalId()] ?: -1
+            node.moveChild(child.roleInParent, targetIndex, child)
         }
     }
 
+    private fun NodeData.getIndexWithinRole(parent: NodeData) : Int {
+        return parent.children.filter { it.role == this.role }.indexOf(this)
+    }
+
     private fun INode.originalId(): String? {
         return this.getPropertyValue(NodeData.idPropertyKey)
     }