237 feat/get self study querydsl

.github/CODEOWNERS

@@ -1 +1 @@
-* @louis7308 @Huuuunee @dolong2 @uuuuuuuk @cutehanchankyo
+* @louis7308 @Huuuunee @dolong2 @uuuuuuuk @cutehanchankyo @esperar

src/main/kotlin/com/dotori/v2/domain/member/domain/repository/CustomMemberRepository.kt

@@ -1,8 +1,10 @@
 package com.dotori.v2.domain.member.domain.repository
 
 import com.dotori.v2.domain.member.domain.entity.Member
+import com.dotori.v2.domain.self_study.presentation.dto.req.SelfStudySearchReqDto
 import com.dotori.v2.domain.stu_info.presentation.data.req.SearchRequestDto
 
 interface CustomMemberRepository {
     fun search(searchRequestDto: SearchRequestDto): List<Member>
+    fun searchSelfStudyMember(selfStudySearchReqDto: SelfStudySearchReqDto): List<Member>
 }

src/main/kotlin/com/dotori/v2/domain/member/domain/repository/CustomMemberRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.dotori.v2.domain.member.domain.entity.QMember.member
 import com.dotori.v2.domain.member.enums.Gender
 import com.dotori.v2.domain.member.enums.Role
 import com.dotori.v2.domain.member.enums.SelfStudyStatus
+import com.dotori.v2.domain.self_study.presentation.dto.req.SelfStudySearchReqDto
 import com.dotori.v2.domain.stu_info.presentation.data.req.SearchRequestDto
 import com.querydsl.core.types.dsl.BooleanExpression
 import com.querydsl.jpa.impl.JPAQueryFactory
@@ -30,6 +31,18 @@ class CustomMemberRepositoryImpl(
             .fetch()
     }
 
+    override fun searchSelfStudyMember(selfStudySearchReqDto: SelfStudySearchReqDto): List<Member> {
+        return queryFactory.selectFrom(member)
+            .where(
+                nameEq(selfStudySearchReqDto.name),
+                gradeEq(selfStudySearchReqDto.grade),
+                classNumEq(selfStudySearchReqDto.classNum),
+                genderEq(selfStudySearchReqDto.gender)
+            )
+            .orderBy(member.stuNum.asc())
+            .fetch()
+    }
+
     private fun nameEq(name: String?): BooleanExpression? =
         if(hasText(name)) member.memberName.eq(name) else null
 

src/main/kotlin/com/dotori/v2/domain/self_study/service/impl/GetSelfStudyByStuNumAndNameServiceImpl.kt

@@ -1,6 +1,7 @@
 package com.dotori.v2.domain.self_study.service.impl
 
 import com.dotori.v2.domain.member.domain.entity.Member
+import com.dotori.v2.domain.member.domain.repository.MemberRepository
 import com.dotori.v2.domain.self_study.domain.repository.SelfStudyRepository
 import com.dotori.v2.domain.self_study.presentation.dto.res.SelfStudyMemberListResDto
 import com.dotori.v2.domain.self_study.presentation.dto.res.SelfStudyMemberResDto
@@ -12,28 +13,15 @@ import org.springframework.transaction.annotation.Transactional
 @Service
 @Transactional(readOnly = true, rollbackFor = [Exception::class])
 class GetSelfStudyByStuNumAndNameServiceImpl(
-    private val selfStudyRepository: SelfStudyRepository,
+    private val memberRepository: MemberRepository
 ) : GetSelfStudyByStuNumAndNameService {
     override fun execute(searchRequestDto: SelfStudySearchReqDto): SelfStudyMemberListResDto {
-        val memberList = selfStudyRepository.findAllOrderByCreatedDateAsc()
-            .filter {
-                if(searchRequestDto.name != null) it.member.memberName == searchRequestDto.name else true
-            }
-            .map { it.member }
-        return getMemberCondition(searchRequestDto, memberList)
-    }
+        val members = memberRepository.searchSelfStudyMember(searchRequestDto)
 
-    private fun getMemberCondition(searchRequestDto: SelfStudySearchReqDto, memberList: List<Member>): SelfStudyMemberListResDto {
-        val filterMember = searchRequestDto.run {
-            memberList.filter {
-                if (grade != null) it.stuNum.startsWith(grade) else true
-            }.filter {
-                if (classNum != null) it.stuNum.substring(1, 2) == classNum else true
-            }.filter {
-                if (gender != null) it.gender.name == gender else true
-            }.toList()
-        }
-
-        return SelfStudyMemberListResDto(filterMember.mapIndexed{index, it -> SelfStudyMemberResDto(index + 1L, it) })
+        return SelfStudyMemberListResDto(
+            members.mapIndexed{index, it ->
+                SelfStudyMemberResDto(index + 1L, it)
+            }
+        )
     }
 }