fix(model-sync-lib): extended ImportStats

Author: mhuster23

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

@@ -1,22 +1,31 @@
 package org.modelix.model.sync
 
 class ImportStats {
-    val additions: List<String> = mutableListOf()
-    val deletions: List<String> = mutableListOf()
-    val moves: List<String> = mutableListOf()
+    val additions: List<Addition> = mutableListOf()
+    val deletions: List<Deletion> = mutableListOf()
+    val moves: List<Move> = mutableListOf()
     val propertyChanges: List<PropertyChange> = mutableListOf()
     val referenceChanges: List<ReferenceChange> = mutableListOf()
 
-    fun addAddition(nodeId: String) {
-        (additions as MutableList).add(nodeId)
+    fun addAddition(nodeId: String?, parentId: String?, role: String?, index: Int) {
+        (additions as MutableList).add(Addition(nodeId, parentId, role, index))
     }
 
-    fun addDeletion(nodeId: String) {
-       (deletions as MutableList).add(nodeId)
+    fun addDeletion(nodeId: String?, parentId: String?, role: String?, descendantIds: List<String>) {
+       (deletions as MutableList).add(Deletion(nodeId, parentId, role, descendantIds))
     }
 
-    fun addMove(nodeId: String) {
-        (moves as MutableList).add(nodeId)
+    fun addMove(
+        nodeId: String?,
+        oldParentId: String?,
+        oldRole: String?,
+        oldIndex: Int,
+        newParentId: String?,
+        newRole: String?,
+        newIndex: Int
+    ) {
+        (moves as MutableList).add(
+            Move(nodeId, oldParentId, oldRole, oldIndex, newParentId, newRole, newIndex))
     }
 
     fun addPropertyChange(nodeId: String, property: String) {
@@ -27,8 +36,40 @@ class ImportStats {
         (referenceChanges as MutableList).add(ReferenceChange(nodeId, reference))
     }
 
+    fun getTotal() : Int = additions.size + deletions.size + moves.size + propertyChanges.size + referenceChanges.size
+
+}
+
+interface NodeChange {
+    val nodeId: String?
+    val parentId: String?
+    val role: String?
 }
 
+data class Addition(
+    override val nodeId: String?,
+    override val parentId: String?,
+    override val role: String?,
+    val index: Int
+) : NodeChange
+
+data class Deletion(
+    override val nodeId: String?,
+    override val parentId: String?,
+    override val role: String?,
+    val descendantIds: List<String>
+) : NodeChange
+
+data class Move(
+    override val nodeId: String?,
+    override val parentId: String?,
+    override val role: String?,
+    val oldIndex: Int,
+    val newParentId: String?,
+    val newRole: String?,
+    val newIndex: Int
+) : NodeChange
+
 data class PropertyChange(val nodeId: String, val property: String)
 data class ReferenceChange(val nodeId: String, val reference: String)
 

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

@@ -1,8 +1,6 @@
 package org.modelix.model.sync
 
-import org.modelix.model.api.ConceptReference
-import org.modelix.model.api.INode
-import org.modelix.model.api.INodeReference
+import org.modelix.model.api.*
 import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
 import java.io.File
@@ -164,37 +162,50 @@ class ModelImporter(private val root: INode, val stats: ImportStats? = null) {
         val createdNode = addNewChild(spec.role, index, concept)
         createdNode.setPropertyValue(NodeData.idPropertyKey, spec.originalId())
         if (this@ModelImporter.stats != null) {
-            createdNode.originalId()?.let { stats.addAddition(it) }
+            stats.addAddition(
+                createdNode.originalId(),
+                this.originalId(),
+                createdNode.roleInParent,
+                index
+            )
         }
         return createdNode
     }
 
     private fun INode.moveChildWithStats(role: String?, index: Int, child: INode) {
         if (this@ModelImporter.stats != null) {
-            child.originalId()?.let { stats.addMove(it) }
+            stats.addMove(
+                child.originalId(),
+                child.parent?.originalId(),
+                child.roleInParent,
+                child.index(),
+                this.originalId(),
+                role,
+                index
+            )
         }
-        return moveChild(role, index, child)
+        moveChild(role, index, child)
     }
 
     private fun INode.removeChildWithStats(child: INode) {
         if (this@ModelImporter.stats != null) {
-            child.originalId()?.let { stats.addDeletion(it) }
+            stats.addDeletion(child.originalId(), parent?.originalId(), child.roleInParent, child.getDescendants(false).mapNotNull { it.originalId() }.toList())
         }
-        return removeChild(child)
+        removeChild(child)
     }
 
     private fun INode.setPropertyValueWithStats(role: String, value: String?) {
         if (this@ModelImporter.stats != null) {
             this.originalId()?.let { stats.addPropertyChange(it, role) }
         }
-        return setPropertyValue(role, value)
+        setPropertyValue(role, value)
     }
 
     private fun INode.setReferenceTargetWithStats(role: String, target: INodeReference?) {
         if (this@ModelImporter.stats != null) {
             this.originalId()?.let { stats.addReferenceChange(it, role) }
         }
-        return setReferenceTarget(role, target)
+        setReferenceTarget(role, target)
     }
 
 }