fix: timer description

timemates · Jan 3, 2024 · 3f3bc64 · 3f3bc64
1 parent a7af1cd
commit 3f3bc64
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/kotlin/io/timemates/backend/timers/types/Timer.kt b/core/src/main/kotlin/io/timemates/backend/timers/types/Timer.kt
@@ -11,7 +11,7 @@ import io.timemates.backend.users.types.value.UserId
 data class Timer(
     val id: TimerId,
     val name: TimerName,
-    val description: TimerDescription,
+    val description: TimerDescription?,
     val ownerId: UserId,
     val settings: TimerSettings,
     val membersCount: Count,

diff --git a/core/src/main/kotlin/io/timemates/backend/timers/types/value/TimerDescription.kt b/core/src/main/kotlin/io/timemates/backend/timers/types/value/TimerDescription.kt
@@ -1,6 +1,5 @@
 package io.timemates.backend.timers.types.value
 
-import io.timemates.backend.validation.FailureMessage
 import io.timemates.backend.validation.SafeConstructor
 import io.timemates.backend.validation.ValidationFailureHandler
 import io.timemates.backend.validation.reflection.wrapperTypeName
@@ -9,7 +8,7 @@ import io.timemates.backend.validation.reflection.wrapperTypeName
 value class TimerDescription private constructor(val string: String) {
     companion object : SafeConstructor<TimerDescription, String>() {
         override val displayName: String by wrapperTypeName()
-        private val LENGTH_RANGE = 3..200
+        private val LENGTH_RANGE = 0..200
 
         context(ValidationFailureHandler)
         override fun create(value: String): TimerDescription {

diff --git a/data/src/main/kotlin/io/timemates/backend/data/timers/mappers/TimersMapper.kt b/data/src/main/kotlin/io/timemates/backend/data/timers/mappers/TimersMapper.kt
@@ -64,7 +64,8 @@ class TimersMapper(private val sessionMapper: TimerSessionMapper) : Mapper {
         return Timer(
             id = TimerId.createOrThrowInternally(dbTimer.id),
             name = TimerName.createOrThrowInternally(dbTimer.name),
-            description = TimerDescription.createOrThrowInternally(dbTimer.description),
+            description = dbTimer.description.takeUnless { it.isBlank() }
+                ?.let { TimerDescription.createOrThrowInternally(it) },
             ownerId = UserId.createOrThrowInternally(dbTimer.ownerId),
             settings = dbSettingsToDomainSettings(dbTimer.settings),
             membersCount = Count.createOrThrowInternally(membersCount),

diff --git a/infrastructure/rsocket-api/src/main/kotlin/io/timemates/api/rsocket/timers/TimersMappers.kt b/infrastructure/rsocket-api/src/main/kotlin/io/timemates/api/rsocket/timers/TimersMappers.kt
@@ -42,7 +42,7 @@ internal fun TimerSettings.rs(): Timer.Settings {
 internal fun CoreTimer.rs(): Timer {
     return Timer.create {
         name = this@rs.name.string
-        description = this@rs.description.string
+        description = this@rs.description?.string.orEmpty()
         ownerId = this@rs.ownerId.long
         settings = this@rs.settings.rs()
         membersCount = this@rs.membersCount.int