🔧 chore : dev 기준으로 rebase 후 변경사항 반영

Author: silver-eunjoo

backend/src/main/java/io/f1/backend/domain/game/app/ChatService.java

@@ -10,8 +10,12 @@
 import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
+import io.f1.backend.global.lock.DistributedLock;
+import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.RequiredArgsConstructor;
 
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +24,6 @@
 public class ChatService {
 
     private final RoomService roomService;
-    private final TimerService timerService;
     private final MessageSender messageSender;
     private final ApplicationEventPublisher eventPublisher;
 
@@ -41,10 +44,16 @@ public void chat(Long roomId, UserPrincipal userPrincipal, ChatMessage chatMessa
 
         String answer = currentQuestion.getAnswer();
 
-        if (answer.equals(chatMessage.message())) {
+        if (!answer.equals(chatMessage.message())) {
+            return;
+        }
+
+        // false -> true
+        if(room.compareAndSetAnsweredFlag(false, true)) {
             eventPublisher.publishEvent(
                     new GameCorrectAnswerEvent(
                             room, userPrincipal.getUserId(), chatMessage, answer));
+
         }
     }
 }

backend/src/main/java/io/f1/backend/domain/game/app/GameService.java

@@ -123,6 +123,7 @@ public void onCorrectAnswer(GameCorrectAnswerEvent event) {
                 ofPlayerEvent(chatMessage.nickname(), RoomEventType.CORRECT_ANSWER));
 
         timerService.cancelTimer(room);
+        room.compareAndSetAnsweredFlag(true, false);
 
         if (!timerService.validateCurrentRound(room)) {
             gameEnd(room);
@@ -142,6 +143,12 @@ public void onCorrectAnswer(GameCorrectAnswerEvent event) {
     @EventListener
     public void onTimeout(GameTimeoutEvent event) {
         Room room = event.room();
+
+        // false -> true 여야 하는데 실패했을 때 => 이미 정답 처리가 된 경우 (onCorrectAnswer 로직 실행 중)
+        if(!room.compareAndSetAnsweredFlag(false, true)) {
+            return;
+        }
+
         log.debug(room.getId() + "번 방 타임아웃! 현재 라운드 : " + room.getCurrentRound());
 
         String destination = getDestination(room.getId());
@@ -167,6 +174,8 @@ public void onTimeout(GameTimeoutEvent event) {
                 destination,
                 MessageType.QUESTION_START,
                 toQuestionStartResponse(room, CONTINUE_DELAY));
+
+        room.compareAndSetAnsweredFlag(true, false);
     }
 
     public void gameEnd(Room room) {

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

@@ -5,6 +5,7 @@
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
@@ -42,6 +43,8 @@ public class Room {
 
     private ScheduledFuture<?> timer;
 
+    private final AtomicBoolean answered = new AtomicBoolean(false);
+
     public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player host) {
         this.id = id;
         this.roomSetting = roomSetting;
@@ -194,4 +197,12 @@ public boolean isPlayerInState(Long userId, ConnectionState state) {
     public boolean isPasswordIncorrect(String password) {
         return roomSetting.locked() && !roomSetting.password().equals(password);
     }
+
+    public boolean compareAndSetAnsweredFlag(boolean expected, boolean newValue) {
+        return answered.compareAndSet(expected, newValue);
+    }
+
+    public AtomicBoolean getAnsweredFlag() {
+        return this.answered;
+    }
 }

backend/src/test/java/io/f1/backend/domain/game/app/ChatServiceTests.java

@@ -0,0 +1,118 @@
+package io.f1.backend.domain.game.app;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import io.f1.backend.domain.game.dto.ChatMessage;
+import io.f1.backend.domain.game.event.GameCorrectAnswerEvent;
+import io.f1.backend.domain.game.model.GameSetting;
+import io.f1.backend.domain.game.model.Player;
+import io.f1.backend.domain.game.model.Room;
+import io.f1.backend.domain.game.model.RoomSetting;
+import io.f1.backend.domain.game.websocket.MessageSender;
+import io.f1.backend.domain.question.entity.Question;
+import io.f1.backend.domain.user.entity.User;
+import java.lang.reflect.Field;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+@Slf4j
+@ExtendWith(MockitoExtension.class)
+class ChatServiceTests {
+
+    private ChatService chatService;
+
+    @Mock private RoomService roomService;
+    @Mock private ApplicationEventPublisher eventPublisher;
+    @Mock private MessageSender messageSender;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
+
+        chatService = new ChatService(roomService, messageSender, eventPublisher);
+
+        SecurityContextHolder.clearContext();
+    }
+
+
+    @Test
+    @DisplayName("정답이 아닐 때 이벤트가 발행되지 않는다.")
+    void noEventWhenIncorrect() throws Exception {
+
+        // given
+        Long roomId = 1L;
+        String sessionId = "session123";
+        ChatMessage wrongMessage = new ChatMessage("nick", "오답", Instant.now());
+
+        Room room = mock(Room.class);
+        Question question = mock(Question.class);
+
+        given(roomService.findRoom(roomId)).willReturn(room);
+        given(room.isPlaying()).willReturn(true);
+        given(room.getCurrentQuestion()).willReturn(question);
+        given(question.getAnswer()).willReturn("정답");
+
+        // when
+        chatService.chat(roomId, sessionId, wrongMessage);
+
+        // then
+        verify(eventPublisher, never()).publishEvent(any(GameCorrectAnswerEvent.class));
+    }
+
+    
+    }
+
+    private Room createRoom(
+        Long roomId,
+        Long playerId,
+        Long quizId,
+        String password,
+        int maxUserCount,
+        boolean locked) {
+        RoomSetting roomSetting = new RoomSetting("방제목", maxUserCount, locked, password);
+        GameSetting gameSetting = new GameSetting(quizId, 10, 60);
+        Player host = new Player(playerId, "nickname");
+
+        return new Room(roomId, roomSetting, gameSetting, host);
+    }
+
+    private User createUser(int i) {
+        Long userId = i + 1L;
+        String provider = "provider +" + i;
+        String providerId = "providerId" + i;
+        LocalDateTime lastLogin = LocalDateTime.now();
+
+        User user =
+            User.builder()
+                .provider(provider)
+                .providerId(providerId)
+                .lastLogin(lastLogin)
+                .build();
+
+        try {
+            Field idField = User.class.getDeclaredField("id");
+            idField.setAccessible(true);
+            idField.set(user, userId);
+        } catch (Exception e) {
+            throw new RuntimeException("ID 설정 실패", e);
+        }
+
+        return user;
+    }
+  
+}