Merge pull request #42 from GAT2025/refactor/#35

daeun084 · web-flow · commit 1b77575e2e95 · 2025-09-03T16:13:36.000+09:00
[Refactor/#35] 회원탈퇴 로직 수정
diff --git a/src/main/kotlin/gat_be/dev/domain/application/repository/ApplicationRepository.kt b/src/main/kotlin/gat_be/dev/domain/application/repository/ApplicationRepository.kt
@@ -33,4 +33,9 @@ interface ApplicationRepository : JpaRepository<Application, Long> {
             "GROUP BY a.teamId")
     fun countPendingApplicantsByTeamIn(@Param("teamIdList") teamIdList: List<Long>): List<TeamApplicantCountDto>
 
+    @Modifying
+    @Query("DELETE FROM Application a " +
+            "WHERE a.userId = :userId")
+    fun deleteAllByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/application/service/ApplicationService.kt b/src/main/kotlin/gat_be/dev/domain/application/service/ApplicationService.kt
@@ -81,4 +81,8 @@ class ApplicationService(
         return applicationRepository.existsByUserIdAndTeamId(userId, teamId)
     }
 
+    fun deleteAllByUserId(userId: Long) {
+        applicationRepository.deleteAllByUserId(userId)
+    }
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/auth/controller/AuthController.kt b/src/main/kotlin/gat_be/dev/domain/auth/controller/AuthController.kt
@@ -4,6 +4,7 @@ import ApiResponse
 import gat_be.dev.common.status.SuccessStatus
 import gat_be.dev.domain.auth.dto.request.*
 import gat_be.dev.domain.auth.dto.response.*
+import gat_be.dev.domain.auth.facade.UserWithdrawalFacade
 import gat_be.dev.domain.auth.service.AuthService
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.media.Content
@@ -18,7 +19,8 @@ import org.springframework.web.bind.annotation.*
 @RequestMapping("/auth")
 @Tag(name = "Auth")
 class AuthController(
-    private val authService: AuthService
+    private val authService: AuthService,
+    private val userWithdrawalFacade: UserWithdrawalFacade
 ) {
 
     @PostMapping("/signup")
@@ -63,7 +65,7 @@ class AuthController(
     fun withdraw(
         @AuthenticationPrincipal userId: Long
     ): ResponseEntity<ApiResponse<Nothing>> {
-        authService.withdraw(userId)
+        userWithdrawalFacade.withdraw(userId)
         return ApiResponse.success(SuccessStatus.DELETE_USER_SUCCESS)
     }
 
diff --git a/src/main/kotlin/gat_be/dev/domain/auth/facade/UserWithdrawalFacade.kt b/src/main/kotlin/gat_be/dev/domain/auth/facade/UserWithdrawalFacade.kt
@@ -0,0 +1,28 @@
+package gat_be.dev.domain.auth.facade
+
+import gat_be.dev.domain.application.service.ApplicationService
+import gat_be.dev.domain.review.service.ReviewService
+import gat_be.dev.domain.team.service.TeamService
+import gat_be.dev.domain.user.service.UserService
+import jakarta.transaction.Transactional
+import org.springframework.stereotype.Service
+
+@Service
+class UserWithdrawalFacade(
+    private val applicationService: ApplicationService,
+    private val userService: UserService,
+    private val teamService: TeamService,
+    private val reviewService: ReviewService
+) {
+
+    // 회원 탈퇴
+    @Transactional
+    fun withdraw(userId: Long) {
+        // TODO: 지원서 삭제?
+        applicationService.deleteAllByUserId(userId)
+        reviewService.deleteAllByUserId(userId)
+        teamService.deleteAllByUserId(userId)
+        userService.withdrawUser(userId)
+    }
+
+}
diff --git a/src/main/kotlin/gat_be/dev/domain/auth/service/AuthService.kt b/src/main/kotlin/gat_be/dev/domain/auth/service/AuthService.kt
@@ -56,13 +56,6 @@ class AuthService(
         userService.clearRefreshToken(user)
     }
 
-    // 회원탈퇴
-    @Transactional
-    fun withdraw(userId: Long) {
-        val user = userService.findUserByUserId(userId)
-        userService.withdrawUser(user)
-    }
-
     // 아이디 중복 확인
     fun checkId(loginId: String): CheckIdResponse {
         return userService.checkId(loginId)
diff --git a/src/main/kotlin/gat_be/dev/domain/review/repository/ReviewCategoryRepository.kt b/src/main/kotlin/gat_be/dev/domain/review/repository/ReviewCategoryRepository.kt
@@ -2,6 +2,17 @@ package gat_be.dev.domain.review.repository
 
 import gat_be.dev.domain.review.entity.ReviewCategory
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface ReviewCategoryRepository: JpaRepository<ReviewCategory, Long> {
+
+    @Modifying
+    @Query("""
+     DELETE FROM ReviewCategory rc
+     WHERE rc.review.teamMemberId = :teamMemberId
+    """)
+    fun deleteAllByTeamMemberId(@Param("teamMemberId") teamMemberId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/review/repository/ReviewRepository.kt b/src/main/kotlin/gat_be/dev/domain/review/repository/ReviewRepository.kt
@@ -2,10 +2,19 @@ package gat_be.dev.domain.review.repository
 
 import gat_be.dev.domain.review.entity.Review
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.query.Param
 
 interface ReviewRepository: JpaRepository<Review, Long> {
     @Query("SELECT r FROM Review r JOIN FETCH r.categories WHERE r.teamMemberId = :teamMemberId")
     fun findAllWithCategoriesByTeamMemberId(@Param("teamMemberId") teamMemberId: Long): List<Review>
+
+    @Modifying
+    @Query("""
+        DELETE FROM Review r
+        WHERE r.teamMemberId = :teamMemberId
+    """)
+    fun deleteAllByTeamMemberId(@Param("teamMemberId") teamMemberId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/review/service/ReviewService.kt b/src/main/kotlin/gat_be/dev/domain/review/service/ReviewService.kt
@@ -1,6 +1,7 @@
 package gat_be.dev.domain.review.service
 
 import gat_be.dev.domain.review.enums.Category
+import gat_be.dev.domain.review.repository.ReviewCategoryRepository
 import gat_be.dev.domain.review.repository.ReviewRepository
 import gat_be.dev.domain.user.dto.response.UserReviewCategoryCount
 import gat_be.dev.domain.user.dto.response.UserReviewDetails
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service
 @Service
 class ReviewService(
     private val reviewRepository: ReviewRepository,
+    private val reviewCategoryRepository: ReviewCategoryRepository
 ) {
 
     // 유저의 리뷰 카테고리별 개수 집계
@@ -34,4 +36,11 @@ class ReviewService(
             reviewCategoryCount = reviewCategoryCount,
         )
     }
+
+    // 유저에 대해 작성된 리뷰 삭제
+    fun deleteAllByUserId(userId: Long) {
+        reviewCategoryRepository.deleteAllByTeamMemberId(userId)
+        reviewRepository.deleteAllByTeamMemberId(userId)
+    }
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/team/dto/response/TeamResponse.kt b/src/main/kotlin/gat_be/dev/domain/team/dto/response/TeamResponse.kt
@@ -27,7 +27,7 @@ data class TeamInfoResponse(
 ) {
     companion object {
         fun from(team: Team,
-                 leaderName: String
+                 leaderName: String?
         ): TeamInfoResponse {
             return TeamInfoResponse(
                 teamId = team.teamId,
@@ -39,7 +39,7 @@ data class TeamInfoResponse(
                 projectStartDate = team.formattedProjectStartDate,
                 projectEndDate = team.formattedProjectEndDate,
                 description = team.description,
-                teamLeaderInfo = TeamLeaderInfo.from(leaderName, team.leader!!)
+                teamLeaderInfo = TeamLeaderInfo.from(leaderName, team.leader)
             )
         }
     }
@@ -65,18 +65,19 @@ data class TeamTechStackInfo(
 }
 
 data class TeamLeaderInfo(
+    // TODO: leader가 탈퇴했을 시 고려해서 field nullable 여부 수정
     val name: String,
     val contactInfo: String?,
     val portfolioLinks: List<String?>
 ) {
     companion object {
-        fun from(leaderName: String,
-                 leader: TeamLeader
+        fun from(leaderName: String?,
+                 leader: TeamLeader?
         ): TeamLeaderInfo {
             return TeamLeaderInfo(
-                name = leaderName,
-                contactInfo = leader.contactInfo,
-                portfolioLinks = listOf(leader.portfolioLink1, leader.portfolioLink2)
+                name = leaderName ?: "",
+                contactInfo = leader?.contactInfo,
+                portfolioLinks = listOf(leader?.portfolioLink1, leader?.portfolioLink2)
             )
         }
     }
diff --git a/src/main/kotlin/gat_be/dev/domain/team/entity/TeamTechStack.kt b/src/main/kotlin/gat_be/dev/domain/team/entity/TeamTechStack.kt
@@ -51,7 +51,10 @@ class TeamTechStack(
         if (this.isFulfilled) {
             this.isFulfilled = false
         }
-        this.currentCount -= 1
+
+        if (this.currentCount > 0) {
+            this.currentCount -= 1
+        }
     }
 
     fun ensureIsNotFulfilled() {
diff --git a/src/main/kotlin/gat_be/dev/domain/team/repository/TeamLeaderRepository.kt b/src/main/kotlin/gat_be/dev/domain/team/repository/TeamLeaderRepository.kt
@@ -2,7 +2,17 @@ package gat_be.dev.domain.team.repository
 
 import gat_be.dev.domain.team.entity.TeamLeader
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface TeamLeaderRepository: JpaRepository<TeamLeader, Long> {
 
+    @Modifying
+    @Query("""
+        DELETE FROM TeamLeader tl
+        WHERE tl.userId = :userId
+    """)
+    fun deleteAllByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/team/repository/TeamMemberRepository.kt b/src/main/kotlin/gat_be/dev/domain/team/repository/TeamMemberRepository.kt
@@ -1,9 +1,18 @@
 package gat_be.dev.domain.team.repository
 
-import gat_be.dev.domain.team.entity.Team
 import gat_be.dev.domain.team.entity.TeamMember
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface TeamMemberRepository: JpaRepository<TeamMember, Long> {
-    fun findByTeamAndUserId(team: Team, userId: Long): TeamMember?
+
+    @Modifying
+    @Query("""
+        DELETE FROM TeamMember tm
+        WHERE tm.userId = :userId
+    """)
+    fun deleteAllByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/team/repository/TeamRepository.kt b/src/main/kotlin/gat_be/dev/domain/team/repository/TeamRepository.kt
@@ -27,7 +27,7 @@ interface TeamRepository: JpaRepository<Team, Long> {
     fun findAllByApplicationDueDateAndStatus(applicationDueDate: LocalDate, status: TeamStatus): List<Team>
 
     @Query("SELECT t FROM Team t " +
-            "JOIN FETCH t.leader " +
+            "LEFT JOIN FETCH t.leader " +
             "JOIN FETCH t.techStackList " +
             "WHERE t.teamId = :teamId")
     fun findByTeamIdWithLeaderAndTechStackList(@Param("teamId") teamId: Long): Team?
diff --git a/src/main/kotlin/gat_be/dev/domain/team/repository/TeamTechStackRepository.kt b/src/main/kotlin/gat_be/dev/domain/team/repository/TeamTechStackRepository.kt
@@ -1,11 +1,27 @@
 package gat_be.dev.domain.team.repository
 
-import gat_be.dev.domain.team.entity.Team
 import gat_be.dev.domain.team.entity.TeamTechStack
-import gat_be.dev.domain.team.enums.TechStackRole
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface TeamTechStackRepository: JpaRepository<TeamTechStack, Long> {
-    fun findByTeam(team: Team): List<TeamTechStack>
-    fun findByTeamAndRole(team: Team, role: TechStackRole): TeamTechStack?
+
+    @Modifying
+    @Query("""
+    UPDATE TeamTechStack ts
+    SET 
+        ts.isFulfilled = false,
+        ts.currentCount = CASE WHEN ts.currentCount > 0 THEN ts.currentCount - 1 ELSE 0 END 
+    WHERE EXISTS (
+        SELECT 1 
+        FROM TeamMember tm 
+        WHERE tm.userId = :userId 
+          AND tm.team.teamId = ts.team.teamId 
+          AND tm.role = ts.role
+        )
+    """)
+    fun decreaseMemberCountByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/team/service/TeamService.kt b/src/main/kotlin/gat_be/dev/domain/team/service/TeamService.kt
@@ -11,7 +11,10 @@ import gat_be.dev.domain.team.entity.Team
 import gat_be.dev.domain.team.entity.TeamTechStack
 import gat_be.dev.domain.team.enums.TeamStatus
 import gat_be.dev.domain.team.enums.TechStackRole
+import gat_be.dev.domain.team.repository.TeamLeaderRepository
+import gat_be.dev.domain.team.repository.TeamMemberRepository
 import gat_be.dev.domain.team.repository.TeamRepository
+import gat_be.dev.domain.team.repository.TeamTechStackRepository
 import jakarta.transaction.Transactional
 import org.slf4j.LoggerFactory
 import org.springframework.data.domain.Page
@@ -22,7 +25,10 @@ import java.time.LocalDate
 
 @Service
 class TeamService(
-    private val teamRepository: TeamRepository
+    private val teamRepository: TeamRepository,
+    private val teamMemberRepository: TeamMemberRepository,
+    private val teamTechStackRepository: TeamTechStackRepository,
+    private val teamLeaderRepository: TeamLeaderRepository
 ) {
     private val listSize = 30
     private val log = LoggerFactory.getLogger(this::class.java)
@@ -282,12 +288,21 @@ class TeamService(
         log.info("[*] Close project for {} teams", closedTeamCount)
     }
 
+    private fun updateActiveStatusToDone(projectEndDate: LocalDate): Int {
+        return teamRepository.updateActiveStatusToDone(projectEndDate)
+    }
+
     fun updateRecruitingStatusToActive(applicationDueDate: LocalDate): Int {
         return teamRepository.updateRecruitingStatusToActive(applicationDueDate)
     }
 
-    fun updateActiveStatusToDone(projectEndDate: LocalDate): Int {
-        return teamRepository.updateActiveStatusToDone(projectEndDate)
+    // 유저의 팀 멤버, 리더 정보 삭제
+    fun deleteAllByUserId(userId: Long) {
+        // member와 관련된 techStack 조회 및 -1 처리
+        teamTechStackRepository.decreaseMemberCountByUserId(userId)
+
+        teamMemberRepository.deleteAllByUserId(userId)
+        teamLeaderRepository.deleteAllByUserId(userId)
     }
 
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/user/repository/UserRepository.kt b/src/main/kotlin/gat_be/dev/domain/user/repository/UserRepository.kt
@@ -2,6 +2,9 @@ package gat_be.dev.domain.user.repository
 
 import gat_be.dev.domain.user.entity.User
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface UserRepository: JpaRepository<User, Long> {
     fun findByUserId(userId: Long): User?
@@ -11,4 +14,13 @@ interface UserRepository: JpaRepository<User, Long> {
     fun existsByEmail(email:String):Boolean
     fun findByEmail(email:String):User?
     fun findByRefreshToken(refreshToken:String):User?
+
+    @Modifying
+    @Query("""
+       DELETE FROM User u
+        WHERE u.userId = :userId
+    """
+    )
+    fun deleteByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/user/repository/UserScrappedTeamRepository.kt b/src/main/kotlin/gat_be/dev/domain/user/repository/UserScrappedTeamRepository.kt
@@ -3,7 +3,19 @@ package gat_be.dev.domain.user.repository
 import gat_be.dev.domain.user.entity.User
 import gat_be.dev.domain.user.entity.UserScrappedTeam
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 
 interface UserScrappedTeamRepository: JpaRepository<UserScrappedTeam, Long> {
     fun countByUser(user: User): Long
+
+    @Modifying
+    @Query("""
+       DELETE FROM UserScrappedTeam ust
+        WHERE ust.user.userId = :userId
+    """
+    )
+    fun deleteAllByUserId(@Param("userId") userId: Long)
+
 }
diff --git a/src/main/kotlin/gat_be/dev/domain/user/repository/UserTechStackRepository.kt b/src/main/kotlin/gat_be/dev/domain/user/repository/UserTechStackRepository.kt
diff --git a/src/main/kotlin/gat_be/dev/domain/user/repository/UserViewedTeamHistoryRepository.kt b/src/main/kotlin/gat_be/dev/domain/user/repository/UserViewedTeamHistoryRepository.kt
diff --git a/src/main/kotlin/gat_be/dev/domain/user/service/UserScrappedTeamService.kt b/src/main/kotlin/gat_be/dev/domain/user/service/UserScrappedTeamService.kt
diff --git a/src/main/kotlin/gat_be/dev/domain/user/service/UserService.kt b/src/main/kotlin/gat_be/dev/domain/user/service/UserService.kt
diff --git a/src/main/kotlin/gat_be/dev/domain/user/service/UserTechStackService.kt b/src/main/kotlin/gat_be/dev/domain/user/service/UserTechStackService.kt
diff --git a/src/main/kotlin/gat_be/dev/domain/user/service/UserViewedTeamHistoryService.kt b/src/main/kotlin/gat_be/dev/domain/user/service/UserViewedTeamHistoryService.kt

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,9 @@ interface ApplicationRepository : JpaRepository<Application, Long> {`
`33`	`33`	`"GROUP BY a.teamId")`
`34`	`34`	`fun countPendingApplicantsByTeamIn(@Param("teamIdList") teamIdList: List<Long>): List<TeamApplicantCountDto>`
`35`	`35`
	`36`	`+ @Modifying`
	`37`	`+ @Query("DELETE FROM Application a " +`
	`38`	`+ "WHERE a.userId = :userId")`
	`39`	`+ fun deleteAllByUserId(@Param("userId") userId: Long)`
	`40`	`+`
`36`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,8 @@ class ApplicationService(`
`81`	`81`	`return applicationRepository.existsByUserIdAndTeamId(userId, teamId)`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ fun deleteAllByUserId(userId: Long) {`
	`85`	`+ applicationRepository.deleteAllByUserId(userId)`
	`86`	`+ }`
	`87`	`+`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,10 @@ class TeamTechStack(`
`51`	`51`	`if (this.isFulfilled) {`
`52`	`52`	`this.isFulfilled = false`
`53`	`53`	`}`
`54`		`- this.currentCount -= 1`
	`54`	`+`
	`55`	`+ if (this.currentCount > 0) {`
	`56`	`+ this.currentCount -= 1`
	`57`	`+ }`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`fun ensureIsNotFulfilled() {`