Skip to content

Commit 9ff4f0e

Browse files
committed
#89 코드 리팩토링 추가
1 parent f3064f5 commit 9ff4f0e

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

nodejs-frontend/static/js/roomlist/roomlist.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@ const roomList = {
6565
});
6666

6767
eventSource.addEventListener('roomDeleted', function(event) {
68-
const deletedRoom = JSON.parse(event.data);
69-
const deletedRoomId = deletedRoom.roomId;
68+
const { roomId } = JSON.parse(event.data);
7069
$('#roomTableBody')
71-
.find(`[data-id='${deletedRoomId}'], [data-roomid='${deletedRoomId}']`)
70+
.find(`[data-id='${roomId}'], [data-roomid='${roomId}']`)
7271
.closest('tr')
7372
.remove();
7473
});
@@ -78,30 +77,23 @@ const roomList = {
7877
});
7978

8079
eventSource.addEventListener("changeUserCnt", function (event) {
81-
const chatRoom = JSON.parse(event.data);
82-
const chatRoomId = chatRoom.roomId;
83-
const userCnt = chatRoom.userCount;
84-
const {maxUserCnt} = chatRoom;
80+
const { roomId, userCount, maxUserCnt } = JSON.parse(event.data);
8581

8682
const $row = $('#roomTableBody')
87-
.find(`[data-id='${chatRoomId}'], [data-roomid='${chatRoomId}']`)
83+
.find(`[data-id='${roomId}'], [data-roomid='${roomId}']`)
8884
.closest('tr');
8985

90-
$row.find('span.room-user-count').text(`${userCnt}/${maxUserCnt}`);
86+
$row.find('span.room-user-count').text(`${userCount}/${maxUserCnt}`);
9187
});
9288

9389
eventSource.addEventListener("changeRoomSetting", function (event) {
94-
const chatRoom = JSON.parse(event.data);
95-
const chatRoomId = chatRoom.roomId;
96-
const roomName = chatRoom.roomName;
97-
const userCnt = chatRoom.userCount;
98-
const maxUserCnt = chatRoom.maxUserCnt;
90+
const { roomId, roomName, userCount, maxUserCnt } = JSON.parse(event.data);
9991

10092
const $row = $('#roomTableBody')
101-
.find(`[data-id='${chatRoomId}'], [data-roomid='${chatRoomId}']`)
93+
.find(`[data-id='${roomId}'], [data-roomid='${roomId}']`)
10294
.closest('tr');
10395

104-
$row.find('span.room-user-count').text(`${userCnt}/${maxUserCnt}`);
96+
$row.find('span.room-user-count').text(`${userCount}/${maxUserCnt}`);
10597
$row.find('.enterRoomBtn, .directEnterBtn').text(roomName);
10698
});
10799

springboot-backend/src/main/java/webChat/service/chatroom/SseService.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import webChat.model.room.ChatRoom;
77

88
import java.io.IOException;
9+
import java.util.ArrayList;
910
import java.util.List;
1011
import java.util.concurrent.CopyOnWriteArrayList;
1112

@@ -31,7 +32,7 @@ public SseEmitter createEmitter() {
3132

3233
// 방 생성 시, 연결된 모든 클라이언트에게 이벤트 전송
3334
public void sendRoomCreatedEvent(ChatRoom room) {
34-
List<SseEmitter> deadEmitters = new CopyOnWriteArrayList<>();
35+
List<SseEmitter> deadEmitters = new ArrayList<>();
3536

3637
for (SseEmitter emitter : emitters) {
3738
try {
@@ -48,7 +49,7 @@ public void sendRoomCreatedEvent(ChatRoom room) {
4849

4950
// 방 삭제 시 이벤트 전송
5051
public void sendRoomDeletedEvent(ChatRoom room) {
51-
List<SseEmitter> deadEmitters = new CopyOnWriteArrayList<>();
52+
List<SseEmitter> deadEmitters = new ArrayList<>();
5253

5354
for (SseEmitter emitter : emitters) {
5455
try {
@@ -67,7 +68,7 @@ public void sendRoomDeletedEvent(ChatRoom room) {
6768
// 핑 관련 이벤트 전송
6869
@Scheduled(fixedDelay = 10_000L * 7) // 7분
6970
public void sendPingToClients() {
70-
List<SseEmitter> deadEmitters = new CopyOnWriteArrayList<>();
71+
List<SseEmitter> deadEmitters = new ArrayList<>();
7172
for (SseEmitter emitter : emitters) {
7273
try {
7374
emitter.send(SseEmitter.event()
@@ -82,7 +83,7 @@ public void sendPingToClients() {
8283

8384
// 방 인원수 변경 시 이벤트 전송
8485
public void sendRoomUserCntEvent(ChatRoom room) {
85-
List<SseEmitter> deadEmitters = new CopyOnWriteArrayList<>();
86+
List<SseEmitter> deadEmitters = new ArrayList<>();
8687

8788
for (SseEmitter emitter : emitters) {
8889
try {
@@ -97,7 +98,7 @@ public void sendRoomUserCntEvent(ChatRoom room) {
9798
}
9899

99100
public void sendChangeRoomSettingEvent(ChatRoom room) {
100-
List<SseEmitter> deadEmitters = new CopyOnWriteArrayList<>();
101+
List<SseEmitter> deadEmitters = new ArrayList<>();
101102

102103
for (SseEmitter emitter : emitters) {
103104
try {

0 commit comments

Comments
 (0)