[BOOK-377] fix: apis,domain,infra - 감상평 Optional로 수정 및 valid메소드 수정(#126)

Author: minwoo1999

apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/request/CreateReadingRecordRequest.kt

@@ -38,8 +38,11 @@ data class CreateReadingRecordRequest private constructor(
     @field:Schema(description = "감정 태그 목록 (현재는 최대 1개, 확장 가능)", example = "[\"감동적\"]")
     val emotionTags: List<@Size(max = 10, message = "감정 태그는 10자를 초과할 수 없습니다.") String> = emptyList()
 ) {
-    fun validPageNumber(): Int = pageNumber!!
-    fun validQuote(): String = quote!!
+    fun validPageNumber(): Int =
+        requireNotNull(pageNumber) { "pageNumber는 null일 수 없습니다." }
+
+    fun validQuote(): String =
+        requireNotNull(quote) { "quote는 null일 수 없습니다." }
 
     fun validEmotionTags(): List<String> = emotionTags
 }

apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/request/UpdateReadingRecordRequest.kt

@@ -34,9 +34,4 @@ data class UpdateReadingRecordRequest private constructor(
     @field:Size(max = 3, message = "감정 태그는 최대 3개까지 가능합니다.")
     @field:Schema(description = "수정할 감정 태그 목록", example = """["따뜻함","즐거움","슬픔","깨달음"]""")
     val emotionTags: List<@Size(max = 10, message = "감정 태그는 10자를 초과할 수 없습니다.") String>?
-) {
-    fun validPageNumber(): Int = pageNumber!!
-    fun validQuote(): String = quote!!
-    
-    fun validEmotionTags(): List<String> = emotionTags!!
-}
+)

apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/response/ReadingRecordResponse.kt

