feat: add delete + fix invalidRequest return

stellio-hub · Sep 3, 2024 · 98a8f7d · 98a8f7d
1 parent 9497e26
commit 98a8f7d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/...ce/src/main/kotlin/com/egm/stellio/search/csr/handler/ContextSourceRegistrationHandler.kt b/...ce/src/main/kotlin/com/egm/stellio/search/csr/handler/ContextSourceRegistrationHandler.kt
@@ -10,10 +10,7 @@ import com.egm.stellio.search.csr.model.ContextSourceRegistration.Companion.dese
 import com.egm.stellio.search.csr.model.serialize
 import com.egm.stellio.search.csr.service.ContextSourceRegistrationService
 import com.egm.stellio.shared.config.ApplicationProperties
-import com.egm.stellio.shared.model.APIException
-import com.egm.stellio.shared.model.AccessDeniedException
-import com.egm.stellio.shared.model.AlreadyExistsException
-import com.egm.stellio.shared.model.ResourceNotFoundException
+import com.egm.stellio.shared.model.*
 import com.egm.stellio.shared.util.*
 import com.egm.stellio.shared.util.JsonUtils.deserializeAsMap
 import com.egm.stellio.shared.web.BaseHandler
@@ -128,6 +125,23 @@ class ContextSourceRegistrationHandler(
         { it }
     )
 
+    /**
+     * Implements 6.9.3.3 - Delete ContextSourceRegistration
+     */
+    @DeleteMapping("/{contextSourceRegistrationId}")
+    suspend fun delete(@PathVariable contextSourceRegistrationId: URI): ResponseEntity<*> = either {
+        checkContextSourceRegistrationExists(contextSourceRegistrationId).bind()
+
+        val sub = getSubFromSecurityContext()
+        checkIsAllowed(contextSourceRegistrationId, sub).bind()
+        contextSourceRegistrationService.delete(contextSourceRegistrationId).bind()
+
+        ResponseEntity.status(HttpStatus.NO_CONTENT).build<String>()
+    }.fold(
+        { it.toErrorResponse() },
+        { it }
+    )
+
     private suspend fun checkContextSourceRegistrationExists(
         contextSourceRegistrationId: URI
     ): Either<APIException, Unit> =

diff --git a/...ce/src/main/kotlin/com/egm/stellio/search/csr/service/ContextSourceRegistrationService.kt b/...ce/src/main/kotlin/com/egm/stellio/search/csr/service/ContextSourceRegistrationService.kt
@@ -15,6 +15,9 @@ import com.egm.stellio.shared.model.*
 import com.egm.stellio.shared.util.*
 import com.egm.stellio.shared.util.JsonLdUtils.NGSILD_CSR_TERM
 import io.r2dbc.postgresql.codec.Json
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate
+import org.springframework.data.relational.core.query.Criteria.where
+import org.springframework.data.relational.core.query.Query.query
 import org.springframework.r2dbc.core.DatabaseClient
 import org.springframework.r2dbc.core.bind
 import org.springframework.stereotype.Component
@@ -25,6 +28,7 @@ import java.util.regex.Pattern
 @Component
 class ContextSourceRegistrationService(
     private val databaseClient: DatabaseClient,
+    private val r2dbcEntityTemplate: R2dbcEntityTemplate
 ) {
 
     suspend fun validateNewContextSourceRegistration(
@@ -170,6 +174,11 @@ class ContextSourceRegistrationService(
             }
     }
 
+    suspend fun delete(id: URI): Either<APIException, Unit> =
+        r2dbcEntityTemplate.delete(ContextSourceRegistration::class.java)
+            .matching(query(where("id").`is`(id)))
+            .execute()
+
     suspend fun getContextSourceRegistrations(
         limit: Int,
         offset: Int,

diff --git a/shared/src/main/kotlin/com/egm/stellio/shared/util/JsonUtils.kt b/shared/src/main/kotlin/com/egm/stellio/shared/util/JsonUtils.kt
@@ -1,6 +1,6 @@
 package com.egm.stellio.shared.util
 
-import com.egm.stellio.shared.model.InvalidRequestException
+import com.egm.stellio.shared.model.BadRequestDataException
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_JSON_TERM
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_VALUE_TERM
 import com.fasterxml.jackson.annotation.JsonInclude
@@ -43,7 +43,7 @@ object JsonUtils {
                 mapper.typeFactory.constructMapLikeType(Map::class.java, String::class.java, Any::class.java)
             )
         } catch (e: JsonProcessingException) {
-            throw InvalidRequestException(e.message!!)
+            throw BadRequestDataException(e.message!!)
         }
 
     fun String.deserializeAsMap(): Map<String, Any> =
@@ -61,7 +61,7 @@ object JsonUtils {
                 mapper.typeFactory.constructCollectionType(MutableList::class.java, Map::class.java)
             )
         } catch (e: JsonProcessingException) {
-            throw InvalidRequestException(e.message!!)
+            throw BadRequestDataException(e.message!!)
         }
 
     fun String.deserializeAsList(): List<Map<String, Any>> =