fix: Stomp 컨트롤러 수정

Author: rjswjddn

src/main/java/com/oronaminc/join/answer/dto/AnswerRequest.java

@@ -2,14 +2,17 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 @Schema(description = "답변 생성/수정 요청 DTO")
 public record AnswerRequest(
     @NotBlank(message = "답변 내용을 입력해주시기 바랍니다.")
     @Size(max = 300, message = "답변 내용은 최대 300자까지 입력할 수 있습니다.")
     @Schema(description = "답변 내용", example = "답변입니다.")
-    String content
+    String content,
+    @NotNull
+    Long memberId
 ) {
 
 }

src/main/java/com/oronaminc/join/emoji/dto/EmojiRequest.java

@@ -11,7 +11,9 @@ public record EmojiRequest(
     TargetType targetType,
     @NotNull
     @Schema(description = "공감 대상 ID", example = "1")
-    Long targetId
+    Long targetId,
+    @NotNull
+    Long memberId
 ) {
 
 }

src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java

@@ -1,7 +1,12 @@
 package com.oronaminc.join.websocket.api;
 
-import static com.oronaminc.join.global.exception.ErrorCode.TOO_MANY_REQUESTS_ANSWER;
-import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_MEMBER;
+import static com.oronaminc.join.global.exception.ErrorCode.*;
+
+import org.springframework.messaging.handler.annotation.DestinationVariable;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.stereotype.Controller;
 
 import com.oronaminc.join.answer.domain.Answer;
 import com.oronaminc.join.answer.dto.AnswerCreateResponse;
@@ -11,19 +16,14 @@
 import com.oronaminc.join.answer.mapper.AnswerMapper;
 import com.oronaminc.join.answer.service.AnswerService;
 import com.oronaminc.join.global.exception.ErrorException;
-import com.oronaminc.join.websocket.common.EventType;
 import com.oronaminc.join.global.ratelimit.RateLimitService;
 import com.oronaminc.join.global.ratelimit.RateLimitType;
+import com.oronaminc.join.websocket.common.EventType;
+
 import io.github.bucket4j.Bucket;
 import jakarta.validation.Valid;
-import java.security.Principal;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.handler.annotation.DestinationVariable;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.stereotype.Controller;
 
 @Slf4j
 @Controller
