Merge pull request #233 from minseo003/develop-delete

minseo003 · web-flow · commit 8c1a864f211f · 2025-03-12T16:28:05.000+09:00
feat: 유저탈퇴시 멘토링 관련 정리 #231
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/controller/MentoringBoardController.java b/src/main/java/com/project/Teaming/domain/mentoring/controller/MentoringBoardController.java
@@ -36,7 +36,7 @@ public ResultDetailResponse<String> savePost(@PathVariable Long teamId,
     public ResultDetailResponse<BoardSpecResponse> updatePost(@PathVariable Long postId,
                                                               @RequestBody @Valid BoardRequest dto) {
         mentoringBoardService.updateMentoringPost(postId, dto);
-        MentoringBoard mentoringPost = mentoringBoardService.findMentoringPost(postId);
+        MentoringBoard mentoringPost = mentoringBoardService.findMentoringPostForUpdate(postId);
         return new ResultDetailResponse<>(ResultCode.UPDATE_MENTORING_POST, mentoringBoardService.toDto(mentoringPost));
     }
 
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/controller/MentoringTeamController.java b/src/main/java/com/project/Teaming/domain/mentoring/controller/MentoringTeamController.java
@@ -34,7 +34,7 @@ public ResultDetailResponse<TeamAuthorityResponse> updateMentoringTeam(@PathVari
 
         return new ResultDetailResponse<>(ResultCode.UPDATE_MENTORING_TEAM,
                 mentoringTeamService.getMentoringTeam(
-                        mentoringTeamService.findMentoringTeam(teamId)));
+                        mentoringTeamService.findMentoringTeamForUpdate(teamId)));
     }
     @Override
     @GetMapping("/teams/{teamId}")
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/Category.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/Category.java
@@ -22,8 +22,10 @@ public class Category {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "category_id")
     private Long id;
+
     @Column(name = "category_name",unique = true)
     private String name;
