[diary] search with tag

Noverish · May 26, 2024 · a733afd · a733afd
1 parent a15ff72
commit a733afd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/bo/DiarySearchBo.kt b/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/bo/DiarySearchBo.kt
@@ -28,6 +28,7 @@ class DiarySearchBo(
 			userId = userId,
 			dates = params.dates,
 			query = params.query,
+			tagId = params.tagId,
 			page = page,
 		)
 

diff --git a/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/bo/DiaryTagSearchBo.kt b/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/bo/DiaryTagSearchBo.kt
@@ -7,14 +7,15 @@ import kim.hyunsub.diary.repository.condition.DiaryTagPreviewCondition
 import kim.hyunsub.diary.repository.entity.DiaryTagPreview
 import kim.hyunsub.diary.repository.mapper.DiaryTagPreviewMapper
 import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 
 @Service
 class DiaryTagSearchBo(
 	private val diaryTagPreviewMapper: DiaryTagPreviewMapper,
 ) {
 	fun search(userId: String, params: DiaryTagSearchParams): ApiPageResult<ApiDiaryTagPreview> {
-		val page = PageRequest.of(params.page ?: 0, 10)
+		val page = determinePage(params)
 		val condition = DiaryTagPreviewCondition(userId = userId, query = params.query, page = page)
 
 		val total = diaryTagPreviewMapper.count(condition)
@@ -28,6 +29,15 @@ class DiaryTagSearchBo(
 		)
 	}
 
+	private fun determinePage(params: DiaryTagSearchParams): Pageable {
+		val pageSize = params.pageSize ?: 10
+		if (pageSize < 0) {
+			return PageRequest.of(0, Int.MAX_VALUE)
+		}
+
+		return PageRequest.of(params.page ?: 0, params.pageSize ?: 10)
+	}
+
 	private fun DiaryTagPreview.toApi() = ApiDiaryTagPreview(
 		id = id,
 		name = name,

diff --git a/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/model/dto/DiarySearchParams.kt b/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/model/dto/DiarySearchParams.kt
@@ -7,4 +7,5 @@ data class DiarySearchParams(
 	val dates: List<LocalDate>? = null,
 	val page: Int? = null,
 	val pageSize: Int? = null,
+	val tagId: String? = null,
 )
diff --git a/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/model/dto/DiaryTagSearchParams.kt b/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/model/dto/DiaryTagSearchParams.kt
@@ -1,6 +1,7 @@
 package kim.hyunsub.diary.model.dto
 
 data class DiaryTagSearchParams(
-	val query: String? = null,
-	val page: Int? = null,
+	val query: String?,
+	val page: Int?,
+	val pageSize: Int?,
 )
diff --git a/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/repository/condition/DiaryCondition.kt b/hyunsub-diary/src/main/kotlin/kim/hyunsub/diary/repository/condition/DiaryCondition.kt
@@ -9,5 +9,6 @@ data class DiaryCondition(
 	val dates: List<LocalDate>? = null,
 	val dateRange: LocalDateRange? = null,
 	val query: String? = null,
+	val tagId: String? = null,
 	val page: Pageable? = null,
 )
diff --git a/hyunsub-diary/src/main/resources/mapper/diary-mapper.xml b/hyunsub-diary/src/main/resources/mapper/diary-mapper.xml
@@ -11,6 +11,7 @@
     </sql>
 
     <sql id="DiaryCondition">
+        <if test="tagId != null">INNER JOIN diary_tag_mapping dtm ON dtm.tag_id = #{tagId} AND dtm.date = d.date</if>
         <where>
             <if test="userId != null">AND d.user_id = #{userId}</if>
             <if test="dates != null">