Merge pull request #450 from modelix/feature/delete-repository

Introduce delete repository endpoint

Author: benedekh

api/model-server.yaml

@@ -314,6 +314,20 @@ paths:
           $ref: '#/components/responses/500'
         "200":
           $ref: '#/components/responses/versionDelta'
+  /v2/repositories/{repository}/delete:
+    post:
+      operationId: deleteRepository
+      parameters:
+        - name: repository
+          in: "path"
+          required: true
+          schema:
+            type: string
+      responses:
+        "204":
+          $ref: '#/components/responses/204'
+        "404":
+          $ref: '#/components/responses/404'
   /v2/repositories/{repository}/versions/{versionHash}:
     get:
       operationId: getRepositoryVersionHash

model-client/src/commonMain/kotlin/org/modelix/model/client2/IModelClientV2.kt

@@ -41,7 +41,7 @@ interface IModelClientV2 {
 
     suspend fun initRepository(repository: RepositoryId): IVersion
     suspend fun listRepositories(): List<RepositoryId>
-
+    suspend fun deleteRepository(repository: RepositoryId): Boolean
     suspend fun listBranches(repository: RepositoryId): List<BranchReference>
 
     @Deprecated("repository ID is required for permission checks")

model-client/src/commonMain/kotlin/org/modelix/model/client2/ModelClientV2.kt

@@ -140,6 +140,20 @@ class ModelClientV2(
         }.bodyAsText().lines().map { RepositoryId(it) }
     }
 
+    override suspend fun deleteRepository(repository: RepositoryId): Boolean {
+        try {
+            return httpClient.post {
+                url {
+                    takeFrom(baseUrl)
+                    appendPathSegmentsEncodingSlash("repositories", repository.id, "delete")
+                }
+            }.status == HttpStatusCode.NoContent
+        } catch (ex: Exception) {
+            LOG.error(ex) { ex.message }
+            return false
+        }
+    }
+
     override suspend fun listBranches(repository: RepositoryId): List<BranchReference> {
         return httpClient.get {
             url {

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

@@ -165,6 +165,19 @@ class ModelReplicationServer(val repositoriesManager: RepositoriesManager) {
             call.respondDelta(initialVersion.getContentHash(), null)
         }
 
+        post<Paths.deleteRepository> {
+            fun ApplicationCall.repositoryId() = RepositoryId(parameters["repository"]!!)
+            fun PipelineContext<Unit, ApplicationCall>.repositoryId() = call.repositoryId()
+
+            val repositoryId = repositoryId()
+            val foundAndDeleted = repositoriesManager.removeRepository(repositoryId)
+            if (foundAndDeleted) {
+                call.respond(HttpStatusCode.NoContent)
+            } else {
+                call.respond(HttpStatusCode.NotFound)
+            }
+        }
+
         post<Paths.postRepositoryBranch> {
             fun ApplicationCall.repositoryId() = RepositoryId(parameters["repository"]!!)
             fun PipelineContext<Unit, ApplicationCall>.repositoryId() = call.repositoryId()

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

@@ -76,15 +76,23 @@ class RepositoriesManager(val client: LocalModelClient) {
     }
 
     fun getRepositories(): Set<RepositoryId> {
-        return store[REPOSITORIES_LIST_KEY]?.lines()?.map { RepositoryId(it) }?.toSet() ?: emptySet()
+        val repositoriesList = store[REPOSITORIES_LIST_KEY]
+        val emptyRepositoriesList = repositoriesList.isNullOrBlank()
+        return if (emptyRepositoriesList) {
+            emptySet()
+        } else {
+            repositoriesList!!.lines().map { RepositoryId(it) }.toSet()
+        }
     }
 
+    fun repositoryExists(repositoryId: RepositoryId) = getRepositories().contains(repositoryId)
+
     fun createRepository(repositoryId: RepositoryId, userName: String?, useRoleIds: Boolean = true): CLVersion {
         var initialVersion: CLVersion? = null
         store.runTransaction {
             val masterBranch = repositoryId.getBranchReference()
+            if (repositoryExists(repositoryId)) throw RepositoryAlreadyExistsException(repositoryId.id)
             val existingRepositories = getRepositories()
-            if (existingRepositories.contains(repositoryId)) throw RepositoryAlreadyExistsException(repositoryId.id)
             store.put(REPOSITORIES_LIST_KEY, (existingRepositories + repositoryId).joinToString("\n") { it.id }, false)
             store.put(branchListKey(repositoryId), masterBranch.branchName, false)
             initialVersion = CLVersion.createRegularVersion(
@@ -137,15 +145,21 @@ class RepositoriesManager(val client: LocalModelClient) {
         }
     }
 
-    fun removeRepository(repository: RepositoryId) {
-        store.runTransaction {
+    fun removeRepository(repository: RepositoryId): Boolean {
+        return store.runTransaction {
+            if (!repositoryExists(repository)) {
+                return@runTransaction false
+            }
+
             for (branchName in getBranchNames(repository)) {
                 putVersionHash(repository.getBranchReference(branchName), null)
             }
             store.put(branchListKey(repository), null)
             val existingRepositories = getRepositories()
             val remainingRepositories = existingRepositories - repository
             store.put(REPOSITORIES_LIST_KEY, remainingRepositories.joinToString("\n") { it.id })
+
+            true
         }
     }
 

model-server/src/test/kotlin/org/modelix/model/server/ModelClientV2Test.kt

@@ -36,6 +36,7 @@ import org.modelix.model.server.handlers.ModelReplicationServer
 import org.modelix.model.server.store.InMemoryStoreClient
 import org.modelix.modelql.core.count
 import org.modelix.modelql.untyped.allChildren
+import java.util.UUID
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -154,4 +155,27 @@ class ModelClientV2Test {
 
         assertEquals("localhost", modelClient.getUserId())
     }
+
+    @Test
+    fun `newly created repository can be removed`() = runTest {
+        val url = "http://localhost/v2"
+        val client = ModelClientV2.builder().url(url).client(client).build().also { it.init() }
+        val repositoryId = RepositoryId(UUID.randomUUID().toString())
+        client.initRepository(repositoryId)
+
+        val success = client.deleteRepository(repositoryId)
+
+        assertEquals(true, success)
+    }
+
+    @Test
+    fun `non-existing repository cannot be removed`() = runTest {
+        val url = "http://localhost/v2"
+        val client = ModelClientV2.builder().url(url).client(client).build().also { it.init() }
+        val repositoryId = RepositoryId(UUID.randomUUID().toString())
+
+        val success = client.deleteRepository(repositoryId)
+
+        assertEquals(false, success)
+    }
 }