fix(model-server): return HTTP 204 if repo was deleted and 404 if repo was not found

Author: benedekh

api/model-server.yaml

@@ -324,8 +324,10 @@ paths:
           schema:
             type: string
       responses:
-        "200":
-          $ref: '#/components/responses/200'
+        "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/ModelClientV2.kt

@@ -146,7 +146,7 @@ class ModelClientV2(
                 takeFrom(baseUrl)
                 appendPathSegmentsEncodingSlash("repositories", repository.id, "delete")
             }
-        }.status == HttpStatusCode.OK
+        }.status == HttpStatusCode.NoContent
     }
 
     override suspend fun listBranches(repository: RepositoryId): List<BranchReference> {

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

@@ -169,8 +169,13 @@ class ModelReplicationServer(val repositoriesManager: RepositoriesManager) {
             fun ApplicationCall.repositoryId() = RepositoryId(parameters["repository"]!!)
             fun PipelineContext<Unit, ApplicationCall>.repositoryId() = call.repositoryId()
 
-            repositoriesManager.removeRepository(repositoryId())
-            call.respond(HttpStatusCode.OK)
+            val repositoryId = repositoryId()
+            if (!repositoriesManager.repositoryExists(repositoryId)) {
+                call.respond(HttpStatusCode.NotFound)
+            } else {
+                repositoriesManager.removeRepository(repositoryId)
+                call.respond(HttpStatusCode.NoContent)
+            }
         }
 
         post<Paths.postRepositoryBranch> {

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(