275 예약할 학생 검색 QueryDLS 적용

build.gradle.kts

@@ -54,6 +54,13 @@ dependencies {
     // cloudwatch appender
     implementation(Dependencies.CLOUDWATCH_APPENDER)
 
+    // queryDsl
+    implementation(Dependencies.QUERY_DSL)
+    kapt(Dependencies.QUERYDSL_APT)
+
+    // jakarta
+    kapt(Dependencies.JAKARTA_ANNOTATION_API)
+    kapt(Dependencies.JAKARTA_PERSISTENCE_API)
 }
 
 tasks.withType<KotlinCompile> {
@@ -63,7 +70,6 @@ tasks.withType<KotlinCompile> {
 	}
 }
 
-
 tasks.withType<Test> {
 	useJUnitPlatform()
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -35,4 +35,12 @@ object Dependencies {
     // cloudwatch appender
     const val CLOUDWATCH_APPENDER = "ca.pjer:logback-awslogs-appender:${DependencyVersions.CLOUDWATCH_APPENDER_VERSION}"
 
+    // queryDSL
+    const val QUERY_DSL = "com.querydsl:querydsl-jpa:${DependencyVersions.QUERY_DSL_VERSION}:jakarta"
+    const val QUERYDSL_APT = "com.querydsl:querydsl-apt:${DependencyVersions.QUERY_DSL_APT_VERSION}:jakarta"
+
+    // jakarta
+    const val JAKARTA_ANNOTATION_API = "jakarta.annotation:jakarta.annotation-api"
+    const val JAKARTA_PERSISTENCE_API = "jakarta.persistence:jakarta.persistence-api"
+
 }

src/main/kotlin/team/msg/hiv2/domain/user/application/service/QueryUserService.kt

@@ -13,5 +13,5 @@ interface QueryUserService {
     fun queryCurrentUser(): User
     fun queryAllUserByNameContainingOrderBySchoolNumber(keyword: String): List<User>
     fun queryAllUserByRoleOrderBySchoolNumber(role: UserRole): List<User>
-    fun queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(keyword: String, role: List<UserRole>): List<User>
+    fun searchStudent(keyword: String): List<User>
 }

src/main/kotlin/team/msg/hiv2/domain/user/application/service/QueryUserServiceImpl.kt

@@ -33,7 +33,7 @@ class QueryUserServiceImpl(
     override fun queryAllUserByRoleOrderBySchoolNumber(role: UserRole): List<User> =
         queryUserPort.queryAllUserByRoleOrderBySchoolNumber(role)
 
-    override fun queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(keyword: String, role: List<UserRole>) =
-        queryUserPort.queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(keyword, role)
+    override fun searchStudent(keyword: String): List<User> =
+        queryUserPort.searchStudent(keyword)
 
 }

src/main/kotlin/team/msg/hiv2/domain/user/application/spi/QueryUserPort.kt

@@ -14,5 +14,5 @@ interface QueryUserPort {
     fun queryCurrentUser(): User
     fun queryAllUserByNameContainingOrderBySchoolNumber(keyword: String): List<User>
     fun queryAllUserByRoleOrderBySchoolNumber(role: UserRole): List<User>
-    fun queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(keyword: String, role: List<UserRole>): List<User>
+    fun searchStudent(keyword: String): List<User>
 }

src/main/kotlin/team/msg/hiv2/domain/user/application/usecase/SearchReservationUsersByNameKeywordUseCase.kt

@@ -1,7 +1,6 @@
 package team.msg.hiv2.domain.user.application.usecase
 
 import team.msg.hiv2.domain.user.application.service.UserService
-import team.msg.hiv2.domain.user.domain.constant.UserRole
 import team.msg.hiv2.domain.user.presentation.data.request.SearchUserKeywordRequest
 import team.msg.hiv2.domain.user.presentation.data.response.StudentResponse
 import team.msg.hiv2.global.annotation.usecase.ReadOnlyUseCase
@@ -12,7 +11,7 @@ class SearchReservationUsersByNameKeywordUseCase(
 ) {
 
     fun execute(request: SearchUserKeywordRequest): List<StudentResponse> {
-        val users = userService.queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(request.keyword, listOf(UserRole.ROLE_STUDENT, UserRole.ROLE_ADMIN))
+        val users = userService.searchStudent(request.keyword)
 
         return users.map { StudentResponse.of(it) }
     }

src/main/kotlin/team/msg/hiv2/domain/user/persistence/UserPersistenceAdapter.kt

@@ -59,7 +59,7 @@ class UserPersistenceAdapter(
     override fun queryAllUserByRoleOrderBySchoolNumber(role: UserRole): List<User> =
         userRepository.findAllByRoleOrderBySchoolNumberAsc(role).map { userMapper.toDomain(it)!! }
 
-    override fun queryAllUserByNameContainingAndRoleInOrderBySchoolNumber(keyword: String, role: List<UserRole>): List<User>  =
-        userRepository.findAllByNameContainingAndRoleInOrderBySchoolNumberAsc(keyword, role).map { userMapper.toDomain(it)!! }
+    override fun searchStudent(keyword: String): List<User> =
+        userRepository.searchStudent(keyword).map { userMapper.toDomain(it)!! }
 
 }

src/main/kotlin/team/msg/hiv2/domain/user/persistence/repository/UserRepository.kt

@@ -3,13 +3,13 @@ package team.msg.hiv2.domain.user.persistence.repository
 import org.springframework.data.repository.CrudRepository
 import team.msg.hiv2.domain.user.domain.constant.UserRole
 import team.msg.hiv2.domain.user.persistence.entity.UserJpaEntity
+import team.msg.hiv2.domain.user.persistence.repository.custom.CustomUserRepository
 import java.util.*
 
-interface UserRepository : CrudRepository<UserJpaEntity, UUID> {
+interface UserRepository : CrudRepository<UserJpaEntity, UUID>, CustomUserRepository {
 
     fun findByEmail(email: String): UserJpaEntity?
     fun existsByEmail(email: String): Boolean
     fun findAllByNameContainingOrderBySchoolNumberAsc(keyword: String): List<UserJpaEntity>
     fun findAllByRoleOrderBySchoolNumberAsc(role: UserRole): List<UserJpaEntity>
-    fun findAllByNameContainingAndRoleInOrderBySchoolNumberAsc(keyword: String,role: List<UserRole>): List<UserJpaEntity>
 }

src/main/kotlin/team/msg/hiv2/domain/user/persistence/repository/custom/CustomUserRepository.kt

@@ -0,0 +1,7 @@
+package team.msg.hiv2.domain.user.persistence.repository.custom
+
+import team.msg.hiv2.domain.user.persistence.entity.UserJpaEntity
+
+interface CustomUserRepository {
+    fun searchStudent(keyword: String): List<UserJpaEntity>
+}

src/main/kotlin/team/msg/hiv2/domain/user/persistence/repository/custom/CustomUserRepositoryImpl.kt

@@ -0,0 +1,29 @@
+package team.msg.hiv2.domain.user.persistence.repository.custom
+
+import com.querydsl.core.types.dsl.BooleanExpression
+import com.querydsl.jpa.impl.JPAQueryFactory
+import team.msg.hiv2.domain.user.domain.constant.UserRole
+import team.msg.hiv2.domain.user.persistence.entity.QUserJpaEntity.userJpaEntity
+import team.msg.hiv2.domain.user.persistence.entity.UserJpaEntity
+
+class CustomUserRepositoryImpl (
+    private val jpaQueryFactory: JPAQueryFactory
+) : CustomUserRepository {
+
+    override fun searchStudent(keyword: String): List<UserJpaEntity> =
+        jpaQueryFactory
+            .selectFrom(userJpaEntity)
+            .where(roleCondition())
+            .where(keywordLike(keyword))
+            .orderBy(userJpaEntity.schoolNumber.asc())
+            .fetch()
+
+    private fun roleCondition(): BooleanExpression =
+        userJpaEntity.role.eq(UserRole.ROLE_STUDENT)
+            .or(userJpaEntity.role.eq(UserRole.ROLE_ADMIN))
+
+    private fun keywordLike(keyword: String): BooleanExpression? =
+        if(keyword == "") null
+        else userJpaEntity.name.contains(keyword).or(userJpaEntity.schoolNumber.contains(keyword))
+
+}

src/main/kotlin/team/msg/hiv2/global/config/QueryDslConfig.kt

@@ -0,0 +1,18 @@
+package team.msg.hiv2.global.config
+
+import com.querydsl.jpa.impl.JPAQueryFactory
+import jakarta.persistence.EntityManager
+import jakarta.persistence.PersistenceContext
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class QueryDslConfig {
+
+    @PersistenceContext
+    private lateinit var entityManager: EntityManager
+
+    @Bean
+    fun jpaQueryFactory() = JPAQueryFactory(entityManager)
+
+}