Skip to content

Commit abeaad2

Browse files
LminWoo99LminWoo99
committed
refactor : 안쓰는 클래스 제거, 주석 제거, 오타 제거 및 리팩터링
1 parent 355eb79 commit abeaad2

File tree

5 files changed

+59
-254
lines changed

5 files changed

+59
-254
lines changed

‎src/main/java/com/example/VideoChatting/config/WebRtcConfig.java

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
package com.example.VideoChatting.config;
2-
3-
import com.example.VideoChatting.service.rtc.KurentoHandler;
4-
import lombok.RequiredArgsConstructor;
5-
import org.kurento.client.KurentoClient;
6-
import org.springframework.context.annotation.Bean;
7-
import org.springframework.context.annotation.Configuration;
8-
import org.springframework.web.socket.config.annotation.EnableWebSocket;
9-
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
10-
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
11-
import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
12-
13-
14-
@Configuration
15-
@EnableWebSocket // 웹 소켓에 대해 자동 설정
16-
@RequiredArgsConstructor
17-
public class WebRtcConfig implements WebSocketConfigurer {
18-
/* TODO WebRTC 관련 */
19-
20-
21-
@Bean
22-
public KurentoHandler kurentoHandler(){
23-
return new KurentoHandler();
24-
}
25-
@Bean
26-
public KurentoClient kurentoClient() {
27-
String kurentoUrl = "ws://52.78.190.79:8888/kurento";
28-
return KurentoClient.create(kurentoUrl);
29-
}
30-
31-
32-
// signal 로 요청이 왔을 때 아래의 WebSockerHandler 가 동작하도록 registry 에 설정
33-
// 요청은 클라이언트 접속, close, 메시지 발송 등에 대해 특정 메서드를 호출한다
34-
@Override
35-
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
36-
registry.addHandler(kurentoHandler(), "/signal")
37-
.setAllowedOrigins("*");
38-
}
39-
40-
// 웹 소켓에서 rtc 통신을 위한 최대 텍스트 버퍼와 바이너리 버퍼 사이즈를 설정한다
41-
@Bean
42-
public ServletServerContainerFactoryBean createWebSocketContainer() {
43-
ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
44-
container.setMaxTextMessageBufferSize(32768);
45-
container.setMaxBinaryMessageBufferSize(32768);
46-
return container;
47-
}
48-
}
1+
//package com.example.VideoChatting.config;
2+
//
3+
//import com.example.VideoChatting.service.rtc.KurentoHandler;
4+
//import lombok.RequiredArgsConstructor;
5+
//import org.kurento.client.KurentoClient;
6+
//import org.springframework.context.annotation.Bean;
7+
//import org.springframework.context.annotation.Configuration;
8+
//import org.springframework.web.socket.config.annotation.EnableWebSocket;
9+
//import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
10+
//import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
11+
//import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
12+
//
13+
//
14+
//@Configuration
15+
//@EnableWebSocket // 웹 소켓에 대해 자동 설정
16+
//@RequiredArgsConstructor
17+
//public class WebRtcConfig implements WebSocketConfigurer {
18+
// /* TODO WebRTC 관련 */
19+
//
20+
//
21+
// @Bean
22+
// public KurentoHandler kurentoHandler(){
23+
// return new KurentoHandler();
24+
// }
25+
// @Bean
26+
// public KurentoClient kurentoClient() {
27+
// String kurentoUrl = "ws://52.78.190.79:8888/kurento";
28+
// return KurentoClient.create(kurentoUrl);
29+
// }
30+
//
31+
//
32+
// // signal 로 요청이 왔을 때 아래의 WebSockerHandler 가 동작하도록 registry 에 설정
33+
// // 요청은 클라이언트 접속, close, 메시지 발송 등에 대해 특정 메서드를 호출한다
34+
// @Override
35+
// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
36+
// registry.addHandler(kurentoHandler(), "/signal")
37+
// .setAllowedOrigins("*");
38+
// }
39+
//
40+
// // 웹 소켓에서 rtc 통신을 위한 최대 텍스트 버퍼와 바이너리 버퍼 사이즈를 설정한다
41+
// @Bean
42+
// public ServletServerContainerFactoryBean createWebSocketContainer() {
43+
// ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
44+
// container.setMaxTextMessageBufferSize(32768);
45+
// container.setMaxBinaryMessageBufferSize(32768);
46+
// return container;
47+
// }
48+
//}

‎src/main/java/com/example/VideoChatting/repository/ChatRoomRepository.java

+2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
import org.springframework.stereotype.Repository;
1313

1414
import java.util.List;
15+
import java.util.Optional;
1516

1617
@Repository
1718
public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
19+
1820
ChatRoom findByRoomId(String roomId);
1921

2022
boolean existsByRoomName(String roomName);

‎src/main/java/com/example/VideoChatting/service/chat/ChatRoomService.java

+8-13
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,18 @@ private void init() {
4949
}
5050
//채팅방
5151
//방 아이디로 검색
52-
// @Cacheable(value = "ChatRoom", cacheManager = "testCacheManager")
5352
public List<ChatRoom> findAllRooms() {
5453
List<ChatRoom> chatRooms = chatRoomRepository.findAll();
5554
Collections.reverse(chatRooms);
5655

57-
// return opsHashChatRoom.values(CHAT_ROOMS);
5856
return chatRooms;
5957
}
6058

