feat: 백엔드 채팅방 나가기 기능 구현

Author: audwls239

NBE_5_7_2_02TEAM/src/main/java/io/twogether/nbe_5_7_2_02team/chat/dao/ChatMemberRepository.java

@@ -1,9 +1,11 @@
 package io.twogether.nbe_5_7_2_02team.chat.dao;
 
 import io.twogether.nbe_5_7_2_02team.chat.domain.ChatMember;
+import io.twogether.nbe_5_7_2_02team.chat.domain.ChatMemberStatus;
 import io.twogether.nbe_5_7_2_02team.chat.domain.ChatRoom;
 import io.twogether.nbe_5_7_2_02team.member.domain.Member;
 
+import java.util.Collection;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -14,7 +16,7 @@ public interface ChatMemberRepository extends JpaRepository<ChatMember, Long> {
 
     List<ChatMember> findByChatRoom(ChatRoom chatRoom);
 
-    List<ChatMember> findByMember(Member member);
+    List<ChatMember> findByMemberAndChatMemberStatusIn(Member member, Collection<ChatMemberStatus> chatMemberStatuses);
 
     void deleteByChatRoom(ChatRoom chatRoom);
 

NBE_5_7_2_02TEAM/src/main/java/io/twogether/nbe_5_7_2_02team/chat/domain/ChatMember.java

@@ -17,6 +17,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Entity
 @Getter
@@ -35,6 +36,7 @@ public class ChatMember extends BaseEntity {
     @JoinColumn(name = "member_id")
     private Member member;
 
+    @Setter
     @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private ChatMemberStatus chatMemberStatus;
@@ -45,8 +47,4 @@ public ChatMember(ChatRoom chatRoom, Member member, ChatMemberStatus chatMemberS
         this.member = member;
         this.chatMemberStatus = chatMemberStatus;
     }
-
-    public void updateStatus(ChatMemberStatus chatMemberStatus) {
-        this.chatMemberStatus = chatMemberStatus;
-    }
 }

NBE_5_7_2_02TEAM/src/main/java/io/twogether/nbe_5_7_2_02team/chat/dto/request/ChatMemberUpdateRequest.java

@@ -1,12 +1,17 @@
 package io.twogether.nbe_5_7_2_02team.chat.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.twogether.nbe_5_7_2_02team.chat.domain.ChatMemberStatus;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
 public class ChatMemberUpdateRequest {
     private final ChatMemberStatus chatMemberStatus;
+
+    @JsonCreator
+    public ChatMemberUpdateRequest(@JsonProperty("chatMemberStatus") ChatMemberStatus chatMemberStatus) {
+        this.chatMemberStatus = chatMemberStatus;
+    }
 }

NBE_5_7_2_02TEAM/src/main/java/io/twogether/nbe_5_7_2_02team/chat/service/ChatMemberService.java

@@ -1,7 +1,8 @@
 package io.twogether.nbe_5_7_2_02team.chat.service;
 
+import static io.twogether.nbe_5_7_2_02team.chat.domain.ChatMemberStatus.LEFT;
+import static io.twogether.nbe_5_7_2_02team.chat.domain.ChatMemberStatus.OFFLINE;
 import static io.twogether.nbe_5_7_2_02team.chat.domain.ChatMemberStatus.ONLINE;
-import static io.twogether.nbe_5_7_2_02team.global.response.error.ErrorCode.CHAT_MEMBER_ALREADY_EXISTS;
 import static io.twogether.nbe_5_7_2_02team.global.response.error.ErrorCode.CHAT_MEMBER_NOT_ENTER;
 import static io.twogether.nbe_5_7_2_02team.global.response.error.ErrorCode.CHAT_MEMBER_UNDEFINED_STATUS;
 import static io.twogether.nbe_5_7_2_02team.global.response.error.ErrorCode.CHAT_ROOM_EMPTY;
@@ -16,6 +17,7 @@
 import io.twogether.nbe_5_7_2_02team.global.exception.ErrorException;
 import io.twogether.nbe_5_7_2_02team.member.domain.Member;
 
+import java.util.Arrays;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -39,7 +41,7 @@ public List<ChatRoomGetResponse> getChatRoomListByUser(
             @AuthenticationPrincipal UserDetails userDetails) {
         Member member = checkUserLogin.checkUserLogin(userDetails);
 
-        List<ChatMember> chatMemberList = chatMemberRepository.findByMember(member);
+        List<ChatMember> chatMemberList = chatMemberRepository.findByMemberAndChatMemberStatusIn(member, Arrays.asList(ONLINE, OFFLINE));
 
         return chatMemberList.stream()
                 .map(chatMember -> ChatRoomGetResponse.from(chatMember.getChatRoom()))
@@ -68,7 +70,11 @@ public Long createChatMember(Long chatroomId, UserDetails userDetails) {
         ChatMember chatMember = chatMemberRepository.findByChatRoomAndMember(chatRoom, member);
 
         if (chatMember != null) {
-            throw new ErrorException(CHAT_MEMBER_ALREADY_EXISTS);
+            if (chatMember.getChatMemberStatus() == LEFT) {
+                chatMember.setChatMemberStatus(ONLINE);
+            }
+
+            return chatMember.getId();
         }
 
         Long id =
@@ -105,7 +111,7 @@ public Long updateChatMember(
             throw new ErrorException(CHAT_MEMBER_UNDEFINED_STATUS);
         }
 
-        chatMember.updateStatus(chatMemberStatus);
+        chatMember.setChatMemberStatus(chatMemberStatus);
         return chatMemberRepository.save(chatMember).getId();
     }
 }

frontend/src/pages/ChatRoomList.tsx

@@ -97,7 +97,8 @@ function ChatRoomList() {
 
   const handleCloseRoom = () => {
     setSelectedRoom(null);
-    setSelectedRoomTitle(""); // 선택된 방 제목도 초기화
+    setSelectedRoomTitle("");
+    fetchData();
   };
 
   return (
@@ -163,7 +164,7 @@ function ChatRoomList() {
 
       <div
         className={`transition-all duration-300 ease-in-out ${selectedRoom ? "w-2/3 md:w-3/4 lg:w-4/5 opacity-100" : "w-0 opacity-0"
-        } h-full flex items-center justify-center`}
+          } h-full flex items-center justify-center`}
       >
         {selectedRoom && (
           <div className="w-[500px] h-[95%] rounded-xl overflow-hidden shadow-lg bg-white">