[MS-170] Fix: 회원탈퇴 병합 후 에러 해결

MODU-TAXI · Aug 5, 2024 · c3172ed · c3172ed
1 parent 445ab5d
commit c3172ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/src/main/java/com/modutaxi/api/domain/history/repository/HistoryRepository.java b/src/main/java/com/modutaxi/api/domain/history/repository/HistoryRepository.java
@@ -35,5 +35,4 @@ Tuple findTotalChargeAndPortionChargeByMemberIdAndDepartureDate(
         + "WHERE h.member.id = :memberId ")
     Tuple findStartDateAndEndDateByMemberId(Long memberId);
 
-    void deleteByMember(Member member);
 }
diff --git a/src/main/java/com/modutaxi/api/domain/member/service/UpdateMemberService.java b/src/main/java/com/modutaxi/api/domain/member/service/UpdateMemberService.java
@@ -172,17 +172,13 @@ public void deleteRoomMapping(Member member) {
         log.info("대기열 탈퇴 성공!");
         // 내가 방장인 방이 있다면, 방 삭제
         if (roomRepository.existsRoomByRoomManager(member)) {
-            log.info("내가 방장인 방이 있나요? 결과: {}", roomRepository.existsRoomByRoomManager(member));
             Long roomId = roomRepository.findIdByRoomManagerAndRoomStatusIsNotDelete(
                 member);   // 내가 이용 중인 방 ID
-            log.info("내 방의 ID는? 결과: {}", roomId);
             updateRoomService.deleteRoom(member, roomId);
-            roomRepository.updateMemberId(roomId, 0L);
             log.info("방 삭제 성공!");
         }
         // 내가 방장이 아니고 이용 중인 방이 있다면, 방 퇴장
         else if (participantRepository.existsByMember(member)) {
-            log.info("내가 이용 중인 방이 있나요? 결과: {}", participantRepository.existsByMember(member));
             updateParticipantService.leaveRoomAndDeleteChatRoomInfo(member.getId());
             log.info("방 퇴장 성공!");
         }
@@ -203,8 +199,6 @@ public void deleteMemberInfo(Member member) {
         log.info("계좌 삭제 성공!");
         // 알림 hard delete
         alarmRepository.deleteByMemberId(member.getId());
-        // 이용 내역 hard delete
-        historyRepository.deleteByMember(member);
         log.info("알림 삭제 성공!");
     }
 

diff --git a/src/main/java/com/modutaxi/api/domain/report/entity/Report.java b/src/main/java/com/modutaxi/api/domain/report/entity/Report.java
@@ -6,7 +6,12 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Getter

diff --git a/src/main/java/com/modutaxi/api/domain/report/repository/ReportRepository.java b/src/main/java/com/modutaxi/api/domain/report/repository/ReportRepository.java
@@ -2,7 +2,6 @@
 
 import com.modutaxi.api.domain.report.entity.Report;
 import io.lettuce.core.dynamic.annotation.Param;
-import java.time.LocalDateTime;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

diff --git a/src/main/java/com/modutaxi/api/domain/room/repository/RoomRepository.java b/src/main/java/com/modutaxi/api/domain/room/repository/RoomRepository.java
@@ -2,13 +2,11 @@
 
 import com.modutaxi.api.domain.member.entity.Member;
 import com.modutaxi.api.domain.room.entity.Room;
-import io.lettuce.core.dynamic.annotation.Param;
 import jakarta.persistence.LockModeType;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 public interface RoomRepository extends JpaRepository<Room, Long> {
@@ -27,8 +25,4 @@ public interface RoomRepository extends JpaRepository<Room, Long> {
     @Lock(value = LockModeType.PESSIMISTIC_WRITE)
     @Query(value = "SELECT r FROM Room r WHERE r.id =:id AND r.roomStatus < 4")
     Optional<Room> findActiveRoomByIdForUpdate(Long id);
-
-    @Modifying
-    @Query(value = "UPDATE Room r SET r.roomManager =: memberId WHERE r.id = :roomId")
-    void updateMemberId(@Param("roomId") Long roomId, @Param("memberId") Long memberId);
 }