[feat] 대기방 생성/삭제/업데이트/입장 로직 추가

build.gradle

@@ -37,6 +37,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-redis' //redis
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.integration:spring-integration-core'
+    implementation 'org.springframework.integration:spring-integration-redis'
+    implementation 'org.springframework.integration:spring-integration-redis'
+
 
 }
 

src/main/java/spring/socket_server/common/auth/Role.java

@@ -0,0 +1,12 @@
+package spring.socket_server.common.auth;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum Role {
+    USER("ROLE_USER"), ADMIN("ROLE_ADMIN"), GUEST("ROLE_GUEST");
+
+    private final String value;
+}

src/main/java/spring/socket_server/common/auth/StompPrincipal.java

@@ -0,0 +1,22 @@
+package spring.socket_server.common.auth;
+
+import java.security.Principal;
+
+public class StompPrincipal implements Principal {
+    private final String name;
+    private final Role role;
+
+    public StompPrincipal(String name, Role roles) {
+        this.name = name;
+        this.role = roles;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public Role getRoles() {
+        return role;
+    }
+}

src/main/java/spring/socket_server/common/auth/StompPrincipalHandshakeHandler.java

@@ -0,0 +1,27 @@
+package spring.socket_server.common.auth;
+
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
+
+import java.security.Principal;
+import java.util.Map;
+
+//TODO: 이후 WebSocket 연결 시 Authorization 헤더의 JWT를 파싱해 userId와 Role을 설정하도록 수정 예정
+//      현재는 구동만을 위한 간략화 코드.
+public class StompPrincipalHandshakeHandler extends DefaultHandshakeHandler {
+
+    @Override
+    protected Principal determineUser(ServerHttpRequest request,
+                                      WebSocketHandler wsHandler,
+                                      Map<String, Object> attributes) {
+
+        // 1) user-id 헤더 또는 쿼리 파라미터로부터 사용자 이름을 꺼냄
+        String userId = request.getHeaders().getFirst("user-id");
+
+        // 2) 역할 정보
+        Role role = Role.USER;
+        return new StompPrincipal(userId, role);
+    }
+
+}

src/main/java/spring/socket_server/common/auth/StompUserInterceptor.java

@@ -0,0 +1,39 @@
+package spring.socket_server.common.auth;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+
+import java.security.Principal;
+import java.util.UUID;
+
+@Slf4j
+// 2) STOMP CONNECT 프레임을 가로채는 Interceptor
+public class StompUserInterceptor implements ChannelInterceptor  {
+
+    @Override
+    public Message<?> preSend (Message<?> message, MessageChannel channel) {
+        StompHeaderAccessor accessor =
+                MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+
+        if (accessor != null && StompCommand.CONNECT.equals(accessor.getCommand())) {
+
+            String rawUserId = accessor.getFirstNativeHeader("user-id");
+
+            String userId = (rawUserId == null || rawUserId.isBlank())
+                    ? "guest-" + UUID.randomUUID()
+                    : rawUserId;
+
+            Principal principal = () -> userId;
+            accessor.setUser(principal);
+        }
+        return message;
+    }
+
+
+}
+

src/main/java/spring/socket_server/common/config/RedisConfig.java

@@ -1,5 +1,6 @@
 package spring.socket_server.common.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -9,17 +10,9 @@
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.PatternTopic;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
-import spring.socket_server.domain.chat.handler.ChattingPubSubHandler;
-import spring.socket_server.domain.game.handler.GamePubSubHandler;
-
-import static spring.socket_server.common.constants.WebSocketConstants.CHAT_PREFIX;
-import static spring.socket_server.common.constants.WebSocketConstants.GAME_PREFIX;
+import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 
 @EnableCaching
 @Configuration
@@ -41,34 +34,6 @@ public RedisConnectionFactory redisConnectionFactory() {
         return lettuceConnectionFactory;
     }
 
-    //Redis Pub/Sub에서 메시지를 리스닝하는 컨테이너 -> (구독자가 어떤 메시지를 받을지 관리)
-    @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(
-            RedisConnectionFactory connectionFactory,
-            MessageListenerAdapter chatListenerAdapter,
-            MessageListenerAdapter gameListenerAdapter) {
-
-        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-        container.setConnectionFactory(connectionFactory);
-
-        //컨테이너는 각 채널의 리스닝어뎁터를 받음 -> 해당 컨테이너가 모든 채널 관리가 가능함!
-        container.addMessageListener(chatListenerAdapter, new PatternTopic(CHAT_PREFIX+"*")); //전체 채팅 채널
-        container.addMessageListener(gameListenerAdapter, new PatternTopic(GAME_PREFIX + "*"));//인게임 관련 채널
-
-        return container;
-    }
-
-    // Redis에서 메시지를 수신하면 RedisSubscriber 클래스의 onMessage 메서드를 호출하도록 설정
-    @Bean
-    public MessageListenerAdapter chatListenerAdapter(ChattingPubSubHandler chattingSubscriber) {
-        return new MessageListenerAdapter(chattingSubscriber, "onMessage");
-    }
-
-    @Bean
-    public MessageListenerAdapter gameListenerAdapter(GamePubSubHandler gameSubscriber) {
-        return new MessageListenerAdapter(gameSubscriber, "onMessage");
-    }
-
     @Bean
     @Primary
     public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
@@ -84,7 +49,7 @@ public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory redisC
         return redisTemplate;
     }
 
-    @Bean
+    @Bean("jsonRedisTemplate")
     public RedisTemplate <String, Object> redisTemplateObject(RedisConnectionFactory connectionFactory) {
         RedisTemplate <String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
@@ -102,5 +67,13 @@ public RedisTemplate <String, Object> redisTemplateObject(RedisConnectionFactory
         return template;
     }
 
+    @Bean
+    public MappingJackson2MessageConverter jackson2MessageConverter() {
+        MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
+        converter.setObjectMapper(new ObjectMapper());
+        converter.setSerializedPayloadClass(String.class); // JSON 문자열 처리
+        return converter;
+    }
+
 
 }