Merge pull request #113 from prgrms-web-devcourse-final-project/Fix/109

Fix: WebSocket 세션 관리 Redis 통합 + 직렬화 문제 해결 (#109)

Author: jueunk617

build.gradle.kts

@@ -64,6 +64,8 @@ dependencies {
     // Test
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
+    testImplementation("org.testcontainers:testcontainers:1.19.3")
+    testImplementation("org.testcontainers:junit-jupiter:1.19.3")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     // Redis

src/main/java/com/back/global/config/EmbeddedRedisConfig.java

@@ -1,5 +1,8 @@
 package com.back.global.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -13,24 +16,25 @@
 @Configuration
 public class RedisConfig {
 
-    /**
-     * RedisTemplate 설정
-     * - Key: String
-     * - Value: JSON (Jackson)
-     */
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
 
-        // Key: String
+        // ObjectMapper 설정
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        // Jackson2JsonRedisSerializer 사용
+        Jackson2JsonRedisSerializer<Object> serializer =
+                new Jackson2JsonRedisSerializer<>(objectMapper, Object.class);
+
         template.setKeySerializer(new StringRedisSerializer());
         template.setHashKeySerializer(new StringRedisSerializer());
-
-        // Value: JSON
-        template.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-        template.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+        template.setValueSerializer(serializer);
+        template.setHashValueSerializer(serializer);
 
         return template;
     }
-}
+}

src/main/java/com/back/global/config/RedisConfig.java

@@ -36,7 +36,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .authorizeHttpRequests(
                         auth -> auth
                                 .requestMatchers("/api/auth/**", "/oauth2/**", "/login/oauth2/**").permitAll()
-                                .requestMatchers("/api/ws/**").permitAll()
+                                .requestMatchers("api/ws/**", "/ws/**").permitAll()
                                 .requestMatchers("/api/rooms/*/messages/**").permitAll()  //스터디 룸 내에 잡혀있어 있는 채팅 관련 전체 허용
                                 //.requestMatchers("/api/rooms/RoomChatApiControllerTest").permitAll() // 테스트용 임시 허용
                                 .requestMatchers("/","/swagger-ui/**", "/v3/api-docs/**").permitAll() // Swagger 허용

src/main/java/com/back/global/security/SecurityConfig.java

@@ -3,12 +3,16 @@
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
 import com.back.global.websocket.dto.WebSocketSessionInfo;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
+import java.util.LinkedHashMap;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -24,7 +28,7 @@ public class WebSocketSessionManager {
     private static final String SESSION_USER_KEY = "ws:session:{}";
     private static final String ROOM_USERS_KEY = "ws:room:{}:users";
 
-    // TTL 설정 (10분) - Heartbeat와 함께 사용하여 정확한 상태 관리
+    // TTL 설정 (10분)
     private static final int SESSION_TTL_MINUTES = 10;
 
     // 사용자 세션 추가 (연결 시 호출)
@@ -70,7 +74,22 @@ public boolean isUserConnected(Long userId) {
     public WebSocketSessionInfo getSessionInfo(Long userId) {
         try {
             String userKey = USER_SESSION_KEY.replace("{}", userId.toString());
-            return (WebSocketSessionInfo) redisTemplate.opsForValue().get(userKey);
+            Object value = redisTemplate.opsForValue().get(userKey);
+
+            if (value == null) {
+                return null;
+            }
+
+            // LinkedHashMap으로 역직렬화된 경우 또는 타입이 맞지 않는 경우 변환
+            if (value instanceof LinkedHashMap || !(value instanceof WebSocketSessionInfo)) {
+                ObjectMapper mapper = new ObjectMapper();
+                mapper.registerModule(new JavaTimeModule());
+                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                return mapper.convertValue(value, WebSocketSessionInfo.class);
+            }
+
+            return (WebSocketSessionInfo) value;
+
         } catch (Exception e) {
             log.error("세션 정보 조회 실패 - 사용자: {}", userId, e);
             throw new CustomException(ErrorCode.WS_REDIS_ERROR);
@@ -106,7 +125,6 @@ public void updateLastActivity(Long userId) {
                 log.warn("세션 정보가 없어 활동 시간 업데이트 실패 - 사용자: {}", userId);
             }
         } catch (CustomException e) {
-            // 이미 처리된 CustomException은 다시 던짐
             throw e;
         } catch (Exception e) {
             log.error("사용자 활동 시간 업데이트 실패 - 사용자: {}", userId, e);
@@ -192,7 +210,7 @@ public Set<Long> getOnlineUsersInRoom(Long roomId) {
 
             if (userIds != null) {
                 return userIds.stream()
-                        .map(obj -> (Long) obj)
+                        .map(this::convertToLong)  // 안전한 변환
                         .collect(Collectors.toSet());
             }
             return Set.of();
@@ -220,16 +238,17 @@ public Long getUserCurrentRoomId(Long userId) {
             return sessionInfo != null ? sessionInfo.currentRoomId() : null;
         } catch (CustomException e) {
             log.error("사용자 현재 방 조회 실패 - 사용자: {}", userId, e);
-            return null; // 조회용이므로 예외 대신 null 반환
+            return null;
         }
     }
 
     // 내부적으로 세션 제거 처리
     private void removeSessionInternal(String sessionId) {
         String sessionKey = SESSION_USER_KEY.replace("{}", sessionId);
-        Long userId = (Long) redisTemplate.opsForValue().get(sessionKey);
+        Object userIdObj = redisTemplate.opsForValue().get(sessionKey);
 
-        if (userId != null) {
+        if (userIdObj != null) {
+            Long userId = convertToLong(userIdObj);  // 안전한 변환
             WebSocketSessionInfo sessionInfo = getSessionInfo(userId);
 
             // 방에서 퇴장 처리
@@ -243,4 +262,15 @@ private void removeSessionInternal(String sessionId) {
             redisTemplate.delete(sessionKey);
         }
     }
+
+    // Object를 Long으로 안전하게 변환하는 헬퍼 메서드
+    private Long convertToLong(Object obj) {
+        if (obj instanceof Long) {
+            return (Long) obj;
+        } else if (obj instanceof Number) {
+            return ((Number) obj).longValue();
+        } else {
+            throw new IllegalArgumentException("Cannot convert " + obj.getClass() + " to Long");
+        }
+    }
 }

src/main/java/com/back/global/websocket/service/WebSocketSessionManager.java

@@ -5,13 +5,29 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
+@Testcontainers
 @ActiveProfiles("test")
 class RedisConnectionTest {
 
+    @Container
+    static GenericContainer<?> redis = new GenericContainer<>("redis:latest")
+            .withExposedPorts(6379);
+
+    @DynamicPropertySource
+    static void registerRedisProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.data.redis.host", redis::getHost);
+        registry.add("spring.data.redis.port", redis::getFirstMappedPort);
+    }
+
     @Autowired
     private StringRedisTemplate redisTemplate;
 
@@ -28,4 +44,4 @@ void redisShouldStoreAndGetValue() {
         // then
         assertThat(result).isEqualTo(value);
     }
-}
+}