@@ -38,10 +38,9 @@ public class AnswerWebsocketController {
     public AnswerCreateResponse create(
         @DestinationVariable Long roomId,
         @DestinationVariable Long questionId,
-        @Payload @Valid AnswerRequest request,
-        Principal principal
+        @Payload @Valid AnswerRequest request
     ) {
-        Long memberId = getMemberId(principal);
+        Long memberId = request.memberId();
 
         Bucket bucket = rateLimitService.getBucket(RateLimitType.CREATE_ANSWER, roomId, memberId, questionId);
 
@@ -60,11 +59,10 @@ public AnswerCreateResponse create(
     @SendTo("/topic/rooms/{roomId}/answers")
     public AnswerUpdateResponse update(
         @DestinationVariable Long answerId,
-        @Payload @Valid AnswerRequest request,
-        Principal principal
+        @Payload @Valid AnswerRequest request
     ) {
 
-        Long memberId = getMemberId(principal);
+        Long memberId = request.memberId();
 
         Answer answer = answerService.update(answerId, memberId, request);
 
@@ -77,9 +75,9 @@ public AnswerUpdateResponse update(
     @SendTo("/topic/rooms/{roomId}/answers")
     public AnswerDeleteResponse delete(
         @DestinationVariable Long answerId,
-        Principal principal
+        @Payload @Valid StompMemberRequest request
     ) {
-        Long memberId = getMemberId(principal);
+        Long memberId = request.memberId();
 
         answerService.delete(answerId, memberId);
 
@@ -88,11 +86,4 @@ public AnswerDeleteResponse delete(
         return new AnswerDeleteResponse(answerId, EventType.DELETE);
     }
 
-    private Long getMemberId(Principal principal) {
-        if (principal == null) {
-            throw new ErrorException(UNAUTHORIZED_MEMBER);
-        }
-        return Long.valueOf(principal.getName());
-    }
-
 }

src/main/java/com/oronaminc/join/websocket/api/EmojiWebsocketController.java

@@ -1,21 +1,22 @@
 package com.oronaminc.join.websocket.api;
 
+import org.springframework.messaging.handler.annotation.DestinationVariable;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.stereotype.Controller;
+
 import com.oronaminc.join.emoji.dto.EmojiRequest;
 import com.oronaminc.join.emoji.dto.EmojiResponse;
 import com.oronaminc.join.emoji.service.EmojiFacade;
 import com.oronaminc.join.global.exception.ErrorCode;
 import com.oronaminc.join.global.exception.ErrorException;
 import com.oronaminc.join.global.ratelimit.RateLimitService;
 import com.oronaminc.join.global.ratelimit.RateLimitType;
+
 import io.github.bucket4j.Bucket;
 import jakarta.validation.Valid;
-import java.security.Principal;
 import lombok.RequiredArgsConstructor;
-import org.springframework.messaging.handler.annotation.DestinationVariable;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.stereotype.Controller;
 
 @Controller
 @RequiredArgsConstructor
@@ -28,10 +29,9 @@ public class EmojiWebsocketController {
     @SendTo("/topic/rooms/{roomId}/emojis")
     public EmojiResponse createEmoji(
         @DestinationVariable Long roomId,
-        @Payload @Valid EmojiRequest emojiRequest,
-        Principal principal
+        @Payload @Valid EmojiRequest emojiRequest
     ) {
-        Long memberId = Long.valueOf(principal.getName());
+        Long memberId = emojiRequest.memberId();
 
         Bucket bucket = rateLimitService.getBucket(RateLimitType.EMOJI, memberId,
             emojiRequest.targetType(), emojiRequest.targetId());
@@ -47,10 +47,9 @@ public EmojiResponse createEmoji(
     @SendTo("/topic/rooms/{roomId}/emojis")
     public EmojiResponse deleteEmoji(
         @DestinationVariable Long roomId,
-        @Payload @Valid EmojiRequest emojiRequest,
-        Principal principal
+        @Payload @Valid EmojiRequest emojiRequest
     ) {
-        Long memberId = Long.valueOf(principal.getName());
+        Long memberId = emojiRequest.memberId();
 
         Bucket bucket = rateLimitService.getBucket(RateLimitType.EMOJI, memberId,
             emojiRequest.targetType(), emojiRequest.targetId());

src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java

@@ -1,7 +1,5 @@
 package com.oronaminc.join.websocket.api;
 
-import java.security.Principal;
-
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -37,11 +35,9 @@ public class QuestionWebsocketController {
     @SendTo("/topic/rooms/{roomId}/questions")
     public QuestionCreateResponse createQuestion(
         @DestinationVariable Long roomId,
-        @Payload @Valid QuestionRequest request,
-        Principal principal
+        @Payload @Valid QuestionRequest request
     ) {
         log.debug("수신한 메시지 = {}", request.content());
-        log.debug("principal = {}", principal);
 
         Long memberId = request.memberId();
 
@@ -64,11 +60,10 @@ public QuestionCreateResponse createQuestion(
     public QuestionUpdateResponse updateQuestion(
         @DestinationVariable Long roomId,
         @DestinationVariable Long questionId,
-        @Payload @Valid QuestionRequest request,
-        Principal principal
+        @Payload @Valid QuestionRequest request
     ) {
 
-        Long memberId = Long.valueOf(principal.getName());
+        Long memberId = request.memberId();
 
         Question updated = questionService.update(memberId, roomId, questionId, request);
 
@@ -80,9 +75,9 @@ public QuestionUpdateResponse updateQuestion(
     public QuestionDeleteResponse deleteQuestion(
         @DestinationVariable Long roomId,
         @DestinationVariable Long questionId,
-        Principal principal
+        @Payload @Valid StompMemberRequest request
     ) {
-        Long memberId = Long.valueOf(principal.getName());
+        Long memberId = request.memberId();
 
         Long deletedId = questionService.delete(memberId, roomId, questionId);
 

src/main/java/com/oronaminc/join/websocket/api/RoomWebsocketController.java

@@ -1,7 +1,5 @@
 package com.oronaminc.join.websocket.api;
 
-import java.security.Principal;
-
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -25,10 +23,10 @@ public class RoomWebsocketController {
     @SendTo("/topic/rooms/{roomId}/join")
     public RoomJoinResponse joinRoom(
             @DestinationVariable Long roomId,
-            Principal principal,
+            StompMemberRequest request,
             Message<?> message
     ) {
-        Long memberId = Long.valueOf(principal.getName());
+        Long memberId = request.memberId();
         StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
         String sessionId = accessor.getSessionId();
 

src/main/java/com/oronaminc/join/websocket/api/StompMemberRequest.java

@@ -0,0 +1,9 @@
+package com.oronaminc.join.websocket.api;
+
+import jakarta.validation.constraints.NotNull;
+
+public record StompMemberRequest(
+        @NotNull
+        Long memberId
+) {
+}