retry opprettelse av feedback kanal, med unique constraint på external id

tanettrimas · tanettrimas · commit e8153235e6b0 · 2026-03-27T15:11:10.000+01:00
diff --git a/core/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt b/core/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -12,10 +12,17 @@ kotlin {
     jvmToolchain(25)
 }
 
+tasks.test {
+    useJUnitPlatform()
+}
+
 dependencies {
     implementation(project(":domain"))
 
     implementation(libs.bundles.database)
     implementation(libs.bundles.testcontainers)
+
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
diff --git a/database/src/main/kotlin/no/javazone/feedback/database/repository/FeedbackRepositoryDb.kt b/database/src/main/kotlin/no/javazone/feedback/database/repository/FeedbackRepositoryDb.kt
@@ -8,49 +8,58 @@ import no.javazone.feedback.domain.Feedback
 import no.javazone.feedback.domain.FeedbackChannel
 import no.javazone.feedback.domain.FeedbackChannelRatingCategory
 import no.javazone.feedback.domain.FeedbackRating
+import no.javazone.feedback.domain.errors.ExternalIdAlreadyExistsError
 import no.javazone.feedback.domain.persistence.FeedbackRepository
+import org.jetbrains.exposed.exceptions.ExposedSQLException
 import org.jetbrains.exposed.sql.JoinType
 import org.jetbrains.exposed.sql.batchInsert
 import org.jetbrains.exposed.sql.insertReturning
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import org.postgresql.util.PSQLState
 import java.time.Instant
 
 object FeedbackRepositoryDb : FeedbackRepository {
     override fun intializeChannel(channel: FeedbackChannel): FeedbackChannel {
-        return transaction {
-            val createdChannelId = FeedbackChannels.insertReturning {
-                it[title] = channel.title
-                it[speakers] = channel.speakers
-                it[externalId] = channel.externalId
-            }.map {
-                it[FeedbackChannels.id]
-            }.first()
+        try {
+            return transaction {
+                val createdChannelId = FeedbackChannels.insertReturning {
+                    it[title] = channel.title
+                    it[speakers] = channel.speakers
+                    it[externalId] = channel.externalId
+                }.map {
+                    it[FeedbackChannels.id]
+                }.first()
 
-            val ratingCategories = RatingTypes.batchInsert(channel.ratingCategories) { rating ->
-                this[RatingTypes.channelId] = createdChannelId.value
-                this[RatingTypes.ratingName] = rating.name
-                this[RatingTypes.createdAt] = Instant.now()
-            }.map {
-                FeedbackChannelRatingCategory(
-                    id = it[RatingTypes.id].value,
-                    name = it[RatingTypes.ratingName]
-                )
-            }
+                val ratingCategories = RatingTypes.batchInsert(channel.ratingCategories) { rating ->
+                    this[RatingTypes.channelId] = createdChannelId.value
+                    this[RatingTypes.ratingName] = rating.name
+                    this[RatingTypes.createdAt] = Instant.now()
+                }.map {
+                    FeedbackChannelRatingCategory(
+                        id = it[RatingTypes.id].value,
+                        name = it[RatingTypes.ratingName]
+                    )
+                }
 
-            FeedbackChannels.selectAll().where {
-                FeedbackChannels.id eq createdChannelId
-            }.map {
-                FeedbackChannel(
-                    id = it[FeedbackChannels.id].value,
-                    title = it[FeedbackChannels.title],
-                    speakers = it[FeedbackChannels.speakers],
-                    externalId = it[FeedbackChannels.externalId],
-                    ratingCategories = ratingCategories
-                )
-            }.first()
+                FeedbackChannels.selectAll().where {
+                    FeedbackChannels.id eq createdChannelId
+                }.map {
+                    FeedbackChannel(
+                        id = it[FeedbackChannels.id].value,
+                        title = it[FeedbackChannels.title],
+                        speakers = it[FeedbackChannels.speakers],
+                        externalId = it[FeedbackChannels.externalId],
+                        ratingCategories = ratingCategories
+                    )
+                }.first()
+            }
+        } catch (e: ExposedSQLException) {
+            if (e.sqlState == PSQLState.UNIQUE_VIOLATION.state) {
+                throw ExternalIdAlreadyExistsError(channel.externalId, cause = e)
+            }
+            throw e
         }
-
     }
 
     override fun submitFeedback(feedback: Feedback, feedbackChannel: FeedbackChannel): Feedback {
diff --git a/database/src/main/resources/changelog/changes/002-add-unique-external-id.sql b/database/src/main/resources/changelog/changes/002-add-unique-external-id.sql
@@ -0,0 +1,4 @@
+--liquibase formatted sql
+
+--changeset tanettrimas:8
+ALTER TABLE feedback_channel ADD CONSTRAINT uq_feedback_channel_external_id UNIQUE (external_id);
diff --git a/database/src/test/kotlin/no/javazone/feedback/database/repository/FeedbackRepositoryDbTest.kt b/database/src/test/kotlin/no/javazone/feedback/database/repository/FeedbackRepositoryDbTest.kt
@@ -0,0 +1,63 @@
+package no.javazone.feedback.database.repository
+
+import no.javazone.feedback.database.TestDatabase
+import no.javazone.feedback.database.setupDatabase
+import no.javazone.feedback.domain.FeedbackChannel
+import no.javazone.feedback.domain.FeedbackChannelRatingCategory
+import no.javazone.feedback.domain.errors.ExternalIdAlreadyExistsError
+import org.jetbrains.exposed.exceptions.ExposedSQLException
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertInstanceOf
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+
+class FeedbackRepositoryDbTest {
+    companion object {
+        @BeforeAll
+        @JvmStatic
+        fun setup() {
+            TestDatabase.start()
+            setupDatabase(TestDatabase.config())
+        }
+
+        @AfterAll
+        @JvmStatic
+        fun tearDown() {
+            TestDatabase.stop()
+        }
+    }
+
+    @Test
+    fun `should throw ExternalIdAlreadyExistsError when inserting channel with duplicate external id`() {
+        val channel = FeedbackChannel(
+            title = "Kotlin Workshop",
+            speakers = listOf("Alice"),
+            externalId = "DUPE",
+            ratingCategories = listOf(
+                FeedbackChannelRatingCategory(name = "Content")
+            )
+        )
+
+        FeedbackRepositoryDb.intializeChannel(channel)
+
+        val duplicateChannel = FeedbackChannel(
+            title = "Another Workshop",
+            speakers = listOf("Bob"),
+            externalId = "DUPE",
+            ratingCategories = listOf(
+                FeedbackChannelRatingCategory(name = "Delivery")
+            )
+        )
+
+        val exception = assertThrows<ExternalIdAlreadyExistsError> {
+            FeedbackRepositoryDb.intializeChannel(duplicateChannel)
+        }
+
+        assertEquals("Channel with external id DUPE already exists.", exception.message)
+        assertNotNull(exception.cause)
+        assertInstanceOf(ExposedSQLException::class.java, exception.cause)
+    }
+}
diff --git a/domain/src/main/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapter.kt b/domain/src/main/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapter.kt
@@ -5,21 +5,34 @@ import no.javazone.feedback.domain.FeedbackChannel
 import no.javazone.feedback.domain.FeedbackChannelCreationInput
 import no.javazone.feedback.domain.FeedbackWithChannel
 import no.javazone.feedback.domain.errors.ChannelNotFoundError
+import no.javazone.feedback.domain.errors.ExternalIdAlreadyExistsError
+import no.javazone.feedback.domain.errors.ExternalIdGenerationException
 import no.javazone.feedback.domain.generators.ExternalIdGenerator
 import no.javazone.feedback.domain.persistence.FeedbackRepository
 
 class FeedbackAdapter(
     private val repository: FeedbackRepository,
     private val externalIdGenerator: ExternalIdGenerator
 ) {
+    companion object {
+        private const val MAX_RETRIES = 3
+    }
+
     fun createFeedbackChannel(input: FeedbackChannelCreationInput): FeedbackChannel {
-        val channel = FeedbackChannel(
-            title = input.title,
-            speakers = input.speakers,
-            externalId = externalIdGenerator.generate(),
-            ratingCategories = input.ratings
-        )
-        return repository.intializeChannel(channel)
+        repeat(MAX_RETRIES) {
+            try {
+                val channel = FeedbackChannel(
+                    title = input.title,
+                    speakers = input.speakers,
+                    externalId = externalIdGenerator.generate(),
+                    ratingCategories = input.ratings
+                )
+                return repository.intializeChannel(channel)
+            } catch (_: ExternalIdAlreadyExistsError) {
+                // retry with a new external id
+            }
+        }
+        throw ExternalIdGenerationException()
     }
 
     fun submitFeedback(channelId: String, feedback: Feedback): FeedbackWithChannel {
diff --git a/domain/src/main/kotlin/no/javazone/feedback/domain/errors/DomainErrors.kt b/domain/src/main/kotlin/no/javazone/feedback/domain/errors/DomainErrors.kt
@@ -1,7 +1,15 @@
 package no.javazone.feedback.domain.errors
 
-sealed class DomainErrors : Exception()
+sealed class DomainErrors(
+    override val message: String,
+    cause: Throwable? = null
+) : RuntimeException(message, cause)
 
-class ChannelNotFoundError(channelId: String) : DomainErrors() {
-    override val message: String = "Channel with id $channelId not found."
-}
+class ChannelNotFoundError(channelId: String) :
+    DomainErrors("Channel with id $channelId not found.")
+
+class ExternalIdAlreadyExistsError(externalId: String, cause: Throwable? = null) :
+    DomainErrors("Channel with external id $externalId already exists.", cause)
+
+class ExternalIdGenerationException :
+    DomainErrors("Failed to generate a unique external id after multiple attempts.")
diff --git a/domain/src/test/kotlin/no/javazone/feedback/domain/FakeFeedbackRepository.kt b/domain/src/test/kotlin/no/javazone/feedback/domain/FakeFeedbackRepository.kt
@@ -0,0 +1,31 @@
+package no.javazone.feedback.domain
+
+import no.javazone.feedback.domain.errors.ExternalIdAlreadyExistsError
+import no.javazone.feedback.domain.persistence.FeedbackRepository
+
+internal class FakeFeedbackRepository(
+    private val existingExternalIds: MutableSet<String> = mutableSetOf()
+) : FeedbackRepository {
+    private val channels = mutableMapOf<String, FeedbackChannel>()
+
+    override fun intializeChannel(channel: FeedbackChannel): FeedbackChannel {
+        if (channel.externalId in existingExternalIds) {
+            throw ExternalIdAlreadyExistsError(channel.externalId)
+        }
+        existingExternalIds.add(channel.externalId)
+        channels[channel.externalId] = channel
+        return channel
+    }
+
+    override fun submitFeedback(feedback: Feedback, feedbackChannel: FeedbackChannel): Feedback {
+        return Feedback(id = 1, comment = feedback.comment, ratings = feedback.ratings)
+    }
+
+    override fun findByChannelId(channelId: String): FeedbackChannel? {
+        return channels[channelId]
+    }
+
+    override fun findAllChannels(): List<FeedbackChannel> {
+        return channels.values.toList()
+    }
+}
diff --git a/domain/src/test/kotlin/no/javazone/feedback/domain/SequentialIdGenerator.kt b/domain/src/test/kotlin/no/javazone/feedback/domain/SequentialIdGenerator.kt
@@ -0,0 +1,11 @@
+package no.javazone.feedback.domain
+
+import no.javazone.feedback.domain.generators.ExternalIdGenerator
+
+internal class SequentialIdGenerator(vararg ids: String) : ExternalIdGenerator {
+    private val iterator = ids.iterator()
+
+    override fun generate(): String {
+        return iterator.next()
+    }
+}
diff --git a/domain/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt b/domain/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt
