From bdcba50741c07e8f1143f95b2c4f266e4d5064fc Mon Sep 17 00:00:00 2001 From: Tanet Trimas <42898343+tanettrimas@users.noreply.github.com> Date: Wed, 2 Sep 2026 15:35:03 +0200 Subject: [PATCH 1/3] Revert "fix: set all channels open" This reverts commit bd8f0235b0141f1b3854c1ca56269abdafbbd729. --- .../no/javazone/feedback/routes/FeedbackChannelRoutes.kt | 4 ---- .../kotlin/no/javazone/feedback/domain/FeedbackChannel.kt | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt b/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt index bad507d..81fb957 100644 --- a/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt +++ b/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt @@ -3,14 +3,12 @@ package no.javazone.feedback.routes import io.ktor.http.ContentType import io.ktor.http.HttpHeaders import io.ktor.http.HttpStatusCode -import io.ktor.server.application.log import io.ktor.server.auth.authenticate import io.ktor.server.request.receive import io.ktor.server.response.header import io.ktor.server.response.respond import io.ktor.server.response.respondOutputStream import io.ktor.server.routing.Route -import io.ktor.server.routing.application import io.ktor.server.routing.get import io.ktor.server.routing.patch import io.ktor.server.routing.post @@ -55,10 +53,8 @@ fun Route.feedbackChannelRoutes( now = clock.instant(), ) } catch (e: ChannelNotFoundError) { - application.log.error("Failed with id $channelId not found") return@post call.respond(HttpStatusCode.NotFound, e.message) } catch (e: ChannelClosedError) { - application.log.error("Failed with id $channelId closed") return@post call.respond(HttpStatusCode.Forbidden, e.message) } diff --git a/domain/src/main/kotlin/no/javazone/feedback/domain/FeedbackChannel.kt b/domain/src/main/kotlin/no/javazone/feedback/domain/FeedbackChannel.kt index d5f171e..fe8316f 100644 --- a/domain/src/main/kotlin/no/javazone/feedback/domain/FeedbackChannel.kt +++ b/domain/src/main/kotlin/no/javazone/feedback/domain/FeedbackChannel.kt @@ -22,5 +22,7 @@ class FeedbackChannel( } fun isEffectivelyOpen(now: Instant): Boolean = - true + isOpen && + (opensAt == null || !now.isBefore(opensAt)) && + (closesAt == null || now.isBefore(closesAt)) } From 2ffd46ace7d06d7d15644c2c2971c606462e4dea Mon Sep 17 00:00:00 2001 From: Tanet Trimas <42898343+tanettrimas@users.noreply.github.com> Date: Wed, 2 Sep 2026 15:35:19 +0200 Subject: [PATCH 2/3] Revert "disable tests" This reverts commit 928d2ef939c3ff1afa889a250bc148ea6649f9e2. --- .../test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt | 2 -- .../kotlin/no/javazone/feedback/domain/FeedbackChannelTest.kt | 2 -- .../no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt | 2 -- 3 files changed, 6 deletions(-) diff --git a/core/src/test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt b/core/src/test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt index 3c3b671..8a2ed95 100644 --- a/core/src/test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt +++ b/core/src/test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt @@ -16,11 +16,9 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import java.util.* -@Disabled class FeedbackEndpointsTest { companion object { private const val ADMIN_USER = "test-admin" diff --git a/domain/src/test/kotlin/no/javazone/feedback/domain/FeedbackChannelTest.kt b/domain/src/test/kotlin/no/javazone/feedback/domain/FeedbackChannelTest.kt index e7601ba..4873195 100644 --- a/domain/src/test/kotlin/no/javazone/feedback/domain/FeedbackChannelTest.kt +++ b/domain/src/test/kotlin/no/javazone/feedback/domain/FeedbackChannelTest.kt @@ -3,12 +3,10 @@ package no.javazone.feedback.domain import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.Instant -@Disabled class FeedbackChannelTest { private val ratings = listOf(FeedbackChannelRatingCategory(id = 1, name = "Content")) 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 index c4ab4ff..2fd254f 100644 --- a/domain/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt +++ b/domain/src/test/kotlin/no/javazone/feedback/domain/adapters/FeedbackAdapterTest.kt @@ -9,12 +9,10 @@ import no.javazone.feedback.domain.FeedbackRating import no.javazone.feedback.domain.errors.ChannelClosedError import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.Instant -@Disabled class FeedbackAdapterTest { private val defaultInput = FeedbackChannelCreationInput( From 41cacfc92411b5c7ebc78cea11f3e049f757620c Mon Sep 17 00:00:00 2001 From: Tanet Trimas <42898343+tanettrimas@users.noreply.github.com> Date: Wed, 2 Sep 2026 15:37:26 +0200 Subject: [PATCH 3/3] dont remove logging --- .../no/javazone/feedback/routes/FeedbackChannelRoutes.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt b/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt index 81fb957..b9a1816 100644 --- a/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt +++ b/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt @@ -3,12 +3,14 @@ package no.javazone.feedback.routes import io.ktor.http.ContentType import io.ktor.http.HttpHeaders import io.ktor.http.HttpStatusCode +import io.ktor.server.application.log import io.ktor.server.auth.authenticate import io.ktor.server.request.receive import io.ktor.server.response.header import io.ktor.server.response.respond import io.ktor.server.response.respondOutputStream import io.ktor.server.routing.Route +import io.ktor.server.routing.application import io.ktor.server.routing.get import io.ktor.server.routing.patch import io.ktor.server.routing.post @@ -43,9 +45,6 @@ fun Route.feedbackChannelRoutes( val feedbackInput = call.receive() - application.log.info("Feedback received on ${clock.instant()}: $feedbackInput \n\n ${call.request.headers}") - - val createdFeedback = try { feedbackAdapter.submitFeedback( channelId = channelId, @@ -53,8 +52,10 @@ fun Route.feedbackChannelRoutes( now = clock.instant(), ) } catch (e: ChannelNotFoundError) { + application.log.info("Channel not found: ${e.message}") return@post call.respond(HttpStatusCode.NotFound, e.message) } catch (e: ChannelClosedError) { + application.log.info("Channel closed: ${e.message}") return@post call.respond(HttpStatusCode.Forbidden, e.message) } @@ -79,7 +80,7 @@ fun Route.feedbackChannelRoutes( }, ) } - + application.log.info("Created feedback with id: ${feedbackDto.id}") call.respond(feedbackDto) }