🔖 release: v0.0.13

Author: dlsrks1021

.github/workflows/test.yml

@@ -11,6 +11,8 @@ jobs:
       PROJECT_DIR: backend
       KAKAO_CLIENT: ${{ secrets.KAKAO_CLIENT }}
       KAKAO_SECRET: ${{ secrets.KAKAO_SECRET }}
+      REDIS_HOST: ${{ secrets.REDIS_HOST }}
+      REDIS_PORT: ${{ secrets.REDIS_PORT }}
     steps:
       - uses: actions/checkout@v4
 

backend/build.gradle

@@ -29,6 +29,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.redisson:redisson-spring-boot-starter:3.50.0'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

backend/src/main/java/io/f1/backend/domain/admin/app/AdminDetailService.java

@@ -27,7 +27,6 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
                                 () ->
                                         new UsernameNotFoundException(
                                                 AdminErrorCode.ADMIN_NOT_FOUND.getMessage()));
-        // 프론트엔드로 내려가지 않는 예외
         return new AdminPrincipal(admin);
     }
 }

backend/src/main/java/io/f1/backend/domain/admin/app/handler/AdminLoginFailureHandler.java

@@ -28,7 +28,7 @@ public void onAuthenticationFailure(
             HttpServletResponse response,
             AuthenticationException exception)
             throws IOException {
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); // 401
+        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         response.setContentType("application/json;charset=UTF-8");
 
         AdminLoginFailResponse errorResponse =

backend/src/main/java/io/f1/backend/domain/admin/app/handler/AdminLoginSuccessHandler.java

@@ -1,7 +1,7 @@
 package io.f1.backend.domain.admin.app.handler;
 
 import static io.f1.backend.domain.user.constants.SessionKeys.ADMIN;
-import static io.f1.backend.global.util.SecurityUtils.getCurrentAdminPrincipal;
+import static io.f1.backend.global.security.util.SecurityUtils.getCurrentAdminPrincipal;
 
 import io.f1.backend.domain.admin.dao.AdminRepository;
 import io.f1.backend.domain.admin.dto.AdminPrincipal;
@@ -44,6 +44,6 @@ public void onAuthenticationSuccess(
         adminRepository.save(admin);
         httpSession.setAttribute(ADMIN, principal.getAuthenticationAdmin());
 
-        response.setStatus(HttpServletResponse.SC_OK); // 200
+        response.setStatus(HttpServletResponse.SC_OK);
     }
 }

backend/src/main/java/io/f1/backend/domain/auth/api/AuthController.java

@@ -1,6 +1,6 @@
 package io.f1.backend.domain.auth.api;
 
-import static io.f1.backend.global.util.SecurityUtils.getAuthentication;
+import static io.f1.backend.global.security.util.SecurityUtils.getAuthentication;
 
 import io.f1.backend.domain.admin.dto.AdminPrincipal;
 import io.f1.backend.domain.auth.dto.CurrentUserAndAdminResponse;

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

@@ -8,6 +8,7 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.websocket.MessageSender;
 import io.f1.backend.domain.question.entity.Question;
+import io.f1.backend.domain.user.dto.UserPrincipal;
 
 import lombok.RequiredArgsConstructor;
 
@@ -24,7 +25,7 @@ public class ChatService {
     private final ApplicationEventPublisher eventPublisher;
 
     // todo 동시성적용
-    public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
+    public void chat(Long roomId, UserPrincipal userPrincipal, ChatMessage chatMessage) {
 
         Room room = roomService.findRoom(roomId);
 
@@ -42,7 +43,8 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
 
         if (answer.equals(chatMessage.message())) {
             eventPublisher.publishEvent(
-                    new GameCorrectAnswerEvent(room, sessionId, chatMessage, answer));
+                    new GameCorrectAnswerEvent(
+                            room, userPrincipal.getUserId(), chatMessage, answer));
         }
     }
 }

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

@@ -15,10 +15,12 @@
 import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.dto.RoomEventType;
 import io.f1.backend.domain.game.dto.request.GameSettingChanger;
-import io.f1.backend.domain.game.dto.response.PlayerListResponse;
+import io.f1.backend.domain.game.dto.response.GameResultListResponse;
+import io.f1.backend.domain.game.dto.response.GameResultResponse;
 import io.f1.backend.domain.game.event.GameCorrectAnswerEvent;
 import io.f1.backend.domain.game.event.GameTimeoutEvent;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
