#45 Handle link violation exception

Author: vityaman

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/exception/ConflictException.kt

@@ -0,0 +1,3 @@
+package ru.ifmo.se.dating.exception
+
+class ConflictException(message: String) : GenericException(message)

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/SpringExceptionMapping.kt

@@ -5,10 +5,11 @@ import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.RestControllerAdvice
 import ru.ifmo.se.dating.api.GeneralErrorMessage
-import ru.ifmo.se.dating.exception.AuthenticationException
 import ru.ifmo.se.dating.exception.GenericException
 import ru.ifmo.se.dating.exception.InvalidValueException
 import ru.ifmo.se.dating.exception.NotFoundException
+import ru.ifmo.se.dating.exception.ConflictException
+import ru.ifmo.se.dating.exception.AuthenticationException
 
 interface SpringExceptionMapping {
     fun httpCode(exception: GenericException): HttpStatus?
@@ -31,17 +32,18 @@ interface SpringDomainExceptionMapping<T : GenericException> : SpringExceptionMa
 class SpringGenericExceptionHandler(private val mapping: SpringExceptionMapping) {
     val GenericException.httpCode: HttpStatus
         get() = mapping.httpCode(this) ?: when (this) {
+            is AuthenticationException -> HttpStatus.UNAUTHORIZED
+            is ConflictException -> HttpStatus.CONFLICT
             is InvalidValueException -> HttpStatus.BAD_REQUEST
             is NotFoundException -> HttpStatus.NOT_FOUND
-            is AuthenticationException -> HttpStatus.UNAUTHORIZED
             else -> throw NotImplementedError("$this")
         }
 
     @ExceptionHandler(GenericException::class)
     fun handle(exception: GenericException) =
         exception.toResponseEntity()
 
-    fun GenericException.toResponseEntity() =
+    fun GenericException.toResponseEntity(): ResponseEntity<GeneralErrorMessage> =
         ResponseEntity
             .status(this.httpCode)
             .body(

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/SpringJooqDatabase.kt

@@ -17,7 +17,7 @@ import reactor.core.publisher.Mono
 import reactor.kotlin.core.publisher.toFlux
 import ru.ifmo.se.dating.storage.jooq.DSLBlock
 import ru.ifmo.se.dating.storage.jooq.JooqDatabase
-import ru.ifmo.se.dating.storage.jooq.exception.toStorage
+import ru.ifmo.se.dating.storage.jooq.toStorage
 
 @Component
 class SpringJooqDatabase(private val database: DatabaseClient) : JooqDatabase {

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/jooq/exception/LinkViolationException.kt backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/exception/LinkViolationException.kt

@@ -1,4 +1,4 @@
-package ru.ifmo.se.dating.storage.jooq.exception
+package ru.ifmo.se.dating.storage.exception
 
 import ru.ifmo.se.dating.exception.StorageException
 

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/jooq/exception/UniqueViolationException.kt backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/exception/UniqueViolationException.kt

@@ -1,4 +1,4 @@
-package ru.ifmo.se.dating.storage.jooq.exception
+package ru.ifmo.se.dating.storage.exception
 
 import ru.ifmo.se.dating.exception.StorageException
 

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/jooq/exception/UnknownException.kt backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/exception/UnknownException.kt

@@ -1,4 +1,4 @@
-package ru.ifmo.se.dating.storage.jooq.exception
+package ru.ifmo.se.dating.storage.exception
 
 import ru.ifmo.se.dating.exception.StorageException
 

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/jooq/exception/ConstraintViolationMapping.kt backend/foundation/src/main/kotlin/ru/ifmo/se/dating/storage/jooq/ConstraintViolationMapping.kt

@@ -1,7 +1,10 @@
-package ru.ifmo.se.dating.storage.jooq.exception
+package ru.ifmo.se.dating.storage.jooq
 
 import org.jooq.exception.IntegrityConstraintViolationException
 import ru.ifmo.se.dating.exception.StorageException
+import ru.ifmo.se.dating.storage.exception.LinkViolationException
+import ru.ifmo.se.dating.storage.exception.UniqueViolationException
+import ru.ifmo.se.dating.storage.exception.UnknownException
 
 private typealias Mapping =
     (IntegrityConstraintViolationException) -> StorageException

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/api/HttpExceptionMapping.kt

@@ -2,7 +2,9 @@ package ru.ifmo.se.dating.people.api
 
 import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Controller
+import ru.ifmo.se.dating.exception.ConflictException
 import ru.ifmo.se.dating.people.exception.DomainException
+import ru.ifmo.se.dating.people.exception.IncompletePersonException
 import ru.ifmo.se.dating.spring.SpringDomainExceptionMapping
 
 @Controller
@@ -11,5 +13,7 @@ class HttpExceptionMapping : SpringDomainExceptionMapping<DomainException> {
         get() = DomainException::class.java
 
     override fun domainHttpCode(exception: DomainException): HttpStatus =
-        TODO("There are no domain exceptions yet")
+        when(exception) {
+            is IncompletePersonException -> TODO()
+        }
 }

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/exception/ConflictException.kt

@@ -3,19 +3,24 @@ package ru.ifmo.se.dating.people.logic.basic
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Isolation
 import org.springframework.transaction.annotation.Transactional
+import ru.ifmo.se.dating.exception.InvalidValueException
 import ru.ifmo.se.dating.exception.orThrowNotFound
-import ru.ifmo.se.dating.people.exception.ConflictException
+import ru.ifmo.se.dating.exception.ConflictException
 import ru.ifmo.se.dating.people.exception.IncompletePersonException
 import ru.ifmo.se.dating.people.logic.PersonService
 import ru.ifmo.se.dating.people.model.Person
 import ru.ifmo.se.dating.people.model.PersonVariant
 import ru.ifmo.se.dating.people.storage.PersonStorage
 import ru.ifmo.se.dating.security.auth.User
+import ru.ifmo.se.dating.storage.exception.LinkViolationException
 
 @Service
 class BasicPersonService(private val storage: PersonStorage) : PersonService {
-    override suspend fun edit(draft: Person.Draft) =
+    override suspend fun edit(draft: Person.Draft) = try {
         storage.upsert(draft)
+    } catch (exception: LinkViolationException) {
+        throw InvalidValueException("faculty or location id does not exist", exception)
+    }
 
     @Transactional(isolation = Isolation.SERIALIZABLE)
     override suspend fun save(expected: Person.Draft) {

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/logic/basic/BasicPersonService.kt

@@ -12,12 +12,15 @@ import ru.ifmo.se.dating.people.model.Person
 import ru.ifmo.se.dating.people.model.PersonVariant
 import ru.ifmo.se.dating.people.storage.PersonStorage
 import ru.ifmo.se.dating.security.auth.User
+import ru.ifmo.se.dating.storage.TxEnv
 import ru.ifmo.se.dating.storage.jooq.JooqDatabase
 
 @Repository
-class JooqPersonStorage(private val database: JooqDatabase) : PersonStorage {
-    @Transactional(isolation = Isolation.SERIALIZABLE)
-    override suspend fun upsert(draft: Person.Draft) {
+class JooqPersonStorage(
+    private val database: JooqDatabase,
+    private val txEnv: TxEnv,
+) : PersonStorage {
+    override suspend fun upsert(draft: Person.Draft) = txEnv.transactional {
         database.only {
             val record = draft.toRecord()
             insertInto(PERSON)
@@ -38,6 +41,8 @@ class JooqPersonStorage(private val database: JooqDatabase) : PersonStorage {
                 .set(PERSON.UPDATE_MOMENT, currentOffsetDateTime())
                 .where(PERSON.ACCOUNT_ID.eq(draft.id.number))
         }
+
+        Unit
     }
 
     override suspend fun setReadyMoment(id: User.Id) = database.only {