[FIX] 회원 탈퇴시 크루 삭제

src/main/java/com/follow_me/running_mate/domain/crew/controller/CrewController.java

@@ -225,14 +225,14 @@ public BaseResponse<CrewResponse.CrewScheduleApplyIdResponse> applyToSchedule(
     @Operation(summary = "크루 멤버 상태 업데이트 API", description = "크루 멤버 상태를 수락, 거절, 탈퇴로 변경합니다.")
     @ApiResponse(responseCode = "200", description = "상태 업데이트 성공",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = BaseResponse.class)))
-    public BaseResponse<Void> updateCrewMemberStatus(
+    public BaseResponse<CrewResponse.CrewMemberResponse> updateCrewMemberStatus(
             @AuthenticationPrincipal PrincipalDetails principalDetails,
             @PathVariable(value = "crewId") Long crewId,
             @PathVariable(value = "memberId") Long memberId,
             @RequestParam(value = "status") CrewMemberStatus status
     ) {
-        crewService.updateCrewMemberStatus(principalDetails.member(), crewId, memberId, status);
-        return BaseResponse.success("크루 멤버 상태가 성공적으로 업데이트되었습니다.", null);
+        return BaseResponse.success("크루 멤버 상태가 성공적으로 업데이트되었습니다.",
+                crewService.updateCrewMemberStatus(principalDetails.member(), crewId, memberId, status));
     }
 
     @PatchMapping(value = "/{crewId}/modify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)

src/main/java/com/follow_me/running_mate/domain/crew/dto/response/CrewResponse.java

@@ -2,7 +2,6 @@
 
 import com.follow_me.running_mate.domain.course.dto.response.CourseResponse;
 import com.follow_me.running_mate.domain.enums.ActivityTimeType;
-import com.follow_me.running_mate.domain.enums.CourseImageType;
 import com.follow_me.running_mate.domain.enums.Ranking;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -35,6 +34,13 @@ public static class CrewCourseIdResponse {
     public static class CrewScheduleApplyIdResponse {
         private Long ScheduleApplyId;
     }
+    @Getter
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class CrewMemberResponse {
+        private Long memberId;
+        private String status;
+    }
 
     @Getter
     @Builder // 인자가 많아 생성자가 많이 필요할때 사용해 선택적으로 인자를 사용해 편하게 해주는 어노테이션

src/main/java/com/follow_me/running_mate/domain/crew/repository/CrewRepository.java

@@ -23,7 +23,8 @@ default Crew getCrew(Long crewId) {
     @Query(value = "SELECT DISTINCT c.* FROM crew c " +
             "LEFT JOIN crew_location l ON c.id = l.crew_id " +
             "LEFT JOIN crew_activity_time a ON c.id = a.crew_id " +
-            "WHERE (:keyword IS NULL OR c.name ILIKE CONCAT('%', :keyword, '%')) " +
+            "WHERE c.deleted_at IS NULL " +
+            "AND (:keyword IS NULL OR c.name ILIKE CONCAT('%', :keyword, '%')) " +
             "AND (:city IS NULL OR l.city ILIKE CONCAT('%', :city, '%')) " +
             "AND (:district IS NULL OR l.district ILIKE CONCAT('%', :district, '%')) " +
             "AND (:activityTimes IS NULL OR a.type IN (:activityTimes))"+
@@ -36,4 +37,5 @@ List<Crew> searchCrews(
             @Param("activityTimes") List<String> activityTimes,
             @Param("myCrewIds") List<Long> myCrewIds);
 
+    boolean existsByLeader(Member member);
 }

src/main/java/com/follow_me/running_mate/domain/crew/service/CrewService.java

@@ -27,7 +27,7 @@ public interface CrewService {
 
     CrewResponse.CrewScheduleIdResponse registerSchedule(Member member, Long crewId, CrewRequest.CreateSchedule request);
     CrewResponse.CrewScheduleApplyIdResponse applyToSchedule(Member member, Long scheduleId);
-    void updateCrewMemberStatus(Member currentUser, Long crewId, Long memberId, CrewMemberStatus status);
+    CrewResponse.CrewMemberResponse updateCrewMemberStatus(Member currentUser, Long crewId, Long memberId, CrewMemberStatus status);
     CrewResponse.CrewIdResponse updateCrew(
         Member member, Long crewId, CrewRequest.UpdateCrewRequest request, MultipartFile representativeImage);
     CrewResponse.CrewCourseListResponse getFavoriteCourses(Member member,Long crewId);

src/main/java/com/follow_me/running_mate/domain/crew/service/CrewServiceImpl.java

@@ -313,7 +313,8 @@ public CrewResponse.CrewScheduleApplyIdResponse applyToSchedule(Member member, L
 
     @Override
     @Transactional
-    public void updateCrewMemberStatus(Member currentUser, Long crewId, Long memberId, CrewMemberStatus status) {
+    public CrewResponse.CrewMemberResponse updateCrewMemberStatus(Member currentUser, Long crewId,
+                                                                  Long memberId, CrewMemberStatus status) {
 
         Member applyMember = memberService.getMember(memberId);
         Crew crew = crewRepository.getCrew(crewId);
@@ -339,6 +340,7 @@ public void updateCrewMemberStatus(Member currentUser, Long crewId, Long memberI
                 throw new CustomException(CrewErrorCode.INVALID_INPUT_VALUE);
         }
         crewMember.updateStatus(status);
+        return new CrewResponse.CrewMemberResponse(memberId, status.name());
     }
 
     private void validateCrewLeader(Member currentUser, CrewMember crewMember) {

src/main/java/com/follow_me/running_mate/domain/member/service/MemberServiceImpl.java

@@ -3,6 +3,8 @@
 import com.follow_me.running_mate.domain.course.dto.response.CourseResponse;
 import com.follow_me.running_mate.domain.course.entity.CourseRecord;
 import com.follow_me.running_mate.domain.course.service.record.CourseRecordService;
+import com.follow_me.running_mate.domain.crew.entity.*;
+import com.follow_me.running_mate.domain.crew.repository.*;
 import com.follow_me.running_mate.domain.enums.FootprintType;
 import com.follow_me.running_mate.domain.member.dto.request.MemberRequest;
 import com.follow_me.running_mate.domain.member.dto.response.MemberResponse;
@@ -48,6 +50,15 @@ public class MemberServiceImpl implements MemberService {
     private final MemberLocationRepository memberLocationRepository;
     private final MemberFootprintRepository memberFootprintRepository;
     private final MemberWithdrawRepository memberWithdrawRepository;
+    private final CrewRepository crewRepository;
+    private final CrewMemberRepository crewMemberRepository;
+    private final CrewActivityTimeRepository crewActivityTimeRepository;
+    private final CrewCourseRepository crewCourseRepository;
+    private final CrewImageRepository crewImageRepository;
+    private final CrewLocationRepository crewLocationRepository;
+    private final CrewScheduleRepository crewScheduleRepository;
+    private final CrewScheduleApplyRepository crewScheduleApplyRepository;
+
 
     @Override
     public void signup(MemberRequest.SignUpRequest request, MultipartFile profileImage) {
@@ -73,10 +84,37 @@ public void logout(String email) {
     public void withdraw(Member member, MemberRequest.WithdrawRequest request) {
         memberWithdrawRepository.save(memberMapper.toMemberWithdraw(member, request));
         tokenRepository.deleteById(member.getEmail()); //토큰 삭제
+
+        if(crewRepository.existsByLeader(member)){
+            crewRepository.findByLeader(member).ifPresent(crew -> {
+                softDeleteCrew(member, crew);
+            });
+        }
+
         member.delete();
         memberRepository.save(member);
     }
 
+    private void softDeleteCrew(Member member, Crew crew) {
+        List<CrewMember> crewMembers = crewMemberRepository.findAllByCrew(crew);
+
+        crewMembers.forEach(CrewMember::delete);
+
+        crewActivityTimeRepository.findAllByCrew(crew).forEach(CrewActivityTime::delete);
+        crewCourseRepository.findAllByCrew(crew).forEach(CrewCourse::delete);
+        crewImageRepository.findAllByCrew(crew).forEach(CrewImage::delete);
+        crewLocationRepository.findAllByCrew(crew).forEach(CrewLocation::delete);
+        crewMemberRepository.findAllByCrew(crew).forEach(CrewMember::delete);
+
+        List<CrewSchedule> schedules = crewScheduleRepository.findAllByCrew(crew);
+        for (CrewSchedule schedule : schedules) {
+            crewScheduleApplyRepository.findAllByCrewSchedule(schedule).forEach(CrewScheduleApply::delete);
+            schedule.delete();
+        }
+        crew.delete();
+        crewRepository.save(crew);
+    }
+
     @Override
     @Transactional(readOnly = true)
     public MemberResponse.MyProfileResponse getMyProfile(Member member) {