Merge pull request #115 from dnd-side-project/refactor/search_region

[refactor] 지역검색 쿼리 fulltext search 적용

docker/blooming-container/docker-compose.local.yml

@@ -11,6 +11,8 @@ services:
       MYSQL_DATABASE: blooming
       MYSQL_ROOT_PASSWORD: 1234
       TZ: "Asia/Seoul"
+    volumes:
+      - ./my.cnf:/etc/my.cnf
     command:
       - --character-set-server=utf8
       - --collation-server=utf8_general_ci

docker/blooming-container/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+ngram_token_size=1

src/main/kotlin/dnd11th/blooming/api/service/region/RegionService.kt

@@ -3,22 +3,41 @@ package dnd11th.blooming.api.service.region
 import dnd11th.blooming.api.dto.region.RegionResponse
 import dnd11th.blooming.domain.entity.region.Region
 import dnd11th.blooming.domain.repository.region.RegionRepository
-import org.springframework.data.domain.PageRequest
-import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 @Service
+@Transactional(readOnly = true)
 class RegionService(
     private val regionRepository: RegionRepository,
 ) {
     companion object {
-        private const val DEFAULT_PAGE_NUMBER = 0
         private const val DEFAULT_PAGE_SIZE = 30
+        private val jamoSet =
+            setOf(
+                'ㄱ', 'ㄴ', 'ㄷ', 'ㄹ', 'ㅁ', 'ㅂ', 'ㅅ', 'ㅇ', 'ㅈ', 'ㅊ', 'ㅋ', 'ㅌ', 'ㅍ', 'ㅎ',
+                'ㅏ', 'ㅑ', 'ㅓ', 'ㅕ', 'ㅗ', 'ㅛ', 'ㅜ', 'ㅠ', 'ㅡ', 'ㅣ',
+            )
     }
 
     fun findRegion(name: String): List<RegionResponse> {
-        val pageable: Pageable = PageRequest.of(DEFAULT_PAGE_NUMBER, DEFAULT_PAGE_SIZE)
-        val regions: List<Region> = regionRepository.findByNameContaining(name, pageable)
+        val searchQuery = createSearchQuery(name)
+        val regions: List<Region> = regionRepository.findByNameContaining(searchQuery, DEFAULT_PAGE_SIZE)
         return regions.stream().map { region -> RegionResponse.from(region) }.toList()
     }
+
+    fun createSearchQuery(input: String): String {
+        return input
+            .removeLastJamoIfOneWord()
+            .split(" ")
+            .filter { it.isNotBlank() }
+            .joinToString(" ") { "+$it" }
+    }
+
+    fun String.removeLastJamoIfOneWord(): String {
+        if (this.length > 1 && this.last() in jamoSet) {
+            return this.dropLast(1)
+        }
+        return this
+    }
 }

src/main/kotlin/dnd11th/blooming/domain/repository/region/RegionRepository.kt

@@ -1,12 +1,22 @@
 package dnd11th.blooming.domain.repository.region
 
 import dnd11th.blooming.domain.entity.region.Region
-import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface RegionRepository : JpaRepository<Region, Int> {
+    @Query(
+        value = """
+        SELECT *
+        FROM region
+        WHERE MATCH(name) AGAINST(:searchQuery IN BOOLEAN MODE)
+        LIMIT :limit
+        """,
+        nativeQuery = true,
+    )
     fun findByNameContaining(
-        name: String,
-        pageable: Pageable,
+        @Param("searchQuery") searchQuery: String,
+        @Param("limit") limit: Int,
     ): List<Region>
 }