Merge pull request #967 from modelix/fix/404-on-querying-invalid-branch

MODELIX-993 Requested, but non-existing branch is handled with internal server errors

Author: mhuster23

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

@@ -287,9 +287,9 @@ class ModelReplicationServer(
         val branchRef = repositoryId(repository).getBranchReference(branch)
         checkPermission(ModelServerPermissionSchema.branch(branchRef).query)
         runWithRepository(repository) {
-            val version = repositoriesManager.getVersion(branchRef)
+            val version = repositoriesManager.getVersion(branchRef) ?: throw BranchNotFoundException(branchRef)
             LOG.trace("Running query on {} @ {}", branchRef, version)
-            val initialTree = version!!.getTree()
+            val initialTree = version.getTree()
             val otBranch = OTBranch(
                 PBranch(initialTree, modelClient.idGenerator),
                 modelClient.idGenerator,

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

@@ -66,6 +66,7 @@ import org.modelix.model.operations.RevertToOp
 import org.modelix.model.operations.applyOperation
 import org.modelix.model.persistent.CPVersion.Companion.DESERIALIZER
 import org.modelix.model.server.ModelServerPermissionSchema
+import org.modelix.model.server.handlers.BranchNotFoundException
 import org.modelix.model.server.handlers.IRepositoriesManager
 import org.modelix.model.server.templates.PageWithMenuBar
 import java.time.LocalDateTime
@@ -128,7 +129,7 @@ class HistoryHandler(val client: IModelClient, private val repositoriesManager:
     }
 
     private suspend fun revert(repositoryAndBranch: BranchReference, from: String?, to: String?, author: String?) {
-        val version = repositoriesManager.getVersion(repositoryAndBranch) ?: throw RuntimeException("Branch doesn't exist: $repositoryAndBranch")
+        val version = repositoriesManager.getVersion(repositoryAndBranch) ?: throw BranchNotFoundException(repositoryAndBranch)
         val branch = OTBranch(PBranch(version.getTree(), client.idGenerator), client.idGenerator, client.storeCache)
         branch.runWriteT { t ->
             t.applyOperation(RevertToOp(KVEntryReference(from!!, DESERIALIZER), KVEntryReference(to!!, DESERIALIZER)))

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

@@ -28,6 +28,7 @@ import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.request.accept
 import io.ktor.client.request.delete
 import io.ktor.client.request.get
+import io.ktor.client.request.post
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
@@ -191,6 +192,15 @@ class ModelReplicationServerTest {
         }
     }
 
+    @Test
+    fun `responds with 404 when querying non-existent branch`() = runWithTestModelServer { _, _ ->
+        val repositoryId = "abc"
+        val branch = "non-existing-branch"
+        val response = client.post("/v2/repositories/$repositoryId/branches/$branch/query")
+        response shouldHaveStatus 404
+        assertContains(response.bodyAsText(), "Branch '$branch' does not exist in repository '$repositoryId'")
+    }
+
     @Test
     fun `successfully deletes existing branches`() {
         val repositoryId = RepositoryId("repo1")