release: 1.0.3 (#221)

git-goods · Dec 25, 2024 · e5bbe7f · e5bbe7f
2 parents 053dd41 + 4d47192
commit e5bbe7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/main/kotlin/org/gitanimals/guild/domain/GuildRepository.kt b/src/main/kotlin/org/gitanimals/guild/domain/GuildRepository.kt
@@ -50,4 +50,7 @@ interface GuildRepository : JpaRepository<Guild, Long> {
         nativeQuery = true,
     )
     fun search(@Param("text") text: String, pageable: Pageable): Page<Guild>
+
+    @Query(value = "select g from Guild as g")
+    fun search(pageable: Pageable): Page<Guild>
 }
diff --git a/src/main/kotlin/org/gitanimals/guild/domain/GuildService.kt b/src/main/kotlin/org/gitanimals/guild/domain/GuildService.kt
@@ -140,11 +140,14 @@ class GuildService(
     }
 
     fun search(text: String, pageNumber: Int, filter: SearchFilter): Page<Guild> {
-        return guildRepository.search(text, Pageable.ofSize(PAGE_SIZE).withPage(pageNumber))
-            .onEach {
-                loadMembers.invoke(it)
-                loadWaitMembers.invoke(it)
-            }
+        return if (text.isBlank()) {
+            guildRepository.search(Pageable.ofSize(PAGE_SIZE).withPage(pageNumber))
+        } else {
+            guildRepository.search(text, Pageable.ofSize(PAGE_SIZE).withPage(pageNumber))
+        }.onEach {
+            loadMembers.invoke(it)
+            loadWaitMembers.invoke(it)
+        }
     }
 
     fun findAllWithLimit(limit: Int): List<Guild> {

diff --git a/src/main/kotlin/org/gitanimals/guild/infra/InMemoryRandomGuildCache.kt b/src/main/kotlin/org/gitanimals/guild/infra/InMemoryRandomGuildCache.kt
@@ -52,7 +52,7 @@ class InMemoryRandomGuildCache(
             response.add(filteredGuilds[idx])
         }
 
-        return PageImpl(filter.sort(response), Pageable.ofSize(pageNumber), guilds.size.toLong())
+        return PageImpl(filter.sort(response), Pageable.ofSize(PAGE_SIZE), guilds.size.toLong())
     }
 
     @Scheduled(cron = ONCE_0AM_TIME)