fix(model-sync-lib): fixed move not being applied on new parents

Author: mhuster23

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

@@ -27,9 +27,9 @@ class ModelImporter(private val root: INode, val stats: ImportStats? = null) {
         val addedNodes = addAllMissingChildren(root, originalIdToExisting, originalIdToSpec)
         syncAllProperties(addedNodes, originalIdToSpec)
 
-        handleAllMovesAcrossParents(allExistingNodes, originalIdToExisting, originalIdToSpec)
 
         val allNodes = allExistingNodes + addedNodes
+        handleAllMovesAcrossParents(allNodes, originalIdToExisting, originalIdToSpec)
         val originalIdToRef: MutableMap<String, INodeReference> = buildRefIndex(allNodes)
         syncAllReferences(allNodes, originalIdToSpec, originalIdToRef)
         deleteAllExtraChildren(allNodes, originalIdToSpec)
@@ -217,8 +217,8 @@ class ModelImporter(private val root: INode, val stats: ImportStats? = null) {
         toBeMovedHere.forEach {nodeToBeMoved ->
             val spec = originalIdToSpec[nodeToBeMoved.originalId()]!!
 
-            val baseTargetIndex = spec.getIndexWithinRole(nodeData, existingChildren.size - 1)
-            val offset = existingChildren.slice(0..baseTargetIndex).count {
+            val baseTargetIndex = spec.getIndexWithinRole(nodeData, existingChildren.lastIndex)
+            val offset = existingChildren.slice(0 until baseTargetIndex).count {
                 !originalIdToSpec.containsKey(it.originalId()) // node will be deleted
             }
             val targetIndex = baseTargetIndex + offset

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

@@ -128,7 +128,7 @@ class ModelImporterTest {
         val tree0 = CLTree(ObjectStoreCache(MapBaseStore()))
         val branch0 = PBranch(tree0, IdGenerator.getInstance(1))
 
-        val seed = 1896439714 //Random.nextInt()
+        val seed = Random.nextInt()
         println("Seed for random change test: $seed")
         lateinit var initialState: NodeData
         lateinit var specification: NodeData
@@ -158,14 +158,14 @@ class ModelImporterTest {
             importer.import(ModelData(root = initialState))
             importer.import(ModelData(root = specification))
 
-            println("INITIAL")
-            println(initialState.toJson())
-
-            println("SPEC")
-            println(specification.toJson())
-
-            println("ACTUAL")
-            println(branch1.getRootNode().toJson())
+//            println("INITIAL")
+//            println(initialState.toJson())
+//
+//            println("SPEC")
+//            println(specification.toJson())
+//
+//            println("ACTUAL")
+//            println(branch1.getRootNode().toJson())
 
             assertAllNodesConformToSpec(specification, branch1.getRootNode())
             assert(importer.stats!!.getTotal() <= numChanges)