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..b9a1816 100644 --- a/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt +++ b/core/src/main/kotlin/no/javazone/feedback/routes/FeedbackChannelRoutes.kt @@ -45,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, @@ -55,10 +52,10 @@ fun Route.feedbackChannelRoutes( now = clock.instant(), ) } catch (e: ChannelNotFoundError) { - application.log.error("Failed with id $channelId not found") + application.log.info("Channel not found: ${e.message}") return@post call.respond(HttpStatusCode.NotFound, e.message) } catch (e: ChannelClosedError) { - application.log.error("Failed with id $channelId closed") + application.log.info("Channel closed: ${e.message}") return@post call.respond(HttpStatusCode.Forbidden, e.message) } @@ -83,7 +80,7 @@ fun Route.feedbackChannelRoutes( }, ) } - + application.log.info("Created feedback with id: ${feedbackDto.id}") call.respond(feedbackDto) } 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/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)) } 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(