Fix: Handle for empty keyword.

wafflestudio · Apr 6, 2024 · d046ad5 · d046ad5
1 parent 432bc4f
commit d046ad5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/news/database/NewsRepository.kt b/src/main/kotlin/com/wafflestudio/csereal/core/news/database/NewsRepository.kt
@@ -117,9 +117,11 @@ class NewsRepositoryImpl(
             .limit(pageRequest.pageSize.toLong())
             .distinct()
 
-        val newsEntityList = when (sortBy) {
-            ContentSearchSortType.DATE -> newsEntityQuery.orderBy(newsEntity.createdAt.desc())
-            ContentSearchSortType.RELEVANCE -> newsEntityQuery
+        val newsEntityList = when {
+            sortBy == ContentSearchSortType.DATE || keyword.isNullOrEmpty() -> newsEntityQuery.orderBy(
+                newsEntity.createdAt.desc()
+            )
+            else /* sortBy == RELEVANCE */ -> newsEntityQuery
         }.fetch()
 
         val newsSearchDtoList: List<NewsSearchDto> = newsEntityList.map {

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/seminar/database/SeminarRepository.kt b/src/main/kotlin/com/wafflestudio/csereal/core/seminar/database/SeminarRepository.kt
@@ -90,9 +90,11 @@ class SeminarRepositoryImpl(
             .offset(pageRequest.offset)
             .limit(pageRequest.pageSize.toLong())
 
-        val seminarEntityList = when (sortBy) {
-            ContentSearchSortType.DATE -> seminarEntityQuery.orderBy(seminarEntity.createdAt.desc())
-            ContentSearchSortType.RELEVANCE -> seminarEntityQuery
+        val seminarEntityList = when {
+            sortBy == ContentSearchSortType.DATE || keyword.isNullOrEmpty() -> seminarEntityQuery.orderBy(
+                seminarEntity.createdAt.desc()
+            )
+            else /* sortBy == RELEVANCE */ -> seminarEntityQuery
         }.fetch()
 
         val seminarSearchDtoList: MutableList<SeminarSearchDto> = mutableListOf()