fix: 오타

DSM-InQ · Oct 4, 2023 · e4a47b5 · e4a47b5
1 parent 67383a9
commit e4a47b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/main/kotlin/kr/hs/dsm/inq/common/util/PageUtil.kt b/src/main/kotlin/kr/hs/dsm/inq/common/util/PageUtil.kt
@@ -3,6 +3,10 @@ package kr.hs.dsm.inq.common.util
 import com.querydsl.jpa.impl.JPAQuery
 import kr.hs.dsm.inq.common.util.PageUtil.getLimit
 import kr.hs.dsm.inq.common.util.PageUtil.getOffset
+import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
+
+val defaultPage: Pageable = PageRequest.of(0, 15)
 
 object PageUtil {
     const val pageSize = 5L

diff --git a/src/main/kotlin/kr/hs/dsm/inq/domain/question/persistence/repository/TagsRepository.kt b/src/main/kotlin/kr/hs/dsm/inq/domain/question/persistence/repository/TagsRepository.kt
@@ -2,10 +2,12 @@ package kr.hs.dsm.inq.domain.question.persistence.repository
 
 import kr.hs.dsm.inq.domain.question.persistence.Category
 import kr.hs.dsm.inq.domain.question.persistence.Tags
+import org.springframework.data.domain.Pageable
+import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.repository.CrudRepository
 
-interface TagsRepository : CrudRepository<Tags, Long> {
+interface TagsRepository : JpaRepository<Tags, Long> {
     fun findByCategoryAndTagIn(category: Category, tagList: List<String>): List<Tags>
-    fun findTop15ByCategory(category: Category): List<Tags>
-    fun findTop15(): List<Tags>
+    fun findByCategory(category: Category, pageable: Pageable): List<Tags>
+    fun findAllBy(pageable: Pageable): List<Tags>
 }
diff --git a/src/main/kotlin/kr/hs/dsm/inq/domain/question/service/QuestionService.kt b/src/main/kotlin/kr/hs/dsm/inq/domain/question/service/QuestionService.kt
@@ -1,6 +1,7 @@
 package kr.hs.dsm.inq.domain.question.service
 
 import kr.hs.dsm.inq.common.util.SecurityUtil
+import kr.hs.dsm.inq.common.util.defaultPage
 import kr.hs.dsm.inq.domain.question.exception.AlreadyDislikedPostException
 import kr.hs.dsm.inq.domain.question.exception.AlreadyLikedPostException
 import kr.hs.dsm.inq.domain.question.exception.AnswerNotFoundException
@@ -176,8 +177,8 @@ class QuestionService(
     fun getTagList(category: Category?): TagListResponse {
 
         val tagList = category?.let {
-            tagsRepository.findTop15ByCategory(it)
-        } ?: tagsRepository.findTop15()
+            tagsRepository.findByCategory(it, defaultPage)
+        } ?: tagsRepository.findAllBy(defaultPage)
 
         return TagListResponse(
             tagList = tagList.map { it.tag }

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -3,9 +3,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://{DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:inq}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
+    url: jdbc:mysql://${DB_HOST:43.200.116.136}:${DB_PORT:3306}/${DB_NAME:inq}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false&rewriteBatchedStatements=true
     username: ${MYSQL_USERNAME:root}
-    password: ${MYSQL_PASSWORD:Cjve94uWhd7UWUt}
+    password: ${MYSQL_PASSWORD:inqdbpassword}
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   jpa: