develop내용을 master로 머지

.github/CODEOWNERS

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

build.gradle.kts

@@ -47,6 +47,7 @@ dependencies {
     implementation(Dependencies.SPRING_CLOUD)
     implementation(Dependencies.QUERY_DSL)
     implementation(Dependencies.QUERY_DSL_APT)
+    kapt(Dependencies.QUERY_DSL_APT)
 }
 
 tasks.withType<KotlinCompile> {
@@ -79,6 +80,4 @@ buildscript {
     }
 }
 
-
-
 apply(plugin = "io.kotest")

src/main/kotlin/com/dotori/v2/domain/board/presentation/data/dto/BoardDto.kt

@@ -1,13 +1,23 @@
 package com.dotori.v2.domain.board.presentation.data.dto
 
-import com.dotori.v2.domain.board.domain.entity.BoardImage
+import com.dotori.v2.domain.board.domain.entity.Board
 import com.dotori.v2.domain.member.enums.Role
 import java.time.LocalDate
 
 data class BoardDto(
     val id: Long,
     val title: String,
     val roles: List<Role>,
-    val boardImages: List<BoardImage>,
+    val boardImages: List<BoardImageDto>,
     val createdDate: LocalDate
-)
+) {
+    companion object {
+        fun of(board: Board): BoardDto = BoardDto(
+            id = board.id,
+            title = board.title,
+            roles = board.member.roles,
+            boardImages = board.boardImage.map { BoardImageDto.of(it) },
+            createdDate = board.createdDate.toLocalDate()
+        )
+    }
+}

src/main/kotlin/com/dotori/v2/domain/board/presentation/data/dto/BoardImageDto.kt

@@ -0,0 +1,16 @@
+package com.dotori.v2.domain.board.presentation.data.dto
+
+import com.dotori.v2.domain.board.domain.entity.BoardImage
+
+data class BoardImageDto(
+    val id: Long,
+    val url: String
+) {
+    companion object {
+        fun of(boardImage: BoardImage): BoardImageDto =
+            BoardImageDto(
+                id = boardImage.id,
+                url = boardImage.url
+            )
+    }
+}

src/main/kotlin/com/dotori/v2/domain/board/presentation/data/res/BoardResDto.kt

@@ -1,5 +1,6 @@
 package com.dotori.v2.domain.board.presentation.data.res
 
+import com.dotori.v2.domain.board.domain.entity.Board
 import com.dotori.v2.domain.member.enums.Role
 import java.time.LocalDateTime
 
@@ -9,4 +10,14 @@ data class BoardResDto(
     val content: String,
     val role: Role,
     val createdDate: LocalDateTime
-)
+) {
+    companion object {
+        fun of(board: Board) = BoardResDto(
+                id = board.id,
+                title = board.title,
+                content = board.content,
+                role = board.member.roles[0],
+                createdDate = board.createdDate
+            )
+    }
+}

src/main/kotlin/com/dotori/v2/domain/board/presentation/data/res/DetailBoardResDto.kt

@@ -1,6 +1,7 @@
 package com.dotori.v2.domain.board.presentation.data.res
 
-import com.dotori.v2.domain.board.domain.entity.BoardImage
+import com.dotori.v2.domain.board.domain.entity.Board
+import com.dotori.v2.domain.board.presentation.data.dto.BoardImageDto
 import com.dotori.v2.domain.member.enums.Role
 import java.time.LocalDateTime
 
@@ -9,7 +10,19 @@ data class DetailBoardResDto(
     val title: String,
     val content: String,
     val role: Role,
-    val boardImage: List<BoardImage>,
+    val boardImage: List<BoardImageDto>,
     val createdDate: LocalDateTime,
     val modifiedDate: LocalDateTime?
-)
+) {
+    companion object {
+        fun of(board: Board): DetailBoardResDto = DetailBoardResDto(
+                id = board.id,
+                title = board.title,
+                content = board.content,
+                role = board.member.roles[0],
+                boardImage = board.boardImage.map { BoardImageDto.of(it) },
+                createdDate = board.createdDate,
+                modifiedDate = board.modifiedDate
+            )
+    }
+}

src/main/kotlin/com/dotori/v2/domain/board/service/impl/CreateBoardServiceImpl.kt

@@ -5,7 +5,7 @@ import com.dotori.v2.domain.board.domain.entity.BoardImage
 import com.dotori.v2.domain.board.presentation.data.dto.CreateBoardDto
 import com.dotori.v2.domain.board.presentation.data.req.CreateBoardReqDto
 import com.dotori.v2.domain.board.service.CreateBoardService
-import com.dotori.v2.domain.board.service.S3Service
+import com.dotori.v2.global.thirdparty.aws.s3.S3Service
 import com.dotori.v2.domain.board.util.BoardSaveUtil
 import com.dotori.v2.domain.member.domain.entity.Member
 import com.dotori.v2.global.util.UserUtil
@@ -22,6 +22,7 @@ class CreateBoardServiceImpl(
     private val boardSaveUtil: BoardSaveUtil
 ) : CreateBoardService {
 
+
     @Value("\${cloud.aws.s3.url}")
     private val S3_ADDRESS: String? = null
 

src/main/kotlin/com/dotori/v2/domain/board/service/impl/DeleteBoardServiceImpl.kt

@@ -6,7 +6,7 @@ import com.dotori.v2.domain.board.domain.repository.BoardImageRepository
 import com.dotori.v2.domain.board.domain.repository.BoardRepository
 import com.dotori.v2.domain.board.exception.BoardNotExistsException
 import com.dotori.v2.domain.board.service.DeleteBoardService
-import com.dotori.v2.domain.board.service.S3Service
+import com.dotori.v2.global.thirdparty.aws.s3.S3Service
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional

src/main/kotlin/com/dotori/v2/domain/board/service/impl/DeleteMultipleBoardServiceImpl.kt

@@ -7,7 +7,7 @@ import com.dotori.v2.domain.board.domain.repository.BoardRepository
 import com.dotori.v2.domain.board.exception.BoardNotExistsException
 import com.dotori.v2.domain.board.presentation.data.req.DeleteMultipleBoardReqDto
 import com.dotori.v2.domain.board.service.DeleteMultipleBoardService
-import com.dotori.v2.domain.board.service.S3Service
+import com.dotori.v2.global.thirdparty.aws.s3.S3Service
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 

src/main/kotlin/com/dotori/v2/domain/board/service/impl/GetBoardDetailServiceImpl.kt

@@ -5,6 +5,7 @@ import com.dotori.v2.domain.board.domain.entity.BoardImage
 import com.dotori.v2.domain.board.domain.repository.BoardImageRepository
 import com.dotori.v2.domain.board.domain.repository.BoardRepository
 import com.dotori.v2.domain.board.exception.BoardNotExistsException
+import com.dotori.v2.domain.board.presentation.data.dto.BoardImageDto
 import com.dotori.v2.domain.board.presentation.data.res.DetailBoardResDto
 import com.dotori.v2.domain.board.service.GetBoardDetailService
 import org.springframework.data.repository.findByIdOrNull
@@ -14,24 +15,13 @@ import org.springframework.transaction.annotation.Transactional
 @Service
 @Transactional(readOnly = true, rollbackFor = [Exception::class])
 class GetBoardDetailServiceImpl(
-    private val boardRepository: BoardRepository,
-    private val boardImageRepository: BoardImageRepository,
+    private val boardRepository: BoardRepository
 ) : GetBoardDetailService {
     override fun execute(boardId: Long): DetailBoardResDto {
-        val boardInfo: Board = boardRepository.findByIdOrNull(boardId)
+        val board = boardRepository.findByIdOrNull(boardId)
             ?: throw BoardNotExistsException()
 
-        return toResponse(boardInfo)
+        return DetailBoardResDto.of(board)
     }
 
-    private fun toResponse(board: Board): DetailBoardResDto =
-        DetailBoardResDto(
-            id = board.id,
-            title = board.title,
-            content = board.content,
-            role = board.member.roles[0],
-            boardImage = board.boardImage,
-            createdDate = board.createdDate,
-            modifiedDate = board.modifiedDate
-        )
 }

src/main/kotlin/com/dotori/v2/domain/board/service/impl/GetBoardsServiceImpl.kt

@@ -14,18 +14,10 @@ import org.springframework.transaction.annotation.Transactional
 class GetBoardsServiceImpl(
     private val boardRepository: BoardRepository,
 ) : GetBoardsService {
+
     override fun execute(): ListBoardResDto = ListBoardResDto(
         boardList = boardRepository.findAllByOrderByCreatedDateDesc()
-            .map { it.toDto() }
+            .map { BoardResDto.of(it) }
     )
 
-    private fun Board.toDto(): BoardResDto =
-        BoardResDto(
-            id = this.id,
-            title = this.title,
-            content = this.content,
-            role = this.member.roles[0],
-            createdDate = this.createdDate
-        )
-
 }

src/main/kotlin/com/dotori/v2/domain/main_page/presentation/dto/res/BoardAlarmResDto.kt

@@ -1,10 +1,6 @@
 package com.dotori.v2.domain.main_page.presentation.dto.res
 
-import com.dotori.v2.domain.board.domain.entity.Board
 import com.dotori.v2.domain.board.presentation.data.dto.BoardDto
-import com.dotori.v2.domain.board.presentation.data.res.BoardResDto
-import com.dotori.v2.domain.member.enums.Role
-import java.time.LocalDate
 
 data class BoardAlarmResDto(
     val content: List<BoardDto>

src/main/kotlin/com/dotori/v2/domain/main_page/service/impl/BoardAlarmServiceImpl.kt

@@ -3,31 +3,22 @@ package com.dotori.v2.domain.main_page.service.impl
 import com.dotori.v2.domain.board.domain.entity.Board
 import com.dotori.v2.domain.board.domain.repository.BoardRepository
 import com.dotori.v2.domain.board.presentation.data.dto.BoardDto
-import com.dotori.v2.domain.board.presentation.data.res.BoardResDto
+import com.dotori.v2.domain.board.presentation.data.dto.BoardImageDto
 import com.dotori.v2.domain.main_page.presentation.dto.res.BoardAlarmResDto
 import com.dotori.v2.domain.main_page.service.BoardAlarmService
-import org.springframework.data.domain.Sort
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
-import java.time.LocalDateTime
 
 @Service
 @Transactional(rollbackFor = [Exception::class], readOnly = true)
 class BoardAlarmServiceImpl(
     private val boardRepository: BoardRepository
 ) : BoardAlarmService {
+
     override fun execute(): BoardAlarmResDto =
         BoardAlarmResDto(
             content = boardRepository.findAllByOrderByCreatedDateDesc()
-                .map { toDto(it) }
+                .map { BoardDto.of(it) }
         )
 
-    fun toDto(board: Board): BoardDto =
-        BoardDto(
-            id = board.id,
-            title = board.title,
-            roles = board.member.roles,
-            boardImages = board.boardImage,
-            createdDate = board.createdDate.toLocalDate()
-        )
 }

src/main/kotlin/com/dotori/v2/domain/massage/dev/MassageCountConfig.kt

@@ -14,7 +14,7 @@ class MassageCountConfig(
 ) {
     private val log = LoggerFactory.getLogger(this::class.simpleName)
     @PostConstruct
-    fun selfStudyCountEntitySetting() {
+    fun massageCountEntitySetting() {
         massageCountRepository.deleteAll()
         massageCountRepository.save(
             MassageCount(

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

@@ -0,0 +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

@@ -0,0 +1,64 @@
+package com.dotori.v2.domain.member.domain.repository
+
+import com.dotori.v2.domain.member.domain.entity.Member
+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
+import org.springframework.stereotype.Repository
+import org.springframework.util.StringUtils.hasText
+
+@Repository
+class CustomMemberRepositoryImpl(
+    private val queryFactory: JPAQueryFactory
+) : CustomMemberRepository {
+
+    override fun search(searchRequestDto: SearchRequestDto): List<Member> {
+        return queryFactory.selectFrom(member)
+            .where(
+                nameEq(searchRequestDto.name),
+                gradeEq(searchRequestDto.grade),
+                classNumEq(searchRequestDto.classNum),
+                genderEq(searchRequestDto.gender),
+                roleEq(searchRequestDto.role),
+                selfStudyStatusEq(searchRequestDto.selfStudyStatus)
+            )
+            .orderBy(member.stuNum.asc())
+            .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
+
+    private fun gradeEq(grade: String?): BooleanExpression? =
+        if(hasText(grade)) member.stuNum.startsWith(grade) else null
+
+    private fun classNumEq(classNum: String?): BooleanExpression? =
+        if(hasText(classNum)) member.stuNum.substring(1,2).eq(classNum) else null
+
+    private fun genderEq(gender: String?): BooleanExpression? =
+        if(hasText(gender)) member.gender.eq(Gender.valueOf(gender!!)) else null
+
+    private fun roleEq(role: String?): BooleanExpression? =
+        if(hasText(role)) member.roles.any().eq(Role.valueOf(role!!)) else null
+
+    private fun selfStudyStatusEq(selfStudyStatus: SelfStudyStatus?): BooleanExpression? =
+        if(selfStudyStatus != null) member.selfStudyStatus.eq(selfStudyStatus) else null
+
+}

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

@@ -5,7 +5,7 @@ import com.dotori.v2.domain.member.enums.MassageStatus
 import com.dotori.v2.domain.member.enums.SelfStudyStatus
 import org.springframework.data.jpa.repository.JpaRepository
 
-interface MemberRepository : JpaRepository<Member, Long> {
+interface MemberRepository : JpaRepository<Member, Long>, CustomMemberRepository {
     fun findByEmail(email: String?): Member?
     fun existsByEmail(email: String): Boolean
     fun findByStuNum(stuNum: String): Member?

src/main/kotlin/com/dotori/v2/domain/member/presentation/MemberController.kt

@@ -22,9 +22,9 @@ class MemberController(
         logoutService.execute()
             .run { ResponseEntity.ok().build() }
 
-    @PostMapping("/withdrawal")
-    fun withdrawal(@Valid @RequestBody withdrawalReqDto: WithdrawalReqDto): ResponseEntity<Void> =
-        withdrawalService.execute(withdrawalReqDto)
+    @DeleteMapping("/withdrawal")
+    fun withdrawal(): ResponseEntity<Void> =
+        withdrawalService.execute()
             .run { ResponseEntity.ok().build() }
 
     @PatchMapping("/password")

src/main/kotlin/com/dotori/v2/domain/member/service/WithdrawalService.kt

@@ -1,7 +1,5 @@
 package com.dotori.v2.domain.member.service
 
-import com.dotori.v2.domain.member.presentation.data.req.WithdrawalReqDto
-
 interface WithdrawalService {
-    fun execute(withdrawalReqDto: WithdrawalReqDto)
+    fun execute()
 }

src/main/kotlin/com/dotori/v2/domain/member/service/impl/RefreshTokenServiceImpl.kt

@@ -5,7 +5,7 @@ import com.dotori.v2.domain.member.exception.MemberNotFoundException
 import com.dotori.v2.domain.member.exception.TokenTypeNotValidException
 import com.dotori.v2.domain.member.presentation.data.res.RefreshResDto
 import com.dotori.v2.domain.member.service.RefreshService
-import com.dotori.v2.global.config.security.jwt.TokenProvider
+import com.dotori.v2.global.security.jwt.TokenProvider
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

src/main/kotlin/com/dotori/v2/domain/member/service/impl/SignInServiceImpl.kt

@@ -6,7 +6,7 @@ import com.dotori.v2.domain.member.exception.PasswordMismatchException
 import com.dotori.v2.domain.member.presentation.data.req.SignInReqDto
 import com.dotori.v2.domain.member.presentation.data.res.SignInResDto
 import com.dotori.v2.domain.member.service.SignInService
-import com.dotori.v2.global.config.security.jwt.TokenProvider
+import com.dotori.v2.global.security.jwt.TokenProvider
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional