[fix] 인증방이 해체 안되는 버그 수정

kookmin-sw · May 23, 2024 · 9932532 · 9932532
1 parent 22c776e
commit 9932532
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/backend/src/main/java/com/dodo/room/RoomService.java b/backend/src/main/java/com/dodo/room/RoomService.java
@@ -1,6 +1,7 @@
 package com.dodo.room;
 
 import com.dodo.certification.CertificationRepository;
+import com.dodo.certification.domain.Certification;
 import com.dodo.exception.NotFoundException;
 import com.dodo.image.ImageRepository;
 import com.dodo.image.ImageService;
@@ -150,6 +151,7 @@ public Room createGroupRoom(String roomName, String roomPwd, Long maxUser, Categ
                 .goal(goal)
                 .nowGoal(0)
                 .isFull(isFull)
+                .image(imageRepository.findById(1L).get())
                 .build();
 
         roomRepository.save(room);
@@ -181,6 +183,14 @@ public void minusUserCnt(Long roomId){
     // 인증방 해체
     public void deleteRoom(Long roomId){
 
+        List<RoomUser> roomUserList = roomUserRepository.findAllByRoomId(roomId).orElseThrow(NotFoundException::new);
+        for(RoomUser roomUser : roomUserList){
+            for (Certification certificate : certificationRepository.findAllByRoomUser(roomUser).get()){
+                certificate.setRoomUser(null);
+                certificationRepository.save(certificate);
+            }
+        }
+
         roomUserRepository.deleteAllInBatch(roomUserRepository.findAllByRoomId(roomId).orElseThrow(NotFoundException::new));
         roomTagRepository.deleteAllInBatch(roomTagRepository.findAllByRoom(roomRepository.findById(roomId).orElseThrow(NotFoundException::new)).orElseThrow(NotFoundException::new));
 

diff --git a/backend/src/main/java/com/dodo/roomuser/RoomUserService.java b/backend/src/main/java/com/dodo/roomuser/RoomUserService.java
@@ -66,6 +66,10 @@ public void deleteChatRoomUser(Long roomId, Long userId){
             }
         }
 
+        for (Certification certificate : certificationRepository.findAllByRoomUser(roomUser).get()){
+            certificate.setRoomUser(null);
+            certificationRepository.save(certificate);
+        }
         roomUserRepository.delete(roomUser);
 
         log.info("삭제한 room : {}, user : {}", roomUser.getRoom().getId(), roomUser.getUser().getId());

diff --git a/backend/src/main/java/com/dodo/roomuser/domain/RoomUser.java b/backend/src/main/java/com/dodo/roomuser/domain/RoomUser.java
@@ -36,7 +36,7 @@ public class RoomUser {
     @ManyToOne
     private Room room;
 
-    @OneToMany(mappedBy = "roomUser", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "roomUser", fetch = FetchType.LAZY)
     private List<Certification> certification;
 
     public RoomUser(User user, Room room) {