Fix: ChatMessage, ChatRoom 수정

Author: ces0135-hub

src/main/java/cmf/commitField/domain/Timer/controller/TimerController.java

@@ -0,0 +1,7 @@
+package cmf.commitField.domain.Timer.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TimerController {
+}

src/main/java/cmf/commitField/domain/Timer/dto/TimerDto.java

@@ -0,0 +1,14 @@
+package cmf.commitField.domain.Timer.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class TimerDto {
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+}

src/main/java/cmf/commitField/domain/Timer/entity/Timer.java

@@ -0,0 +1,33 @@
+package cmf.commitField.domain.Timer.entity;
+
+import cmf.commitField.domain.user.entity.User;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Timer {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private User user;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+
+    // 타이머 종료 메서드
+    public void stop(LocalDateTime endTime, String totalTime) {
+        this.endTime = endTime;
+        this.totalTime = totalTime;
+    }
+}

src/main/java/cmf/commitField/domain/Timer/service/TimerService.java

@@ -0,0 +1,8 @@
+package cmf.commitField.domain.Timer.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class TimerService {
+
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -30,6 +30,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
     private final ChatMessageCustomRepository chatMessageCustomRepository;
 
     @Override
+    @Transactional
     public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roomId) {
         User findUser = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java

@@ -141,36 +141,33 @@ public void outRoom(Long userId, Long roomId) {
         ChatRoom room = chatRoomRepository
                 .findChatRoomById(roomId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM_FOUND));
-        // 방장이 아니라면
-        if (!Objects.equals(room.getRoomCreator(), userId)) {
-            userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);
-            return;
-        }
-        // 방장이라면 방 삭제
-        chatMessageRepository.deleteChatMsgByChatRoom_Id(roomId); //방 삭제 시 채팅도 다 삭제(필요 시)
-        userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
-        chatRoomRepository.deleteById(roomId);
 
-    }
+        // 방의 생성자와 현재 사용자가 같은지 확인
+        boolean isCreator = Objects.equals(room.getRoomCreator(), userId);
 
+        // 방장 여부와 상관없이 항상 사용자-채팅방 연결만 제거
+        // 방이 삭제되지 않고 목록에 계속 표시됨
+        userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);
+    }
 
+    // 방 삭제는 별도의 메소드로 분리
     @Override
     @Transactional
     public void deleteRoom(Long userId, Long roomId) {
         ChatRoom room = chatRoomRepository
                 .findChatRoomById(roomId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM));
+
         //방장이 아닐 경우, 삭제 불가
         if (!Objects.equals(room.getRoomCreator(), userId)) {
             throw new CustomException(ErrorCode.NOT_ROOM_CREATOR);
         }
+
         //모든 사용자 제거 후 방 삭제
         chatMessageRepository.deleteChatMsgByChatRoom_Id(roomId);
         userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
         chatRoomRepository.deleteById(roomId);
-
-}
-
+    }
 
 
 }