+
     @OneToMany(mappedBy = "category")
     private List<TeamCategory> categories = new ArrayList<>();
 
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/Event.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/Event.java
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/EventAlarm.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/EventAlarm.java
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringParticipation.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringParticipation.java
@@ -26,21 +26,28 @@ public class MentoringParticipation {
     @Tsid
     @Column(name = "mp_id")
     private Long id;  // 신청 ID
+
     @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private MentoringParticipationStatus participationStatus;  // 신청 상태
+
     @CreatedDate
     @Column(updatable = false)
     private LocalDateTime requestDate;  // 신청 날짜
+
     private LocalDateTime decisionDate;  // 신청 수락/거절 날짜
+
     @Enumerated(EnumType.STRING)
     private MentoringRole role;  // 역할
+
     @Enumerated(EnumType.STRING)  //리더, 크루
     private MentoringAuthority authority;
+
     // 외래키 : 신청한 사용자 ID, 멘토링 팀 ID
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;  // 신청한 사용자 ID (주인)
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "mentoring_team_id")
     private MentoringTeam mentoringTeam;  // 멘토링 팀 ID (주인)
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringTeam.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/MentoringTeam.java
@@ -24,34 +24,43 @@ public class MentoringTeam extends BaseEntity {
     @Tsid
     @Column(name = "mentoring_team_id")
     private Long id;  // 멘토링 팀 ID
+
     @Column(name = "mentoring_name", length = 100)
     private String name;  // 멘토링 명
+
     @Column(name = "start_date", length = 50)
     private LocalDate startDate;  // 멘토링 시작일
+
     @Column(name = "end_date", length = 50)
     private LocalDate endDate;  // 멘토링 종료일
+
     @Column(name = "mentoring_cnt")
     private Integer mentoringCnt;
+
     @Column(name = "content")
     private String content;
+
     @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private MentoringStatus status;
+
     @Column(name = "link")
     private String link;
+
     @Column(name = "flag")
     @Enumerated(EnumType.STRING)
     private Status flag;
-    @OneToMany(mappedBy = "mentoringTeam",cascade = CascadeType.PERSIST)
+
+    @OneToMany(mappedBy = "mentoringTeam",cascade = CascadeType.PERSIST, orphanRemoval = true)
     private List<MentoringParticipation> mentoringParticipationList = new ArrayList<>();
+
     @OneToMany(mappedBy = "mentoringTeam",orphanRemoval = true)
     private List<MentoringBoard> mentoringBoardList = new ArrayList<>();
-    @OneToMany(mappedBy = "mentoringTeam")
-    private List<Event> eventList = new ArrayList<>();
-    @OneToMany(mappedBy = "mentoringTeam")
+
+    @OneToMany(mappedBy = "mentoringTeam",cascade = CascadeType.PERSIST, orphanRemoval = true)
     private List<TeamCategory> categories = new ArrayList<>();
 
-    public MentoringTeam(Long id, String name, LocalDate startDate, LocalDate endDate, Integer mentoringCnt, String content, MentoringStatus status, String link, Status flag, List<MentoringParticipation> mentoringParticipationList, List<MentoringBoard> mentoringBoardList, List<Event> eventList, List<TeamCategory> categories) {
+    public MentoringTeam(Long id, String name, LocalDate startDate, LocalDate endDate, Integer mentoringCnt, String content, MentoringStatus status, String link, Status flag, List<MentoringParticipation> mentoringParticipationList, List<MentoringBoard> mentoringBoardList, List<TeamCategory> categories) {
         this.id = id;
         this.name = name;
         this.startDate = startDate;
@@ -63,7 +72,6 @@ public MentoringTeam(Long id, String name, LocalDate startDate, LocalDate endDat
         this.flag = flag;
         this.mentoringParticipationList = mentoringParticipationList;
         this.mentoringBoardList = mentoringBoardList;
-        this.eventList = eventList;
         this.categories = categories;
     }
 
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/entity/TeamCategory.java b/src/main/java/com/project/Teaming/domain/mentoring/entity/TeamCategory.java
@@ -17,9 +17,11 @@ public class TeamCategory {
     @Tsid
     @Column(name = "team_category_id")
     private Long id;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "category_id",nullable = false)
     private Category category;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "mentoring_team_id",nullable = false)
     private MentoringTeam mentoringTeam;
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/repository/ParticipationRepositoryCustom.java b/src/main/java/com/project/Teaming/domain/mentoring/repository/ParticipationRepositoryCustom.java
@@ -27,6 +27,8 @@ Optional<MentoringParticipation> findDynamicMentoringParticipation(
     List<User> findMemberUser(
             Long teamId,MentoringAuthority mentoringAuthority);
 
+    List<MentoringParticipation> findByUserId(Long userId);
+
     Optional<MentoringParticipation> findFirstUser(Long teamId, MentoringParticipationStatus participationStatus, MentoringAuthority authority);
     List<MentoringParticipation> findParticipationWithStatusAndUser(User user, MentoringParticipationStatus status);
     long countBy(Long teamId, MentoringParticipationStatus status);
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/repository/ParticipationRepositoryCustomImpl.java b/src/main/java/com/project/Teaming/domain/mentoring/repository/ParticipationRepositoryCustomImpl.java
@@ -158,6 +158,20 @@ public List<User> findMemberUser(Long teamId, MentoringAuthority mentoringAuthor
                 .fetch();
     }
 
+    @Override
+    public List<MentoringParticipation> findByUserId(Long userId) {
+
+        QMentoringParticipation mp = QMentoringParticipation.mentoringParticipation;
+        QMentoringTeam mt = QMentoringTeam.mentoringTeam;
+
+        return queryFactory
+                .selectFrom(mp)
+                .join(mp.mentoringTeam,mt).fetchJoin()
+                .where(mp.user.id.eq(userId))
+                .fetch();
+
+    }
+
 
     @Override
     public long countBy(Long teamId, MentoringParticipationStatus status) {
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/service/MentoringBoardService.java b/src/main/java/com/project/Teaming/domain/mentoring/service/MentoringBoardService.java
@@ -91,6 +91,10 @@ public Long saveMentoringPost(Long teamId, BoardRequest boardDto) {
     public MentoringBoard findMentoringPost(Long postId) {
         return mentoringBoardDataProvider.findBoard(postId);
     }
+    @Transactional
+    public MentoringBoard findMentoringPostForUpdate(Long postId) {
+        return mentoringBoardDataProvider.findBoard(postId);
+    }
 
     @Transactional(readOnly = true)
     public BoardSpecResponse toDto(MentoringBoard mentoringPost) {
diff --git a/src/main/java/com/project/Teaming/domain/mentoring/service/MentoringTeamService.java b/src/main/java/com/project/Teaming/domain/mentoring/service/MentoringTeamService.java
@@ -112,6 +112,13 @@ public MentoringTeam findMentoringTeam(Long mentoringTeamId) {
         return mentoringTeam;
     }
 
+    @Transactional
+    public MentoringTeam findMentoringTeamForUpdate(Long mentoringTeamId) {
+        MentoringTeam mentoringTeam = mentoringTeamDataProvider.findMentoringTeam(mentoringTeamId);
+        mentoringTeamPolicy.validateTeamStatus(mentoringTeam);
+        return mentoringTeam;
+    }
+
     /**
      * 내 멘토링 팀들을 모두 찾는 로직
      * @return
diff --git a/src/main/java/com/project/Teaming/domain/user/repository/ReportRepository.java b/src/main/java/com/project/Teaming/domain/user/repository/ReportRepository.java
@@ -43,6 +43,10 @@ Set<Long> findReportedUserIds(@Param("currentParticipationId") Long currentParti
     @Query("UPDATE Report r SET r.projectParticipation = NULL WHERE r.projectParticipation.id = :participationId")
     void updateProjectParticipationNull(@Param("participationId") Long participationId);
 
+    @Modifying
+    @Query("UPDATE Report r SET r.mentoringParticipation = NULL WHERE r.mentoringParticipation.id = :participationId")
+    void updateMentoringParticipationNull(@Param("participationId") Long participationId);
+
     @Modifying
     @Query("DELETE FROM Report r WHERE r.reportedUser.id = :userId")
     void deleteByReportedUserId(@Param("userId") Long userId);
diff --git a/src/main/java/com/project/Teaming/domain/user/repository/ReviewRepository.java b/src/main/java/com/project/Teaming/domain/user/repository/ReviewRepository.java
@@ -48,6 +48,10 @@ Set<Long> findReviewedUserIds(@Param("currentParticipationId") Long currentParti
     @Query("UPDATE Review r SET r.projectParticipation = NULL WHERE r.projectParticipation.id = :participationId")
     void updateProjectParticipationNull(@Param("participationId") Long participationId);
 
+    @Modifying
+    @Query("UPDATE Review r SET r.mentoringParticipation = NULL WHERE r.mentoringParticipation.id = :participationId")
+    void updateMentoringParticipationNull(@Param("participationId") Long participationId);
+
     @Modifying
     @Query("DELETE FROM Review r WHERE r.reviewee.id = :userId")
     void deleteByRevieweeId(@Param("userId") Long userId);
diff --git a/src/main/java/com/project/Teaming/domain/user/service/UserService.java b/src/main/java/com/project/Teaming/domain/user/service/UserService.java
@@ -1,5 +1,13 @@
 package com.project.Teaming.domain.user.service;
 
+import com.project.Teaming.domain.mentoring.dto.response.TeamUserResponse;
+import com.project.Teaming.domain.mentoring.entity.MentoringAuthority;
+import com.project.Teaming.domain.mentoring.entity.MentoringParticipation;
+import com.project.Teaming.domain.mentoring.entity.MentoringParticipationStatus;
+import com.project.Teaming.domain.mentoring.entity.MentoringTeam;
+import com.project.Teaming.domain.mentoring.repository.MentoringBoardRepository;
+import com.project.Teaming.domain.mentoring.repository.MentoringParticipationRepository;
+import com.project.Teaming.domain.mentoring.repository.MentoringTeamRepository;
 import com.project.Teaming.domain.project.entity.ParticipationStatus;
 import com.project.Teaming.domain.project.entity.ProjectParticipation;
 import com.project.Teaming.domain.project.entity.ProjectRole;
@@ -54,6 +62,8 @@ public class UserService {
     private final ProjectBoardRepository projectBoardRepository;
     private final ReportRepository reportRepository;
     private final UserNotificationService userNotificationService;
+    private final MentoringParticipationRepository mentoringParticipationRepository;
+    private final MentoringTeamRepository mentoringTeamRepository;
 
     public Optional<User> findById(Long id) {
         return userRepository.findById(id);
@@ -188,7 +198,9 @@ public void withdrawUser() {
         user.updateUserWithdraw();
 
         List<ProjectParticipation> projectParticipations = projectParticipationRepository.findByUser(user);
+        List<MentoringParticipation> mentoringParticipations = mentoringParticipationRepository.findByUserId(user.getId());
         quitProjectTeams(projectParticipations);
+        quitMentoringTeams(mentoringParticipations);
     }
 
     private void quitProjectTeams(List<ProjectParticipation> projectParticipations) {
@@ -217,4 +229,31 @@ private void quitProjectTeams(List<ProjectParticipation> projectParticipations)
             projectParticipationRepository.delete(participation);
         }
     }
+
+    private void quitMentoringTeams(List<MentoringParticipation> mentoringParticipations) {
+
+        for (MentoringParticipation participation : mentoringParticipations) {
+            MentoringTeam team = participation.getMentoringTeam();
+
+            if (participation.getAuthority() == MentoringAuthority.LEADER) {
+                //제일 일찍 들어온 팀원 조회
+                Optional<MentoringParticipation> firstMember = mentoringParticipationRepository.findFirstUser(
+                        team.getId(), MentoringParticipationStatus.ACCEPTED, MentoringAuthority.CREW);
+                // 새로운 리더 설정
+                firstMember.ifPresentOrElse(
+                        MentoringParticipation::setLeader,
+                        () -> {
+                            // 팀장 받을 유저가 없는 경우 - 팀 삭제
+                            // Report, Review 테이블에서 mentoring_participation_id를 null로 설정
+                            reportRepository.updateProjectParticipationNull(participation.getId());
+                            reviewRepository.updateProjectParticipationNull(participation.getId());
+                            // 팀원이 없다면 모든 참여 기록 삭제 후 팀 삭제
+                            mentoringTeamRepository.delete(team);
+                        }
+                );
+            }
+            reportRepository.updateMentoringParticipationNull(participation.getId());
+            reviewRepository.updateMentoringParticipationNull(participation.getId());
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public ResultDetailResponse<String> savePost(@PathVariable Long teamId,`
`36`	`36`	`public ResultDetailResponse<BoardSpecResponse> updatePost(@PathVariable Long postId,`
`37`	`37`	`@RequestBody @Valid BoardRequest dto) {`
`38`	`38`	`mentoringBoardService.updateMentoringPost(postId, dto);`
`39`		`- MentoringBoard mentoringPost = mentoringBoardService.findMentoringPost(postId);`
	`39`	`+ MentoringBoard mentoringPost = mentoringBoardService.findMentoringPostForUpdate(postId);`
`40`	`40`	`return new ResultDetailResponse<>(ResultCode.UPDATE_MENTORING_POST, mentoringBoardService.toDto(mentoringPost));`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public ResultDetailResponse<TeamAuthorityResponse> updateMentoringTeam(@PathVari`
`34`	`34`
`35`	`35`	`return new ResultDetailResponse<>(ResultCode.UPDATE_MENTORING_TEAM,`
`36`	`36`	`mentoringTeamService.getMentoringTeam(`
`37`		`- mentoringTeamService.findMentoringTeam(teamId)));`
	`37`	`+ mentoringTeamService.findMentoringTeamForUpdate(teamId)));`
`38`	`38`	`}`
`39`	`39`	`@Override`
`40`	`40`	`@GetMapping("/teams/{teamId}")`