6159
public ChatRoom findRoomById(String roomId) {
6260
return chatRoomRepository.findByRoomId(roomId);
6361
}
6462
/**
65-
* 채팅방 생성 : 서버간 채팅방 공유를 위해 redis hash에 저장한다.
63+
* 채팅방 생성
6664
*/
6765
public ChatRoom createChatRoom(String roomName,String roomPwd, boolean secretCheck, int maxUserCnt) {
6866
if (chatRoomRepository.existsByRoomName(roomName)) {
@@ -71,7 +69,9 @@ public ChatRoom createChatRoom(String roomName,String roomPwd, boolean secretChe
7169
ChatRoom chatRoom = new ChatRoom().create(roomName, roomPwd, secretCheck, maxUserCnt);
7270
chatRoom.setChatType(ChatType.MSG);
7371
opsHashChatRoom.put(CHAT_ROOMS, chatRoom.getRoomId(), chatRoom);
72+
7473
log.info(chatRoom.getRoomName());
74+
7575
chatRoomRepository.save(chatRoom);
7676
return chatRoom;
7777
}
@@ -119,7 +119,7 @@ public String addUser(String roomId, String username) {
119119
ChatRoom room = opsHashChatRoom.get(CHAT_ROOMS, roomId);
120120
String userUUID = UUID.randomUUID().toString();
121121
room.getUserList().put(userUUID, username);
122-
System.out.println("userUUID = " + userUUID);
122+
123123
return userUUID;
124124
}
125125
//채팅방 유저 이름 중복 확인
@@ -145,25 +145,21 @@ public String getUserName(String roomId, String userUUID){
145145
return room.getUserList().get(userUUID);
146146
}
147147

148-
149148
// 채팅방 전체 userlist 조회
150149
public ArrayList<String> getUserList(String roomId){
151150
ArrayList<String> list = new ArrayList<>();
152151

153152
ChatRoom room = opsHashChatRoom.get(CHAT_ROOMS, roomId);
154153

155154
// hashmap 을 for 문을 돌린 후
156-
// value 값만 뽑아내서 list 에 저장 후 reutrn
155+
// value 값만 뽑아내서 list 에 저장 후 return
157156
room.getUserList().forEach((key, value) -> list.add(value));
158157
return list;
159158
}
160159
// 채팅방 최대 인원 체크
161160
public boolean checkRoomUserCnt(String roomId) {
162161
ChatRoom room = chatRoomRepository.findByRoomId(roomId);
163162

164-
// log.info(String.valueOf(room.getUserCount()));
165-
// log.info("참여인원 확인 [{}, {}]", room.getUserCount(), room.getMaxUserCnt());
166-
167163
if (room.getUserCount() + 1 > room.getMaxUserCnt()) {
168164
return false;
169165
}
@@ -173,19 +169,18 @@ public boolean checkRoomUserCnt(String roomId) {
173169
public boolean confirmPwd(String roomId, String roomPwd) {
174170
return roomPwd.equals(opsHashChatRoom.get(CHAT_ROOMS, roomId).getRoomPwd());
175171
}
176-
@CacheEvict(value = "ChatRoom", key = "#roomId", cacheManager = "testCacheManager")
177172
public void deleteChatRoom(String roomId) {
178173
try {
179174
ChatRoom byRoomId = chatRoomRepository.findByRoomId(roomId);
175+
180176
opsHashChatRoom.delete(roomId, byRoomId);
181177
chatRoomRepository.delete(byRoomId);
178+
182179
fileService.deleteFileDir(roomId);
183180
} catch (Exception e) {
184181
log.error(e.getMessage());
185182
}
186183
}
187-
188-
189184
public void updateRoomName(String roomId, String roomName) {
190185
chatRoomRepository.updateRoomName(roomId, roomName);
191186
opsHashChatRoom.delete(CHAT_ROOMS, roomId);
@@ -204,4 +199,4 @@ public void updateRoomSecretCheck(String roomId, String secretCheck) {
204199
opsHashChatRoom.delete(CHAT_ROOMS, roomId);
205200
opsHashChatRoom.put(CHAT_ROOMS, roomId, chatRoomRepository.findByRoomId(roomId));
206201
}
207-
}
202+
}

‎src/main/java/com/example/VideoChatting/service/chat/ChatService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public void saveMessage(ChatDto chatDto) {
4545
redisTemplate.opsForList().rightPush(chatDto.getRoomId(), chatDto);
4646

4747
// 3. expire 을 이용해서, Key 를 만료시킬 수 있음
48-
redisTemplate.expire(chatDto.getRoomId(), 1, TimeUnit.MINUTES);
49-
// notificationService.notifyMessage(room.getRoomId(),chatDto.getSender());
48+
redisTemplate.expire(chatDto.getRoomId(), 20, TimeUnit.MINUTES);
5049
}
5150
// 6. 대화 조회 - Redis & DB
5251
public List<ChatDto> loadMessage(String roomId) {

0 commit comments

Comments
 (0)