+import io.f1.backend.domain.game.model.ConnectionState;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.model.RoomState;
@@ -27,10 +29,12 @@
 import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
+import io.f1.backend.domain.stat.app.StatService;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
+import io.f1.backend.global.lock.DistributedLock;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,13 +56,15 @@ public class GameService {
     private static final int CONTINUE_DELAY = 3;
     private static final String NONE_CORRECT_USER = "";
 
+    private final StatService statService;
     private final QuizService quizService;
     private final RoomService roomService;
     private final TimerService timerService;
     private final MessageSender messageSender;
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
+    @DistributedLock(prefix = "room", key = "#roomId")
     public void gameStart(Long roomId, UserPrincipal principal) {
 
         String destination = getDestination(roomId);
@@ -97,13 +103,13 @@ public void onCorrectAnswer(GameCorrectAnswerEvent event) {
 
         Room room = event.room();
         log.debug(room.getId() + "번 방 채팅으로 정답! 현재 라운드 : " + room.getCurrentRound());
-        String sessionId = event.sessionId();
+        Long userId = event.userId();
         ChatMessage chatMessage = event.chatMessage();
         String answer = event.answer();
 
         String destination = getDestination(room.getId());
 
-        room.increasePlayerCorrectCount(sessionId);
+        room.increasePlayerCorrectCount(userId);
 
         messageSender.sendBroadcast(
                 destination,
@@ -167,13 +173,14 @@ public void gameEnd(Room room) {
         Long roomId = room.getId();
         String destination = getDestination(roomId);
 
-        Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
+        Map<Long, Player> playerMap = room.getPlayerMap();
 
-        // TODO : 랭킹 정보 업데이트
-        messageSender.sendBroadcast(
-                destination,
-                MessageType.GAME_RESULT,
-                toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
+        GameResultListResponse gameResultListResponse =
+                toGameResultListResponse(playerMap, room.getGameSetting().getRound());
+
+        messageSender.sendBroadcast(destination, MessageType.GAME_RESULT, gameResultListResponse);
+
+        updateRank(room, gameResultListResponse);
 
         room.initializeRound();
         room.initializePlayers();
@@ -199,19 +206,44 @@ public void gameEnd(Room room) {
                 destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
     }
 
-    public void handlePlayerReady(Long roomId, String sessionId) {
+    private void updateRank(Room room, GameResultListResponse gameResultListResponse) {
+
+        List<GameResultResponse> result = gameResultListResponse.result();
+
+        for (GameResultResponse gameResultResponse : result) {
+            Long playerId = gameResultResponse.id();
+            int rank = gameResultResponse.rank();
+            int score = gameResultResponse.score();
+
+            Player player = room.getPlayerByUserId(playerId);
+
+            if (room.isPlayerInState(playerId, ConnectionState.DISCONNECTED)) {
+                statService.updateRank(playerId, false, 0);
+                continue;
+            }
+
+            if (rank == 1) {
+                statService.updateRank(playerId, true, score);
+                continue;
+            }
+
+            statService.updateRank(playerId, false, score);
+        }
+    }
+
+    @DistributedLock(prefix = "room", key = "#roomId")
+    public void handlePlayerReady(Long roomId, UserPrincipal userPrincipal) {
 
         Room room = findRoom(roomId);
 
-        Player player = room.getPlayerBySessionId(sessionId);
+        Player player = room.getPlayerByUserId(userPrincipal.getUserId());
 
         toggleReadyIfPossible(room, player);
 
         String destination = getDestination(roomId);
 
-        PlayerListResponse playerListResponse = toPlayerListResponse(room);
-        log.info(playerListResponse.toString());
-        messageSender.sendBroadcast(destination, MessageType.PLAYER_LIST, playerListResponse);
+        messageSender.sendBroadcast(
+                destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
     }
 
     public void changeGameSetting(
@@ -244,7 +276,7 @@ private void validateRoomStart(Room room, UserPrincipal principal) {
     // 라운드 수만큼 랜덤 Question 추출
     private List<Question> prepareQuestions(Room room, Quiz quiz) {
         Long quizId = quiz.getId();
-        Integer round = room.getGameSetting().getRound();
+        Integer round = room.getRound();
         return quizService.getRandomQuestionsWithoutAnswer(quizId, round);
     }