Merge pull request #174 from prgrms-web-devcourse-final-project/feature/EA3-111-groupchat

pia01190 · web-flow · commit 361bd9238226 · 2025-07-22T20:12:50.000+09:00
[EA3-111] feature : dto/서비스 리팩토링 및 그룹 채팅 테스트를 위한 임시 html 파일 생성
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatMessageRequestDto.java b/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatMessageRequestDto.java
@@ -1,6 +1,9 @@
 package grep.neogul_coder.domain.groupchat.controller.dto.requset;
 
+import grep.neogul_coder.domain.groupchat.entity.GroupChatMessage;
+import grep.neogul_coder.domain.groupchat.entity.GroupChatRoom;
 import io.swagger.v3.oas.annotations.Hidden;
+import java.time.LocalDateTime;
 import lombok.Getter;
 
 @Hidden
@@ -18,15 +21,12 @@ public GroupChatMessageRequestDto(Long roomId, Long senderId, String message) {
         this.message = message;
     }
 
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setSenderId(Long senderId) {
-        this.senderId = senderId;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
+    public GroupChatMessage toEntity(GroupChatRoom room, Long senderId) {
+        return new GroupChatMessage(
+            room,
+            senderId,
+            this.message,
+            LocalDateTime.now()
+        );
     }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatSwaggerRequest.java b/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatSwaggerRequest.java
@@ -15,11 +15,4 @@ public class GroupChatSwaggerRequest {
 
     @Schema(description = "보낼 메시지", example = "안녕하세요!")
     private String message;
-
-
-    public void setSenderId(Long senderId) { this.senderId = senderId; }
-
-    public void setRoomId(Long roomId) { this.roomId = roomId; }
-
-    public void setMessage(String message) { this.message = message; }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/response/GroupChatMessageResponseDto.java b/src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/response/GroupChatMessageResponseDto.java
@@ -1,5 +1,7 @@
 package grep.neogul_coder.domain.groupchat.controller.dto.response;
 
+import grep.neogul_coder.domain.groupchat.entity.GroupChatMessage;
+import grep.neogul_coder.domain.users.entity.User;
 import io.swagger.v3.oas.annotations.Hidden;
 import java.time.LocalDateTime;
 import lombok.Getter;
@@ -16,10 +18,7 @@ public class GroupChatMessageResponseDto {
     private String message;             // 메시지 내용
     private LocalDateTime sentAt;       // 보낸 시간
 
-    public GroupChatMessageResponseDto() {
-    }
-
-    public GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
+    private GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
         String senderNickname, String profileImageUrl,
         String message, LocalDateTime sentAt) {
         this.id = id;
@@ -31,31 +30,15 @@ public GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
         this.sentAt = sentAt;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setSenderId(Long senderId) {
-        this.senderId = senderId;
-    }
-
-    public void setSenderNickname(String senderNickname) {
-        this.senderNickname = senderNickname;
-    }
-
-    public void setProfileImageUrl(String profileImageUrl) {
-        this.profileImageUrl = profileImageUrl;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setSentAt(LocalDateTime sentAt) {
-        this.sentAt = sentAt;
+    public static GroupChatMessageResponseDto from(GroupChatMessage message, User sender) {
+        return new GroupChatMessageResponseDto(
+            message.getMessageId(),
+            message.getGroupChatRoom().getRoomId(),
+            sender.getId(),
+            sender.getNickname(),
+            sender.getProfileImageUrl(),
+            message.getMessage(),
+            message.getSentAt()
+        );
     }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/entity/GroupChatMessage.java b/src/main/java/grep/neogul_coder/domain/groupchat/entity/GroupChatMessage.java
@@ -27,23 +27,14 @@ public class GroupChatMessage extends BaseEntity {
 
     private LocalDateTime sentAt;
 
-    public void setMessageId(Long messageId) {
-        this.messageId = messageId;
-    }
-
-    public void setGroupChatRoom(GroupChatRoom groupChatRoom) {
-        this.groupChatRoom = groupChatRoom;
-    }
-
-    public void setUserId(Long userId) {
+    public GroupChatMessage(GroupChatRoom room, Long userId, String message, LocalDateTime sentAt) {
+        this.groupChatRoom = room;
         this.userId = userId;
-    }
-
-    public void setMessage(String message) {
         this.message = message;
+        this.sentAt = sentAt;
     }
 
-    public void setSentAt(LocalDateTime sentAt) {
-        this.sentAt = sentAt;
+    protected GroupChatMessage() {
+
     }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/repository/GroupChatMessageRepository.java b/src/main/java/grep/neogul_coder/domain/groupchat/repository/GroupChatMessageRepository.java
@@ -9,11 +9,10 @@
 
 public interface GroupChatMessageRepository extends JpaRepository<GroupChatMessage, Long> {
 
-
     // 채팅방(roomId)에 속한 메시지를 전송 시간 내림차순으로 페이징 조회
     @Query("SELECT m FROM GroupChatMessage m " +
         "WHERE m.groupChatRoom.roomId = :roomId " +
         "ORDER BY m.sentAt ASC")
     Page<GroupChatMessage> findMessagesByRoomIdAsc(@Param("roomId") Long roomId, Pageable pageable);
 
-}
+}
diff --git a/src/main/java/grep/neogul_coder/domain/groupchat/service/GroupChatService.java b/src/main/java/grep/neogul_coder/domain/groupchat/service/GroupChatService.java
@@ -10,13 +10,15 @@
 import grep.neogul_coder.domain.users.entity.User;
 import grep.neogul_coder.domain.users.repository.UserRepository;
 import grep.neogul_coder.global.response.PageResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 
+@RequiredArgsConstructor
 @Service
 public class GroupChatService {
 
@@ -25,17 +27,6 @@ public class GroupChatService {
     private final UserRepository userRepository;
     private final StudyMemberRepository studyMemberRepository;
 
-    // 생성자 주입을 통한 의존성 주입
-    public GroupChatService(GroupChatMessageRepository messageRepository,
-        GroupChatRoomRepository roomRepository,
-        UserRepository userRepository,
-        StudyMemberRepository studyMemberRepository) {
-        this.messageRepository = messageRepository;
-        this.roomRepository = roomRepository;
-        this.userRepository = userRepository;
-        this.studyMemberRepository = studyMemberRepository;
-    }
-
     public GroupChatMessageResponseDto saveMessage(GroupChatMessageRequestDto requestDto) {
         // 채팅방 존재 여부 확인
         GroupChatRoom room = roomRepository.findById(requestDto.getRoomId())
@@ -51,26 +42,14 @@ public GroupChatMessageResponseDto saveMessage(GroupChatMessageRequestDto reques
             throw new IllegalArgumentException("해당 스터디에 참가한 사용자만 채팅할 수 있습니다.");
         }
 
-        // 메시지 생성 및 저장
-        GroupChatMessage message = new GroupChatMessage();
-        message.setGroupChatRoom(room);                      // 엔티티에 있는 필드명 맞게 사용
-        message.setUserId(sender.getId());                   // 연관관계 없이 userId만 저장
-        message.setMessage(requestDto.getMessage());
-        message.setSentAt(LocalDateTime.now());
+        // 메시지 생성
+        GroupChatMessage message = requestDto.toEntity(room, sender.getId());
 
         // 메시지 저장
         messageRepository.save(message);
 
-        // 저장된 메시지를 dto로 변환
-        return new GroupChatMessageResponseDto(
-            message.getMessageId(),
-            message.getGroupChatRoom().getRoomId(),   // ← roomId 필드가 필요하면 여기서 꺼내야 함
-            sender.getId(),
-            sender.getNickname(),
-            sender.getProfileImageUrl(),
-            message.getMessage(),
-            message.getSentAt()
-        );
+        // 응답 dto 생성
+        return GroupChatMessageResponseDto.from(message, sender);
     }
 
     // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
@@ -86,15 +65,7 @@ public PageResponse<GroupChatMessageResponseDto> getMessages(Long roomId, int pa
             User sender = userRepository.findById(message.getUserId())
                 .orElseThrow(() -> new IllegalArgumentException("사용자가 존재하지 않습니다."));
 
-            return new GroupChatMessageResponseDto(
-                message.getMessageId(),
-                message.getGroupChatRoom().getRoomId(),
-                sender.getId(),
-                sender.getNickname(),
-                sender.getProfileImageUrl(),
-                message.getMessage(),
-                message.getSentAt()
-            );
+            return GroupChatMessageResponseDto.from(message, sender);
         });
 
         // PageResponse로 감싸서 반환
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -16,11 +16,11 @@ INSERT INTO study_post (study_id, user_id, title, category, content) VALUES (4,
 INSERT INTO study_post (study_id, user_id, title, category, content) VALUES (2, 2, '개발 유튜브 공유', 'FREE', '재미니의 개발실무 ( 토스 ); 개발바닥');
 INSERT INTO study_post (study_id, user_id, title, category, content) VALUES (5, 5, '점심 메뉴 추천', 'FREE', '오늘 점심 뭐먹을지 추천 받습니다!');
 
-INSERT INTO comment (post_id, user_id, content) VALUES (5, 4, '확인 했습니다!');
-INSERT INTO comment (post_id, user_id, content) VALUES (5, 4, '좋은 정보 감사합니다!');
-INSERT INTO comment (post_id, user_id, content) VALUES (3, 2, '관련된 블로그 공유 드립니다!');
-INSERT INTO comment (post_id, user_id, content) VALUES (2, 5, '정보 감사합니다!');
-INSERT INTO comment (post_id, user_id, content) VALUES (4, 1, '제육 돈까스');
+-- INSERT INTO comment (post_id, user_id, content) VALUES (5, 4, '확인 했습니다!');
+-- INSERT INTO comment (post_id, user_id, content) VALUES (5, 4, '좋은 정보 감사합니다!');
+-- INSERT INTO comment (post_id, user_id, content) VALUES (3, 2, '관련된 블로그 공유 드립니다!');
+-- INSERT INTO comment (post_id, user_id, content) VALUES (2, 5, '정보 감사합니다!');
+-- INSERT INTO comment (post_id, user_id, content) VALUES (4, 1, '제육 돈까스');
 
 INSERT INTO study_member (study_id, user_id, role, participated) VALUES (1, 3, 'LEADER', FALSE);
 INSERT INTO study_member (study_id, user_id, role, participated) VALUES (1, 4, 'MEMBER', FALSE);
diff --git a/src/main/resources/static/Chat-Test.html b/src/main/resources/static/Chat-Test.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+  <meta charset="UTF-8">
+  <title>그룹 채팅 로컬 테스트</title>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.5.1/sockjs.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
+</head>
+<body>
+<h2>그룹 채팅 테스트 (로컬 서버)</h2>
+
+<div>
+  <label>Room ID: </label>
+  <input type="number" id="roomId" value="1">
+  <label>Sender ID: </label>
+  <input type="number" id="senderId" value="10">
+  <button onclick="connect()">연결하기</button>
+  <button onclick="disconnect()">연결 해제</button>
+</div>
+
+<hr>
+
+<div>
+  <input type="text" id="messageInput" placeholder="메시지를 입력하세요" style="width: 300px;">
+  <button onclick="sendMessage()">전송</button>
+</div>
+
+<h3>채팅 로그</h3>
+<ul id="chatList"></ul>
+
+<script>
+  let stompClient = null;
+  let currentRoomId = null;
+
+  function connect() {
+    const roomId = document.getElementById("roomId").value || 1;
+    currentRoomId = roomId;
+
+    // 로컬 서버용 WebSocket 엔드포인트
+    const socket = new SockJS("http://localhost:8083/ws-stomp");
+    stompClient = Stomp.over(socket);
+
+    stompClient.connect({}, function (frame) {
+      console.log("WebSocket 연결 성공:", frame);
+      alert("채팅방 " + roomId + "에 연결되었습니다!");
+
+      // 채팅방 구독
+      stompClient.subscribe(`/sub/chat/room/${roomId}`, function (message) {
+        const chat = JSON.parse(message.body);
+        showMessage(chat.senderNickname + ": " + chat.message);
+      });
+    });
+  }
+
+  function sendMessage() {
+    const messageContent = document.getElementById("messageInput").value;
+    const senderId = document.getElementById("senderId").value || 10;
+
+    if (stompClient && stompClient.connected) {
+      stompClient.send("/pub/chat/message", {}, JSON.stringify({
+        roomId: currentRoomId,
+        senderId: senderId,
+        message: messageContent
+      }));
+      document.getElementById("messageInput").value = "";
+    } else {
+      alert("WebSocket이 연결되지 않았습니다.");
+    }
+  }
+
+  function disconnect() {
+    if (stompClient) {
+      stompClient.disconnect(() => {
+        alert("연결이 해제되었습니다.");
+      });
+    }
+  }
+
+  function showMessage(message) {
+    const li = document.createElement("li");
+    li.textContent = message;
+    document.getElementById("chatList").appendChild(li);
+  }
+</script>
+</body>
+</html>
