Merge remote-tracking branch 'origin/dev' into refactor/96

sehee123 · sehee123 · commit d6061d02eb6f · 2025-07-25T20:58:56.000+09:00
# Conflicts:
#	backend/src/main/resources/application.yml
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -24,17 +24,22 @@ repositories {
 }
 
 dependencies {
+	/* SPRING BOOT STARTER */
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	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.springframework.boot:spring-boot-starter-websocket'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
 	/* DATABASE */
 	runtimeOnly 'com.mysql:mysql-connector-j'
 
+	/* MONITORING */
+	implementation 'io.micrometer:micrometer-registry-prometheus'
+
 	/* TEST */
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/request/QuizChangeRequest.java b/backend/src/main/java/io/f1/backend/domain/game/dto/request/QuizChangeRequest.java
@@ -8,7 +8,6 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.websocket.MessageSender;
 import io.f1.backend.domain.quiz.app.QuizService;
-import io.f1.backend.domain.quiz.entity.Quiz;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -20,11 +19,8 @@ public boolean change(Room room, QuizService quizService) {
         if (room.getQuizId() == quizId) {
             return false; // 동일하면 무시
         }
-        Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
-        int questionSize = quiz.getQuestions().size();
-        room.changeQuiz(quiz);
-        // 퀴즈의 문제 갯수로 변경
-        room.changeRound(questionSize, questionSize);
+        Long questionsCount = quizService.getQuestionsCount(quizId);
+        room.changeQuiz(quizId, questionsCount.intValue());
         return true;
     }
 
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/request/RoundChangeRequest.java b/backend/src/main/java/io/f1/backend/domain/game/dto/request/RoundChangeRequest.java
@@ -3,7 +3,6 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.websocket.MessageSender;
 import io.f1.backend.domain.quiz.app.QuizService;
-import io.f1.backend.domain.quiz.entity.Quiz;
 
 public record RoundChangeRequest(int round) implements GameSettingChanger {
 
@@ -13,10 +12,9 @@ public boolean change(Room room, QuizService quizService) {
             return false; // 동일하면 무시
         }
 
-        Quiz quiz = quizService.findQuizById(room.getQuizId());
-        int questionSize = quiz.getQuestions().size();
+        Long questionsCount = quizService.getQuestionsCount(room.getQuizId());
 
-        room.changeRound(round, questionSize);
+        room.changeRound(round, questionsCount.intValue());
         return true;
     }
 
diff --git a/backend/src/main/java/io/f1/backend/domain/game/model/GameSetting.java b/backend/src/main/java/io/f1/backend/domain/game/model/GameSetting.java
@@ -1,7 +1,6 @@
 package io.f1.backend.domain.game.model;
 
 import io.f1.backend.domain.game.dto.request.TimeLimit;
-import io.f1.backend.domain.quiz.entity.Quiz;
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 
@@ -16,9 +15,9 @@ public class GameSetting {
     private Integer round;
     private int timeLimit;
 
-    public void changeQuiz(Quiz quiz) {
-        quizId = quiz.getId();
-        round = quiz.getQuestions().size(); // 라운드를 바꾼 퀴즈의 문제 수로 동기화
+    public void changeQuiz(Long quizId, int questionsCount) {
+        this.quizId = quizId;
+        round = questionsCount; // 라운드를 바꾼 퀴즈의 문제 수로 동기화
     }
 
     public void changeTimeLimit(TimeLimit timeLimit) {
diff --git a/backend/src/main/java/io/f1/backend/domain/game/model/Room.java b/backend/src/main/java/io/f1/backend/domain/game/model/Room.java
@@ -2,7 +2,6 @@
 
 import io.f1.backend.domain.game.dto.request.TimeLimit;
 import io.f1.backend.domain.question.entity.Question;
-import io.f1.backend.domain.quiz.entity.Quiz;
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
@@ -158,8 +157,8 @@ public void resetAllPlayerReadyStates() {
         }
     }
 
-    public void changeQuiz(Quiz quiz) {
-        gameSetting.changeQuiz(quiz);
+    public void changeQuiz(Long quizId, int questionsCount) {
+        gameSetting.changeQuiz(quizId, questionsCount);
     }
 
     public void changeTimeLimit(TimeLimit timeLimit) {
diff --git a/backend/src/main/java/io/f1/backend/domain/game/store/RoomRepositoryImpl.java b/backend/src/main/java/io/f1/backend/domain/game/store/RoomRepositoryImpl.java
@@ -34,9 +34,4 @@ public List<Room> findAll() {
     public void removeRoom(Long roomId) {
         roomMap.remove(roomId);
     }
-
-    // 테스트 전용 메소드
-    public Room getRoomForTest(Long roomId) {
-        return roomMap.get(roomId);
-    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/quiz/app/QuizService.java b/backend/src/main/java/io/f1/backend/domain/quiz/app/QuizService.java
@@ -284,4 +284,9 @@ public Quiz findQuizById(Long quizId) {
                 .findById(quizId)
                 .orElseThrow(() -> new CustomException(QuizErrorCode.QUIZ_NOT_FOUND));
     }
+
+    @Transactional(readOnly = true)
+    public Long getQuestionsCount(Long quizId) {
+        return quizRepository.countQuestionsByQuizId(quizId);
+    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/quiz/dao/QuizRepository.java b/backend/src/main/java/io/f1/backend/domain/quiz/dao/QuizRepository.java
@@ -21,6 +21,9 @@ public interface QuizRepository extends JpaRepository<Quiz, Long> {
     @Query("SELECT q FROM Quiz q LEFT JOIN FETCH q.questions WHERE q.id = :quizId")
     Optional<Quiz> findQuizWithQuestionsById(Long quizId);
 
+    @Query("SELECT COUNT(qst) FROM Quiz q JOIN q.questions qst WHERE q.id = :quizId")
+    Long countQuestionsByQuizId(Long quizId);
+
     @Query(
 """
     SELECT new io.f1.backend.domain.quiz.dto.QuizMinData (q.id, COUNT(qs.id))
diff --git a/backend/src/main/java/io/f1/backend/domain/stat/dao/StatJpaRepository.java b/backend/src/main/java/io/f1/backend/domain/stat/dao/StatJpaRepository.java
@@ -1,7 +1,7 @@
 package io.f1.backend.domain.stat.dao;
 
 import io.f1.backend.domain.stat.dto.StatWithNickname;
-import io.f1.backend.domain.stat.dto.StatWithNicknameAndUserId;
+import io.f1.backend.domain.stat.dto.StatWithUserSummary;
 import io.f1.backend.domain.stat.entity.Stat;
 
 import org.springframework.data.domain.Page;
@@ -33,12 +33,12 @@ public interface StatJpaRepository extends JpaRepository<Stat, Long> {
     @Query(
             """
             SELECT
-            		new io.f1.backend.domain.stat.dto.StatWithNicknameAndUserId
+            		new io.f1.backend.domain.stat.dto.StatWithUserSummary
             				(u.id, u.nickname, s.totalGames, s.winningGames, s.score)
             FROM
             		Stat s JOIN s.user u
             """)
-    List<StatWithNicknameAndUserId> findAllStatWithNicknameAndUserId();
+    List<StatWithUserSummary> findAllStatWithUserSummary();
 
     @Modifying
     @Query(
@@ -63,4 +63,14 @@ public interface StatJpaRepository extends JpaRepository<Stat, Long> {
             		s.user.id = :userId
             """)
     void updateStatByUserIdCaseLose(long deltaScore, long userId);
+
+    @Query(
+            """
+            SELECT new io.f1.backend.domain.stat.dto.StatWithUserSummary(
+                u.id, u.nickname, s.totalGames, s.winningGames, s.score
+            )
+            FROM Stat s JOIN s.user u
+            WHERE u.id = :userId
+            """)
+    Optional<StatWithUserSummary> findStatWithUserSummary(long userId);
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRedisRepository.java b/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRedisRepository.java
@@ -4,7 +4,8 @@
 
 import io.f1.backend.domain.stat.dto.StatPageResponse;
 import io.f1.backend.domain.stat.dto.StatResponse;
-import io.f1.backend.domain.stat.dto.StatWithNicknameAndUserId;
+import io.f1.backend.domain.stat.dto.StatWithUserSummary;
+import io.f1.backend.domain.user.dto.MyPageInfo;
 
 import lombok.RequiredArgsConstructor;
 
@@ -27,6 +28,7 @@
 @Repository
 @RequiredArgsConstructor
 public class StatRedisRepository {
+
     private static final String STAT_RANK = "stat:rank";
     private static final String STAT_USER = "stat:user:%d";
     private static final String STAT_NICKNAME = "stat:%s";
@@ -42,7 +44,7 @@ public void setup() {
         valueOps = redisTemplate.opsForValue();
     }
 
-    public void initialize(StatWithNicknameAndUserId stat) {
+    public void initialize(StatWithUserSummary stat) {
         String statUserKey = getStatUserKey(stat.userId());
         String statNicknameKey = getStatNickname(stat.nickname());
 
@@ -149,4 +151,23 @@ private static String getStatNickname(String nickname) {
     private long getUserIdFromNickname(String nickname) {
         return ((Number) requireNonNull(valueOps.get(getStatNickname(nickname)))).longValue();
     }
+
+    public MyPageInfo getStatByUserId(long userId) {
+        String statUserKey = getStatUserKey(userId);
+
+        Long rank = zSetOps.reverseRank(STAT_RANK, userId);
+        Double score = zSetOps.score(STAT_RANK, userId);
+        Map<Object, Object> statMap = hashOps.entries(statUserKey);
+
+        if (rank == null || score == null || statMap.isEmpty()) {
+            throw new IllegalStateException("User not found in Redis: " + userId);
+        }
+
+        return new MyPageInfo(
+                (String) statMap.get("nickname"),
+                rank + 1,
+                (long) statMap.get("totalGames"),
+                (long) statMap.get("winningGames"),
+                score.longValue());
+    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRepository.java b/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRepository.java
@@ -1,6 +1,7 @@
 package io.f1.backend.domain.stat.dao;
 
 import io.f1.backend.domain.stat.dto.StatPageResponse;
+import io.f1.backend.domain.user.dto.MyPageInfo;
 
 import org.springframework.data.domain.Pageable;
 
@@ -17,4 +18,6 @@ public interface StatRepository {
     void updateNickname(long userId, String nickname);
 
     void removeUser(long userId);
+
+    MyPageInfo getMyPageByUserId(long userId);
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRepositoryAdapter.java b/backend/src/main/java/io/f1/backend/domain/stat/dao/StatRepositoryAdapter.java
@@ -4,9 +4,11 @@
 
 import io.f1.backend.domain.stat.dto.StatPageResponse;
 import io.f1.backend.domain.stat.dto.StatWithNickname;
-import io.f1.backend.domain.stat.dto.StatWithNicknameAndUserId;
+import io.f1.backend.domain.stat.dto.StatWithUserSummary;
+import io.f1.backend.domain.user.dto.MyPageInfo;
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
+import io.f1.backend.global.exception.errorcode.UserErrorCode;
 
 import jakarta.annotation.PostConstruct;
 
@@ -54,7 +56,7 @@ public StatPageResponse getRanksByNickname(String nickname, int pageSize) {
 
     @Override
     public void addUser(long userId, String nickname) {
-        redisRepository.initialize(new StatWithNicknameAndUserId(userId, nickname, 0, 0, 0));
+        redisRepository.initialize(new StatWithUserSummary(userId, nickname, 0, 0, 0));
     }
 
     @Override
@@ -78,7 +80,7 @@ public void removeUser(long userId) {
     }
 
     private void warmingRedis() {
-        jpaRepository.findAllStatWithNicknameAndUserId().forEach(redisRepository::initialize);
+        jpaRepository.findAllStatWithUserSummary().forEach(redisRepository::initialize);
     }
 
     private Pageable getPageableFromNickname(String nickname, int pageSize) {
@@ -97,4 +99,25 @@ private Pageable getPageableFromNickname(String nickname, int pageSize) {
         int pageNumber = rowNum > 0 ? (int) (rowNum / pageSize) : 0;
         return PageRequest.of(pageNumber, pageSize, Sort.by(Direction.DESC, "score"));
     }
+
+    @Override
+    public MyPageInfo getMyPageByUserId(long userId) {
+        try {
+            return redisRepository.getStatByUserId(userId);
+        } catch (Exception e) {
+            log.error("Redis miss, fallback to MySQL for userId={}", userId, e);
+        }
+
+        StatWithUserSummary stat = findStatByUserId(userId);
+        long rank = jpaRepository.countByScoreGreaterThan(stat.score()) + 1;
+
+        return new MyPageInfo(
+                stat.nickname(), rank, stat.totalGames(), stat.winningGames(), stat.score());
+    }
+
+    private StatWithUserSummary findStatByUserId(long userId) {
+        return jpaRepository
+                .findStatWithUserSummary(userId)
+                .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND));
+    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/stat/dto/StatWithUserSummary.java b/backend/src/main/java/io/f1/backend/domain/stat/dto/StatWithUserSummary.java
@@ -1,4 +1,4 @@
 package io.f1.backend.domain.stat.dto;
 
-public record StatWithNicknameAndUserId(
+public record StatWithUserSummary(
         long userId, String nickname, long totalGames, long winningGames, long score) {}
diff --git a/backend/src/main/java/io/f1/backend/domain/user/api/UserController.java b/backend/src/main/java/io/f1/backend/domain/user/api/UserController.java
@@ -3,6 +3,7 @@
 import static io.f1.backend.global.util.SecurityUtils.logout;
 
 import io.f1.backend.domain.user.app.UserService;
+import io.f1.backend.domain.user.dto.MyPageInfo;
 import io.f1.backend.domain.user.dto.SignupRequest;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
@@ -13,6 +14,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,4 +44,11 @@ public ResponseEntity<Void> updateNickname(
                 userPrincipal.getUserId(), signupRequest.nickname(), httpSession);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping
+    public ResponseEntity<MyPageInfo> getMyPage(
+            @AuthenticationPrincipal UserPrincipal userPrincipal) {
+        MyPageInfo response = userService.getMyPage(userPrincipal);
+        return ResponseEntity.ok(response);
+    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/user/app/UserService.java b/backend/src/main/java/io/f1/backend/domain/user/app/UserService.java
@@ -7,8 +7,10 @@
 import static io.f1.backend.global.util.RedisPublisher.USER_UPDATE;
 
 import io.f1.backend.domain.auth.dto.CurrentUserAndAdminResponse;
+import io.f1.backend.domain.stat.dao.StatRepository;
 import io.f1.backend.domain.user.dao.UserRepository;
 import io.f1.backend.domain.user.dto.AuthenticationUser;
+import io.f1.backend.domain.user.dto.MyPageInfo;
 import io.f1.backend.domain.user.dto.SignupRequest;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.domain.user.dto.UserSummary;
@@ -32,6 +34,7 @@ public class UserService {
 
     private final UserRepository userRepository;
     private final RedisPublisher redisPublisher;
+    private final StatRepository statRepository;
 
     @Transactional
     public CurrentUserAndAdminResponse signup(HttpSession session, SignupRequest signupRequest) {
@@ -122,4 +125,10 @@ public void checkNickname(String nickname) {
         validateNicknameFormat(nickname);
         validateNicknameDuplicate(nickname);
     }
+
+    @Transactional(readOnly = true)
+    public MyPageInfo getMyPage(UserPrincipal userPrincipal) {
+        Long userId = userPrincipal.getUserId();
+        return statRepository.getMyPageByUserId(userId);
+    }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/user/dto/MyPageInfo.java b/backend/src/main/java/io/f1/backend/domain/user/dto/MyPageInfo.java
@@ -0,0 +1,4 @@
+package io.f1.backend.domain.user.dto;
+
+public record MyPageInfo(
+        String nickname, long rank, long score, long totalGames, long winningGames) {}
diff --git a/backend/src/main/java/io/f1/backend/global/config/SecurityConfig.java b/backend/src/main/java/io/f1/backend/global/config/SecurityConfig.java
@@ -10,6 +10,7 @@
 
 import lombok.RequiredArgsConstructor;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -32,6 +33,9 @@ public class SecurityConfig {
     private final AdminLoginSuccessHandler adminLoginSuccessHandler;
     private final AdminLoginFailureHandler adminLoginFailureHandler;
 
+    @Value("${management.endpoints.web.base-path:/actuator}")
+    private String actuatorBasePath;
+
     @Bean
     public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
         http.csrf(AbstractHttpConfigurer::disable)
@@ -66,6 +70,8 @@ public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
                                         .hasAnyRole("USER", "ADMIN")
                                         .requestMatchers("/questions/**")
                                         .hasAnyRole("USER", "ADMIN")
+                                        .requestMatchers(actuatorBasePath + "/**")
+                                        .hasRole("PROMETHEUS")
                                         .anyRequest()
                                         .authenticated())
                 .formLogin(
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
diff --git a/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java b/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java
diff --git a/backend/src/test/java/io/f1/backend/domain/game/store/RoomRepositoryTests.java b/backend/src/test/java/io/f1/backend/domain/game/store/RoomRepositoryTests.java
diff --git a/backend/src/test/java/io/f1/backend/domain/game/websocket/SessionServiceTests.java b/backend/src/test/java/io/f1/backend/domain/game/websocket/SessionServiceTests.java
diff --git a/backend/src/test/java/io/f1/backend/domain/stat/RedisStatBrowserTest.java b/backend/src/test/java/io/f1/backend/domain/stat/RedisStatBrowserTest.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import io.f1.backend.domain.game.dto.request.TimeLimit;`
`4`	`4`	`import io.f1.backend.domain.question.entity.Question;`
`5`		`-import io.f1.backend.domain.quiz.entity.Quiz;`
`6`	`5`	`import io.f1.backend.global.exception.CustomException;`
`7`	`6`	`import io.f1.backend.global.exception.errorcode.RoomErrorCode;`
`8`	`7`
`@@ -158,8 +157,8 @@ public void resetAllPlayerReadyStates() {`
`158`	`157`	`}`
`159`	`158`	`}`
`160`	`159`
`161`		`- public void changeQuiz(Quiz quiz) {`
`162`		`- gameSetting.changeQuiz(quiz);`
	`160`	`+ public void changeQuiz(Long quizId, int questionsCount) {`
	`161`	`+ gameSetting.changeQuiz(quizId, questionsCount);`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`public void changeTimeLimit(TimeLimit timeLimit) {`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,4 @@ public List<Room> findAll() {`
`34`	`34`	`public void removeRoom(Long roomId) {`
`35`	`35`	`roomMap.remove(roomId);`
`36`	`36`	`}`
`37`		`-`
`38`		`- // 테스트 전용 메소드`
`39`		`- public Room getRoomForTest(Long roomId) {`
`40`		`- return roomMap.get(roomId);`
`41`		`- }`
`42`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,4 +284,9 @@ public Quiz findQuizById(Long quizId) {`
`284`	`284`	`.findById(quizId)`
`285`	`285`	`.orElseThrow(() -> new CustomException(QuizErrorCode.QUIZ_NOT_FOUND));`
`286`	`286`	`}`
	`287`	`+`
	`288`	`+ @Transactional(readOnly = true)`
	`289`	`+ public Long getQuestionsCount(Long quizId) {`
	`290`	`+ return quizRepository.countQuestionsByQuizId(quizId);`
	`291`	`+ }`
`287`	`292`	`}`