feat: Replace R2dbcDataIntegrityViolationException with ExposedR2dbcException for improved error handling

Author: twisti-dev

surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/db/repository/impl/ClanInviteRepositoryImpl.kt

@@ -8,13 +8,13 @@ import dev.slne.surf.clan.runtime.db.table.ClanInvitesTable
 import dev.slne.surf.clan.runtime.db.table.ClanMembersTable
 import dev.slne.surf.clan.runtime.db.table.ClanPlayerTable
 import dev.slne.surf.clan.runtime.db.table.ClansTable
-import dev.slne.surf.database.libs.io.r2dbc.spi.R2dbcDataIntegrityViolationException
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.ResultRow
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.and
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.eq
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.inSubQuery
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.*
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.transactions.suspendTransaction
+import dev.slne.surf.database.utils.asDataIntegrityViolation
 import kotlinx.coroutines.flow.*
 import java.util.*
 
@@ -76,7 +76,8 @@ class ClanInviteRepositoryImpl : ClanInviteRepository {
             }.single()
 
             ClanInviteResult.Success(createClanInviteDAO(row))
-        } catch (_: R2dbcDataIntegrityViolationException) {
+        } catch (e: ExposedR2dbcException) {
+            e.asDataIntegrityViolation()
             ClanInviteResult.AlreadyInvited
         }
     }

surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/db/repository/impl/ClanMemberRepositoryImpl.kt

@@ -6,15 +6,12 @@ import dev.slne.clan.api.member.ClanMemberRole
 import dev.slne.clan.core.member.ClanMemberImpl
 import dev.slne.surf.clan.runtime.db.repository.ClanMemberRepository
 import dev.slne.surf.clan.runtime.db.table.ClanMembersTable
-import dev.slne.surf.database.libs.io.r2dbc.spi.R2dbcDataIntegrityViolationException
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.ResultRow
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.and
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.eq
-import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.deleteWhere
-import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.insertReturning
-import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.selectAll
+import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.*
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.transactions.suspendTransaction
-import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.update
+import dev.slne.surf.database.utils.asDataIntegrityViolation
 import kotlinx.coroutines.flow.single
 import kotlinx.coroutines.flow.singleOrNull
 import java.util.*
@@ -36,7 +33,8 @@ class ClanMemberRepositoryImpl : ClanMemberRepository {
             }.single()
 
             ClanMemberAddResult.Success(createMemberDAO(row))
-        } catch (_: R2dbcDataIntegrityViolationException) {
+        } catch (e: ExposedR2dbcException) {
+            e.asDataIntegrityViolation()
             ClanMemberAddResult.AlreadyMember
         }
     }

surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/db/repository/impl/ClanRepositoryImpl.kt

@@ -12,6 +12,7 @@ import dev.slne.surf.database.libs.io.r2dbc.spi.R2dbcDataIntegrityViolationExcep
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.core.*
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.*
 import dev.slne.surf.database.libs.org.jetbrains.exposed.v1.r2dbc.transactions.suspendTransaction
+import dev.slne.surf.database.utils.asDataIntegrityViolation
 import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.single
@@ -122,7 +123,8 @@ class ClanRepositoryImpl : ClanRepository {
                 description?.let { smt[this.description] = it }
                 discordInvite?.let { smt[this.discordInvite] = it }
             }.single()
-        } catch (e: R2dbcDataIntegrityViolationException) {
+        } catch (e: ExposedR2dbcException) {
+            val e = e.asDataIntegrityViolation()
             val msg = e.message ?: throw e
             return@suspendTransaction when {
                 ClansTable.TAG_UQ_INDEX_NAME in msg -> ClanCreationResult.ClanTagAlreadyExists