@@ -24,7 +24,7 @@ data class ReadingRecordResponse private constructor(
     val quote: String,
 
     @field:Schema(description = "감상평", example = "이 책은 매우 인상적이었습니다.")
-    val review: String,
+    val review: String?,
 
     @field:Schema(description = "감정 태그 목록", example = "[\"감동적\", \"슬픔\", \"희망\"]")
     val emotionTags: List<String>,
@@ -56,7 +56,7 @@ data class ReadingRecordResponse private constructor(
                 userBookId = readingRecordInfoVO.userBookId.value,
                 pageNumber = readingRecordInfoVO.pageNumber.value,
                 quote = readingRecordInfoVO.quote.value,
-                review = readingRecordInfoVO.review.value,
+                review = readingRecordInfoVO.review?.value,
                 emotionTags = readingRecordInfoVO.emotionTags,
                 createdAt = readingRecordInfoVO.createdAt.format(dateTimeFormatter),
                 updatedAt = readingRecordInfoVO.updatedAt.format(dateTimeFormatter),

apis/src/main/kotlin/org/yapp/apis/readingrecord/service/ReadingRecordService.kt

@@ -25,7 +25,7 @@ class ReadingRecordService(
             userBookId = userBookId,
             pageNumber = request.validPageNumber(),
             quote = request.validQuote(),
-            review = request.validReview(),
+            review = request.review,
             emotionTags = request.validEmotionTags()
         )
 
@@ -62,10 +62,10 @@ class ReadingRecordService(
     ): ReadingRecordResponse {
         val readingRecordInfoVO = readingRecordDomainService.modifyReadingRecord(
             readingRecordId = readingRecordId,
-            pageNumber = request.validPageNumber(),
-            quote = request.validQuote(),
-            review = request.validReview(),
-            emotionTags = request.validEmotionTags()
+            pageNumber = request.pageNumber,
+            quote = request.quote,
+            review = request.review,
+            emotionTags = request.emotionTags
         )
 
         // Update user's lastActivity when a reading record is updated

domain/src/main/kotlin/org/yapp/domain/readingrecord/ReadingRecord.kt

@@ -9,7 +9,7 @@ data class ReadingRecord private constructor(
     val userBookId: UserBookId,
     val pageNumber: PageNumber,
     val quote: Quote,
-    val review: Review,
+    val review: Review?,
     val emotionTags: List<EmotionTag> = emptyList(),
     val createdAt: LocalDateTime? = null,
     val updatedAt: LocalDateTime? = null,
@@ -20,15 +20,15 @@ data class ReadingRecord private constructor(
             userBookId: UUID,
             pageNumber: Int,
             quote: String,
-            review: String,
+            review: String?,
             emotionTags: List<String> = emptyList()
         ): ReadingRecord {
             return ReadingRecord(
                 id = Id.newInstance(UuidGenerator.create()),
                 userBookId = UserBookId.newInstance(userBookId),
                 pageNumber = PageNumber.newInstance(pageNumber),
                 quote = Quote.newInstance(quote),
-                review = Review.newInstance(review),
+                review = review?.let { Review.newInstance(it) },
                 emotionTags = emotionTags.map { EmotionTag.newInstance(it) }
             )
         }
@@ -38,7 +38,7 @@ data class ReadingRecord private constructor(
             userBookId: UserBookId,
             pageNumber: PageNumber,
             quote: Quote,
-            review: Review,
+            review: Review?,
             emotionTags: List<EmotionTag> = emptyList(),
             createdAt: LocalDateTime? = null,
             updatedAt: LocalDateTime? = null,
@@ -67,7 +67,7 @@ data class ReadingRecord private constructor(
         return this.copy(
             pageNumber = pageNumber?.let { PageNumber.newInstance(it) } ?: this.pageNumber,
             quote = quote?.let { Quote.newInstance(it) } ?: this.quote,
-            review = review?.let { Review.newInstance(it) } ?: this.review,
+            review = review?.let { Review.newInstance(it) },
             emotionTags = emotionTags?.map { EmotionTag.newInstance(it) } ?: this.emotionTags,
             updatedAt = LocalDateTime.now()
         )

domain/src/main/kotlin/org/yapp/domain/readingrecord/ReadingRecordDomainService.kt

@@ -28,7 +28,7 @@ class ReadingRecordDomainService(
         userBookId: UUID,
         pageNumber: Int,
         quote: String,
-        review: String,
+        review: String?,
         emotionTags: List<String>
     ): ReadingRecordInfoVO {
         val userBook = userBookRepository.findById(userBookId)

domain/src/main/kotlin/org/yapp/domain/readingrecord/vo/ReadingRecordInfoVO.kt

@@ -8,7 +8,7 @@ data class ReadingRecordInfoVO private constructor(
     val userBookId: ReadingRecord.UserBookId,
     val pageNumber: ReadingRecord.PageNumber,
     val quote: ReadingRecord.Quote,
-    val review: ReadingRecord.Review,
+    val review: ReadingRecord.Review?,
     val emotionTags: List<String>,
     val createdAt: LocalDateTime,
     val updatedAt: LocalDateTime,

infra/src/main/kotlin/org/yapp/infra/readingrecord/entity/ReadingRecordEntity.kt

@@ -25,7 +25,7 @@ class ReadingRecordEntity(
 
     pageNumber: Int,
     quote: String,
-    review: String,
+    review: String?,
 
 
 ) : BaseTimeEntity() {
@@ -38,8 +38,8 @@ class ReadingRecordEntity(
     var quote: String = quote
         protected set
 
-    @Column(name = "review", nullable = false, length = 1000)
-    var review: String = review
+    @Column(name = "review", nullable = true, length = 1000)
+    var review: String? = review
         protected set
 
     fun toDomain(): ReadingRecord {
@@ -48,7 +48,7 @@ class ReadingRecordEntity(
             userBookId = ReadingRecord.UserBookId.newInstance(this.userBookId),
             pageNumber = ReadingRecord.PageNumber.newInstance(this.pageNumber),
             quote = ReadingRecord.Quote.newInstance(this.quote),
-            review = ReadingRecord.Review.newInstance(this.review),
+            review = this.review?.let { ReadingRecord.Review.newInstance(it) },
             emotionTags = emptyList(),
             createdAt = this.createdAt,
             updatedAt = this.updatedAt,
@@ -63,7 +63,7 @@ class ReadingRecordEntity(
                 userBookId = readingRecord.userBookId.value,
                 pageNumber = readingRecord.pageNumber.value,
                 quote = readingRecord.quote.value,
-                review = readingRecord.review.value
+                review = readingRecord.review?.value
             )
         }
     }