refactor: 기본정렬과 동적정렬 UPDATE시간으로도 가능하도록 수정 , 감상평 Optional (#126)

minwoo1999 · web-flow · commit 5fa446cf327b · 2025-10-25T17:56:20.000+09:00
* refactor: apis - 감상평을 optional로 수정합니다(#125) * refactor: apis - 기본정렬과 동적정렬 UPDATE시간으로도 가능하도록 수정 (#125) * [BOOK-377] fix: apis,domain,infra - 감상평 Optional로 수정 및 valid메소드 수정(#126) * [BOOK-377] chore: infra - flyway make_review_colum (#126)
diff --git a/apis/src/main/kotlin/org/yapp/apis/book/controller/BookControllerApi.kt b/apis/src/main/kotlin/org/yapp/apis/book/controller/BookControllerApi.kt
@@ -158,7 +158,11 @@ interface BookControllerApi {
         @RequestParam(required = false) @Parameter(description = "책 상태 필터") status: BookStatus?,
         @RequestParam(required = false) @Parameter(description = "정렬 방식") sort: UserBookSortType?,
         @RequestParam(required = false) @Parameter(description = "책 제목 검색") title: String?,
-        @PageableDefault(size = 10, sort = ["createdAt"], direction = Sort.Direction.DESC)
+        @Parameter(
+            description = "페이징 정보 (기본값: 10개, 최신 수정일 순)",
+            example = "?page=0&size=10&sort=updatedAt,desc"
+        )
+        @PageableDefault(size = 10, sort = ["updatedAt"], direction = Sort.Direction.DESC)
         pageable: Pageable
     ): ResponseEntity<UserBookPageResponse>
 
diff --git a/apis/src/main/kotlin/org/yapp/apis/readingrecord/controller/ReadingRecordControllerApi.kt b/apis/src/main/kotlin/org/yapp/apis/readingrecord/controller/ReadingRecordControllerApi.kt
@@ -105,8 +105,8 @@ interface ReadingRecordControllerApi {
         @AuthenticationPrincipal @Parameter(description = "인증된 사용자 ID") userId: UUID,
         @PathVariable @Parameter(description = "독서 기록을 조회할 사용자 책 ID") userBookId: UUID,
         @RequestParam(required = false) @Parameter(description = "정렬 방식 (PAGE_NUMBER_ASC, PAGE_NUMBER_DESC, CREATED_DATE_ASC, CREATED_DATE_DESC)") sort: ReadingRecordSortType?,
-        @PageableDefault(size = 10, sort = ["createdAt"], direction = Sort.Direction.DESC)
-        @Parameter(description = "페이지네이션 정보 (페이지 번호, 페이지 크기, 정렬 방식)") pageable: Pageable
+        @PageableDefault(size = 10, sort = ["updatedAt"], direction = Sort.Direction.DESC)
+        @Parameter(description = "페이지네이션 정보 (기본값: 10개, 최신 수정일 순)") pageable: Pageable
     ): ResponseEntity<ReadingRecordPageResponse>
 
     @Operation(
diff --git a/apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/request/CreateReadingRecordRequest.kt b/apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/request/CreateReadingRecordRequest.kt
@@ -30,17 +30,19 @@ data class CreateReadingRecordRequest private constructor(
     @field:Schema(description = "기억에 남는 문장", example = "이것은 기억에 남는 문장입니다.", required = true)
     val quote: String? = null,
 
-    @field:NotBlank(message = "감상평은 필수입니다.")
     @field:Size(max = 1000, message = "감상평은 1000자를 초과할 수 없습니다.")
-    @field:Schema(description = "감상평", example = "이 책은 매우 인상적이었습니다.", required = true)
+    @field:Schema(description = "감상평", example = "이 책은 매우 인상적이었습니다.", required = false)
     val review: String? = null,
 
     @field:Size(max = 1, message = "감정 태그는 최대 1개까지 가능합니다. (단일 감정만 받지만, 확장성을 위해 리스트 형태로 관리됩니다.)")
     @field:Schema(description = "감정 태그 목록 (현재는 최대 1개, 확장 가능)", example = "[\"감동적\"]")
     val emotionTags: List<@Size(max = 10, message = "감정 태그는 10자를 초과할 수 없습니다.") String> = emptyList()
 ) {
-    fun validPageNumber(): Int = pageNumber!!
-    fun validQuote(): String = quote!!
-    fun validReview(): String = review!!
+    fun validPageNumber(): Int =
+        requireNotNull(pageNumber) { "pageNumber는 null일 수 없습니다." }
+
+    fun validQuote(): String =
+        requireNotNull(quote) { "quote는 null일 수 없습니다." }
+    
     fun validEmotionTags(): List<String> = emotionTags
 }
diff --git a/apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/request/UpdateReadingRecordRequest.kt b/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 validReview(): String = review!!
-    fun validEmotionTags(): List<String> = emotionTags!!
-}
+)
diff --git a/apis/src/main/kotlin/org/yapp/apis/readingrecord/dto/response/ReadingRecordResponse.kt b/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),
diff --git a/apis/src/main/kotlin/org/yapp/apis/readingrecord/service/ReadingRecordService.kt b/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
diff --git a/domain/src/main/kotlin/org/yapp/domain/readingrecord/ReadingRecord.kt b/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()
         )
