Merge pull request #1226 from modelix/fix/expand-to-node

MODELIX-1046 Expand to node functionality is broken

Author: mhuster23

model-server/src/main/kotlin/org/modelix/model/server/handlers/ui/ContentExplorer.kt

@@ -75,7 +75,6 @@ import org.modelix.model.server.handlers.NodeNotFoundException
 import org.modelix.model.server.handlers.getLegacyObjectStore
 import org.modelix.model.server.store.StoreManager
 import org.modelix.model.server.templates.PageWithMenuBar
-import kotlin.collections.set
 
 class ContentExplorer(private val repoManager: IRepositoriesManager) {
 
@@ -215,7 +214,7 @@ class ContentExplorer(private val repoManager: IRepositoriesManager) {
     private fun getAncestorsAndSelf(expandTo: Long, tree: CLTree): Set<String> {
         val seq = generateSequence(expandTo) { id ->
             try {
-                tree.getParent(id)
+                tree.getParent(id).takeIf { it != 0L } // getParent returns 0L for root node
             } catch (e: org.modelix.model.lazy.NodeNotFoundException) {
                 throw NodeNotFoundException(id, e)
             }

model-server/src/test/kotlin/org/modelix/model/server/handlers/ui/ContentExplorerTest.kt

@@ -20,6 +20,7 @@ import io.kotest.assertions.ktor.client.shouldHaveStatus
 import io.kotest.matchers.string.shouldContain
 import io.ktor.client.call.body
 import io.ktor.client.request.get
+import io.ktor.client.request.parameter
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.bodyAsText
@@ -35,7 +36,10 @@ import org.jsoup.select.Evaluator
 import org.modelix.model.api.IReferenceLink
 import org.modelix.model.api.ITree
 import org.modelix.model.api.NodeReferenceById
+import org.modelix.model.api.PNodeAdapter
+import org.modelix.model.api.addNewChild
 import org.modelix.model.client.successful
+import org.modelix.model.client2.ModelClientV2
 import org.modelix.model.client2.runWrite
 import org.modelix.model.lazy.CLVersion
 import org.modelix.model.lazy.RepositoryId
@@ -140,6 +144,33 @@ class ContentExplorerTest {
         assertTrue { root.childrenSize() > 0 }
     }
 
+    @Test
+    fun `nodes can be expanded to`() = runTest {
+        val client = createHttpClient()
+        val branchRef = RepositoryId("node-expand-to-test").getBranchReference("master")
+        client.post("/v2/repositories/${branchRef.repositoryId}/init")
+        val modelClient = ModelClientV2.builder()
+            .client(client)
+            .url("/v2")
+            .build().also { it.init() }
+
+        modelClient.use {
+            val newestChild = modelClient.runWrite(branchRef) { rootNode ->
+                rootNode.addNewChild(null)
+                    .addNewChild(null)
+                    .addNewChild(null)
+            }
+            val versionHash = modelClient.pullHash(branchRef)
+            val expandToId = (newestChild as PNodeAdapter).nodeId
+
+            val response = client.get("/content/repositories/${branchRef.repositoryId}/versions/$versionHash/") {
+                parameter("expandTo", expandToId)
+            }
+            response shouldHaveStatus HttpStatusCode.OK
+            response.bodyAsText() shouldContain expandToId.toString()
+        }
+    }
+
     @Test
     fun `expanding to non-existing node leads to not found response`() = runTest {
         val client = createHttpClient()