diff --git a/domain/src/main/kotlin/org/yapp/domain/readingrecord/ReadingRecordDomainService.kt b/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)
diff --git a/domain/src/main/kotlin/org/yapp/domain/readingrecord/vo/ReadingRecordInfoVO.kt b/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,
diff --git a/domain/src/main/kotlin/org/yapp/domain/userbook/UserBookSortType.kt b/domain/src/main/kotlin/org/yapp/domain/userbook/UserBookSortType.kt
@@ -5,5 +5,7 @@ enum class UserBookSortType {
     TITLE_ASC,
     TITLE_DESC,
     CREATED_DATE_ASC,
-    CREATED_DATE_DESC;
+    CREATED_DATE_DESC,
+    UPDATED_DATE_ASC,
+    UPDATED_DATE_DESC;
 }
diff --git a/infra/src/main/kotlin/org/yapp/infra/readingrecord/entity/ReadingRecordEntity.kt b/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
             )
         }
     }
diff --git a/infra/src/main/kotlin/org/yapp/infra/userbook/repository/impl/JpaUserBookQuerydslRepositoryImpl.kt b/infra/src/main/kotlin/org/yapp/infra/userbook/repository/impl/JpaUserBookQuerydslRepositoryImpl.kt
@@ -164,7 +164,9 @@ class JpaUserBookQuerydslRepositoryImpl(
             UserBookSortType.TITLE_DESC -> userBook.title.desc()
             UserBookSortType.CREATED_DATE_ASC -> userBook.createdAt.asc()
             UserBookSortType.CREATED_DATE_DESC -> userBook.createdAt.desc()
-            null -> userBook.createdAt.desc()
+            UserBookSortType.UPDATED_DATE_ASC -> userBook.updatedAt.asc()
+            UserBookSortType.UPDATED_DATE_DESC -> userBook.updatedAt.desc()
+            null -> userBook.updatedAt.desc()
         }
     }
 }
diff --git a/infra/src/main/resources/db/migration/mysql/V20251025_001__make_review_column_nullable.sql b/infra/src/main/resources/db/migration/mysql/V20251025_001__make_review_column_nullable.sql
@@ -0,0 +1 @@
+ALTER TABLE reading_records MODIFY COLUMN review VARCHAR(1000) NULL;

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ enum class UserBookSortType {`
`5`	`5`	`TITLE_ASC,`
`6`	`6`	`TITLE_DESC,`
`7`	`7`	`CREATED_DATE_ASC,`
`8`		`- CREATED_DATE_DESC;`
	`8`	`+ CREATED_DATE_DESC,`
	`9`	`+ UPDATED_DATE_ASC,`
	`10`	`+ UPDATED_DATE_DESC;`
`9`	`11`	`}`