From e496fb6af5a98f23f1f0b735b75da01f1aa7647f Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 15:36:32 +0900
Subject: [PATCH 01/43] =?UTF-8?q?[docs]=20Agent=20=ED=8C=8C=EC=9D=BC=20ign?=
 =?UTF-8?q?ore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 56e89db9..64f367e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,6 @@ monitoring/README.md
 
 ### macOS
 .DS_Store
+
+### Local agent guidance
+/AGENTS.md

From dfdbb114a5cd13c7a70daaefb0290c3980e4728e Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 21:30:12 +0900
Subject: [PATCH 02/43] =?UTF-8?q?[feat]=20=EC=9C=A0=EC=A0=80=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AdminUserController.java | 46 +++++++++++++--
 src/main/resources/templates/users.html       | 56 +++++++++++++++++--
 2 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
index bfd197c1..17def2a1 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
@@ -18,7 +18,11 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -36,21 +40,39 @@ public class AdminUserController {
     public String getAllUsers(
             @RequestParam(defaultValue = "0", name = "page") int page,
             @RequestParam(defaultValue = "20", name = "size") int size,
+            @RequestParam(defaultValue = "createdAt", name = "sortBy") String sortBy,
+            @RequestParam(defaultValue = "desc", name = "direction") String direction,
             Model model
     ) {
         List<UserResponseDto> allUsers = userService.findAllUsers();
+        Map<Long, Long> problemCountByUserId = allUsers.stream()
+                .collect(Collectors.toMap(
+                        UserResponseDto::userId,
+                        user -> problemService.findProblemCountByUser(user.userId())
+                ));
+
+        Comparator<UserResponseDto> comparator = getUserComparator(sortBy, problemCountByUserId);
+        if ("desc".equalsIgnoreCase(direction)) {
+            comparator = comparator.reversed();
+        }
+
+        List<UserResponseDto> sortedUsers = allUsers.stream()
+                .sorted(comparator.thenComparing(UserResponseDto::userId, Comparator.reverseOrder()))
+                .toList();
 
         // 페이징 계산
-        int totalUsers = allUsers.size();
+        int totalUsers = sortedUsers.size();
         int totalPages = (int) Math.ceil((double) totalUsers / size);
         int startIndex = page * size;
         int endIndex = Math.min(startIndex + size, totalUsers);
 
-        List<UserResponseDto> pagedUsers = allUsers.subList(startIndex, endIndex);
+        List<UserResponseDto> pagedUsers = startIndex >= totalUsers
+                ? List.of()
+                : sortedUsers.subList(startIndex, endIndex);
 
         // 각 유저의 문제 개수 계산
         List<Long> problemCounts = pagedUsers.stream()
-                .map(user -> problemService.findProblemCountByUser(user.userId()))
+                .map(user -> problemCountByUserId.get(user.userId()))
                 .toList();
 
         model.addAttribute("users", pagedUsers);
@@ -59,10 +81,26 @@ public String getAllUsers(
         model.addAttribute("totalPages", totalPages);
         model.addAttribute("totalUsers", totalUsers);
         model.addAttribute("size", size);
+        model.addAttribute("sortBy", sortBy);
+        model.addAttribute("direction", direction);
 
         return "users";
     }
 
+    private Comparator<UserResponseDto> getUserComparator(String sortBy, Map<Long, Long> problemCountByUserId) {
+        Function<UserResponseDto, Long> sortKey = switch (sortBy) {
+            case "level" -> UserResponseDto::totalStudyLevel;
+            case "problemCount" -> user -> problemCountByUserId.getOrDefault(user.userId(), 0L);
+            default -> null;
+        };
+
+        if (sortKey == null) {
+            return Comparator.comparing(UserResponseDto::createdAt);
+        }
+
+        return Comparator.comparing(sortKey);
+    }
+
     @GetMapping("/user/{userId}")
     public String getUserDetailsById(@PathVariable(name = "userId") Long userId, Model model) {
         UserResponseDto user = userService.findUser(userId);
@@ -117,4 +155,4 @@ public String updateUserLevel(
     public void deleteUserInfo(@PathVariable(name = "userId") Long userId) {
         userService.deleteUserById(userId);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index 3ba8ea6d..ada8a187 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -47,6 +47,38 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
       <p class="text-gray-600 mt-1">총 <span class="font-semibold text-indigo-600" th:text="${totalUsers}">0</span>명의 유저</p>
     </div>
 
+    <form th:action="@{/admin/users}" method="get" class="mb-6 bg-white rounded-lg shadow-md p-4">
+      <div class="grid grid-cols-1 md:grid-cols-4 gap-4 items-end">
+        <input type="hidden" name="page" value="0">
+        <div>
+          <label for="sortBy" class="block text-sm font-medium text-gray-700 mb-1">정렬 기준</label>
+          <select id="sortBy" name="sortBy" class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+            <option value="createdAt" th:selected="${sortBy == 'createdAt'}">가입일</option>
+            <option value="level" th:selected="${sortBy == 'level'}">총 학습 레벨</option>
+            <option value="problemCount" th:selected="${sortBy == 'problemCount'}">문제 수</option>
+          </select>
+        </div>
+        <div>
+          <label for="direction" class="block text-sm font-medium text-gray-700 mb-1">정렬 방향</label>
+          <select id="direction" name="direction" class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+            <option value="desc" th:selected="${direction == 'desc'}">내림차순</option>
+            <option value="asc" th:selected="${direction == 'asc'}">오름차순</option>
+          </select>
+        </div>
+        <div>
+          <label for="size" class="block text-sm font-medium text-gray-700 mb-1">페이지 크기</label>
+          <select id="size" name="size" class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+            <option value="20" th:selected="${size == 20}">20개</option>
+            <option value="50" th:selected="${size == 50}">50개</option>
+            <option value="100" th:selected="${size == 100}">100개</option>
+          </select>
+        </div>
+        <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white px-4 py-2 rounded-md text-sm font-medium transition">
+          적용
+        </button>
+      </div>
+    </form>
+
     <!-- Users Table -->
     <div class="bg-white rounded-lg shadow-md overflow-hidden">
       <div class="overflow-x-auto">
@@ -56,8 +88,20 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저 ID</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">이름</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">이메일</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">총 학습 레벨</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">문제 수</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                <a th:href="@{/admin/users(page=0, size=${size}, sortBy='level', direction=${sortBy == 'level' && direction == 'desc' ? 'asc' : 'desc'})}"
+                   class="hover:text-indigo-600">
+                  총 학습 레벨
+                  <span th:if="${sortBy == 'level'}" th:text="${direction == 'desc' ? '내림차순' : '오름차순'}" class="ml-1 text-indigo-600">내림차순</span>
+                </a>
+              </th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                <a th:href="@{/admin/users(page=0, size=${size}, sortBy='problemCount', direction=${sortBy == 'problemCount' && direction == 'desc' ? 'asc' : 'desc'})}"
+                   class="hover:text-indigo-600">
+                  문제 수
+                  <span th:if="${sortBy == 'problemCount'}" th:text="${direction == 'desc' ? '내림차순' : '오름차순'}" class="ml-1 text-indigo-600">내림차순</span>
+                </a>
+              </th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">가입일</th>
             </tr>
           </thead>
@@ -97,7 +141,7 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
       <div class="flex space-x-2">
         <!-- Previous Button -->
         <a th:if="${currentPage > 0}"
-           th:href="@{/admin/users(page=${currentPage - 1}, size=${size})}"
+           th:href="@{/admin/users(page=${currentPage - 1}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
           이전
         </a>
@@ -114,7 +158,7 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
               <span th:text="${page + 1}">1</span>
             </a>
             <a th:if="${page != currentPage}"
-               th:href="@{/admin/users(page=${page}, size=${size})}"
+               th:href="@{/admin/users(page=${page}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
                class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
               <span th:text="${page + 1}">1</span>
             </a>
@@ -123,7 +167,7 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
 
         <!-- Next Button -->
         <a th:if="${currentPage < totalPages - 1}"
-           th:href="@{/admin/users(page=${currentPage + 1}, size=${size})}"
+           th:href="@{/admin/users(page=${currentPage + 1}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
           다음
         </a>
@@ -135,4 +179,4 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From fd8da3a0fca197aec54536cbc4a3c2a84206525d Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 21:30:34 +0900
Subject: [PATCH 03/43] =?UTF-8?q?[feat]=20=ED=86=B5=EA=B3=84=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B8=B0=EA=B0=84=20=EC=84=A4=EC=A0=95=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   | 32 ++++++++++++----
 .../MissionLogRepositoryCustom.java           |  2 +
 .../repository/MissionLogRepositoryImpl.java  | 10 +++--
 .../mission/service/MissionLogService.java    |  5 +++
 .../OnO/backend/user/service/UserService.java | 10 +++--
 src/main/resources/templates/analysis.html    | 37 ++++++++++++++++---
 6 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index 24952228..c237280c 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -30,20 +30,36 @@ public class AdminAnalysisController {
     private final MissionLogService missionLogService;
 
     @GetMapping("/analysis")
-    public String getAllAnalysis(Model model) {
+    public String getAllAnalysis(
+            @RequestParam(name = "startDate", required = false)
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(name = "endDate", required = false)
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
+            Model model
+    ) {
         int allUserCount = userService.findAllUsers().size();
         int allProblemCount = problemService.findAllProblems().size();
 
-        // 최근 30일간 날짜별 출석 유저 수 및 신규 가입자 수
-        Map<LocalDate, Long> dailyActiveUsers = missionLogService.getDailyActiveUsersCount(30);
-        Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(30);
+        LocalDate today = LocalDate.now();
+        LocalDate selectedStartDate = startDate != null ? startDate : today.minusDays(29);
+        LocalDate selectedEndDate = endDate != null ? endDate : today;
 
-        // 최근 30일 신규 가입자 총합
+        if (selectedStartDate.isAfter(selectedEndDate)) {
+            LocalDate temp = selectedStartDate;
+            selectedStartDate = selectedEndDate;
+            selectedEndDate = temp;
+        }
+
+        // 선택 기간 날짜별 출석 유저 수 및 신규 가입자 수
+        Map<LocalDate, Long> dailyActiveUsers = missionLogService.getDailyActiveUsersCount(selectedStartDate, selectedEndDate);
+        Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(selectedStartDate, selectedEndDate);
+
+        // 선택 기간 신규 가입자 총합
         long recentNewUsersCount = dailyNewUsers.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
 
-        // 하루 평균 방문자 수 (최근 30일)
+        // 하루 평균 방문자 수 (선택 기간)
         double averageDailyVisitors = dailyActiveUsers.values().stream()
                 .mapToLong(Long::longValue)
                 .average()
@@ -55,6 +71,8 @@ public String getAllAnalysis(Model model) {
         model.addAttribute("dailyNewUsers", dailyNewUsers);
         model.addAttribute("recentNewUsersCount", recentNewUsersCount);
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
+        model.addAttribute("startDate", selectedStartDate);
+        model.addAttribute("endDate", selectedEndDate);
 
         return "analysis";
     }
@@ -91,4 +109,4 @@ public String getDailyActiveUsers(
 
         return "daily-users";
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryCustom.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryCustom.java
index 541e4bbf..33a6cbea 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryCustom.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryCustom.java
@@ -19,5 +19,7 @@ public interface MissionLogRepositoryCustom {
 
     Map<LocalDate, Long> getDailyActiveUsersCount(int days);
 
+    Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalDate endDate);
+
     List<User> getActiveUsersByDate(LocalDate date);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
index 20c3a722..e4121667 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
@@ -87,12 +87,16 @@ public Long getPointSumToday(Long userId){
 
     @Override
     public Map<LocalDate, Long> getDailyActiveUsersCount(int days) {
-        Map<LocalDate, Long> result = new LinkedHashMap<>();
         LocalDate today = LocalDate.now();
+        return getDailyActiveUsersCount(today.minusDays(days - 1L), today);
+    }
+
+    @Override
+    public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalDate endDate) {
+        Map<LocalDate, Long> result = new LinkedHashMap<>();
 
         // 최근 날짜가 위로 오도록 역순으로 조회
-        for (int i = 0; i < days; i++) {
-            LocalDate date = today.minusDays(i);
+        for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
             LocalDateTime startOfDay = date.atStartOfDay();
             LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
 
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index facc7b10..730924ae 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -158,6 +158,11 @@ public Map<LocalDate, Long> getDailyActiveUsersCount(int days) {
         return missionLogRepository.getDailyActiveUsersCount(days);
     }
 
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalDate endDate) {
+        return missionLogRepository.getDailyActiveUsersCount(startDate, endDate);
+    }
+
     @Transactional(readOnly = true)
     public List<com.aisip.OnO.backend.user.entity.User> getActiveUsersByDate(LocalDate date) {
         return missionLogRepository.getActiveUsersByDate(date);
diff --git a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
index 4164bdd0..3c940d0a 100644
--- a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
+++ b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
@@ -156,13 +156,17 @@ public void updateUserLevel(Long userId, String levelType, Long levelValue, Long
 
     @Transactional(readOnly = true)
     public Map<LocalDate, Long> getDailyNewUsersCount(int days) {
-        Map<LocalDate, Long> result = new LinkedHashMap<>();
         LocalDate today = LocalDate.now();
+        return getDailyNewUsersCount(today.minusDays(days - 1L), today);
+    }
+
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyNewUsersCount(LocalDate startDate, LocalDate endDate) {
+        Map<LocalDate, Long> result = new LinkedHashMap<>();
         List<User> allUsers = userRepository.findAll();
 
         // 최근 날짜가 위로 오도록 역순으로 조회
-        for (int i = 0; i < days; i++) {
-            LocalDate date = today.minusDays(i);
+        for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
             LocalDateTime startOfDay = date.atStartOfDay();
             LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
 
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 7c6186b8..66015b23 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -47,6 +47,31 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
       <p class="text-gray-600 mt-1">OnO 애플리케이션 통계 개요</p>
     </div>
 
+    <form th:action="@{/admin/analysis}" method="get" class="mb-8 bg-white rounded-lg shadow-md p-4">
+      <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-end">
+        <div>
+          <label for="startDate" class="block text-sm font-medium text-gray-700 mb-1">시작일</label>
+          <input id="startDate" name="startDate" type="date" th:value="${startDate}"
+                 class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+        </div>
+        <div>
+          <label for="endDate" class="block text-sm font-medium text-gray-700 mb-1">종료일</label>
+          <input id="endDate" name="endDate" type="date" th:value="${endDate}"
+                 class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+        </div>
+        <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white px-4 py-2 rounded-md text-sm font-medium transition">
+          기간 적용
+        </button>
+      </div>
+      <p class="mt-3 text-xs text-gray-500">
+        현재 기간:
+        <span th:text="${#temporals.format(startDate, 'yyyy-MM-dd')}">2024-01-01</span>
+        부터
+        <span th:text="${#temporals.format(endDate, 'yyyy-MM-dd')}">2024-01-30</span>
+        까지
+      </p>
+    </form>
+
     <!-- Key Metrics -->
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
       <!-- Total Users -->
@@ -100,15 +125,15 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
           </div>
         </div>
         <div class="mt-4">
-          <p class="text-xs text-gray-500">최근 30일 기준</p>
+          <p class="text-xs text-gray-500">선택 기간 기준</p>
         </div>
       </div>
 
-      <!-- Recent 30 Days New Users -->
+      <!-- Selected Period New Users -->
       <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-orange-500">
         <div class="flex items-center justify-between">
           <div>
-            <p class="text-sm font-medium text-gray-500 uppercase">최근 30일 가입자 수</p>
+            <p class="text-sm font-medium text-gray-500 uppercase">선택 기간 가입자 수</p>
             <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${recentNewUsersCount}">0</p>
           </div>
           <div class="p-3 bg-orange-100 rounded-full">
@@ -118,7 +143,7 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
           </div>
         </div>
         <div class="mt-4">
-          <p class="text-xs text-gray-500">지난 30일간 신규 가입</p>
+          <p class="text-xs text-gray-500">선택 기간 신규 가입</p>
         </div>
       </div>
 
@@ -186,7 +211,7 @@ <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
     <!-- Daily Active Users -->
     <div class="bg-white rounded-lg shadow-md overflow-hidden mb-8">
       <div class="px-6 py-4 bg-gray-50 border-b border-gray-200">
-        <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수 (최근 30일)</h3>
+        <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
       </div>
       <div class="p-6">
         <div class="overflow-x-auto">
@@ -280,4 +305,4 @@ <h3 class="text-lg font-semibold text-gray-900 mb-4">빠른 이동</h3>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From 1d4dcb2db20f2d023f0ee88612564dd698958a62 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 21:45:47 +0900
Subject: [PATCH 04/43] =?UTF-8?q?[feat]=20=EB=B3=B5=EC=8A=B5=EB=85=B8?=
 =?UTF-8?q?=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20=EB=8C=80=EC=8B=9C=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminPracticeNoteController.java          |  51 ++++++
 .../dto/AdminPracticeLogResponseDto.java      |  29 +++
 .../dto/AdminPracticeNoteResponseDto.java     |  31 ++++
 .../repository/MissionLogRepository.java      |   6 +
 .../mission/service/MissionLogService.java    |  27 +++
 .../service/PracticeNoteService.java          |  25 +++
 src/main/resources/templates/admin.html       |  30 +++-
 src/main/resources/templates/analysis.html    |  17 +-
 src/main/resources/templates/daily-users.html |   5 +-
 .../resources/templates/practice-notes.html   | 167 ++++++++++++++++++
 src/main/resources/templates/problem.html     |   5 +-
 src/main/resources/templates/problems.html    |   5 +-
 src/main/resources/templates/user.html        |   5 +-
 src/main/resources/templates/users.html       |   3 +
 14 files changed, 398 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeLogResponseDto.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeNoteResponseDto.java
 create mode 100644 src/main/resources/templates/practice-notes.html

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
new file mode 100644
index 00000000..750deaee
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
@@ -0,0 +1,51 @@
+package com.aisip.OnO.backend.admin.controller;
+
+import com.aisip.OnO.backend.admin.dto.AdminPracticeLogResponseDto;
+import com.aisip.OnO.backend.admin.dto.AdminPracticeNoteResponseDto;
+import com.aisip.OnO.backend.mission.service.MissionLogService;
+import com.aisip.OnO.backend.practicenote.service.PracticeNoteService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Slf4j
+@RequiredArgsConstructor
+@Controller
+@RequestMapping("/admin")
+public class AdminPracticeNoteController {
+
+    private final PracticeNoteService practiceNoteService;
+    private final MissionLogService missionLogService;
+
+    @GetMapping("/practice-notes")
+    public String getPracticeNotes(
+            @RequestParam(defaultValue = "0", name = "notePage") int notePage,
+            @RequestParam(defaultValue = "0", name = "logPage") int logPage,
+            @RequestParam(defaultValue = "20", name = "size") int size,
+            Model model
+    ) {
+        int selectedNotePage = Math.max(notePage, 0);
+        int selectedLogPage = Math.max(logPage, 0);
+        int selectedSize = Math.max(size, 1);
+
+        Page<AdminPracticeNoteResponseDto> practiceNotes = practiceNoteService.findAdminPracticeNotes(selectedNotePage, selectedSize);
+        Page<AdminPracticeLogResponseDto> practiceLogs = missionLogService.findAdminPracticeLogs(selectedLogPage, selectedSize);
+
+        model.addAttribute("practiceNotes", practiceNotes.getContent());
+        model.addAttribute("practiceLogs", practiceLogs.getContent());
+        model.addAttribute("notePage", selectedNotePage);
+        model.addAttribute("logPage", selectedLogPage);
+        model.addAttribute("noteTotalPages", practiceNotes.getTotalPages());
+        model.addAttribute("logTotalPages", practiceLogs.getTotalPages());
+        model.addAttribute("totalPracticeNotes", practiceNotes.getTotalElements());
+        model.addAttribute("totalPracticeLogs", practiceLogs.getTotalElements());
+        model.addAttribute("size", selectedSize);
+
+        return "practice-notes";
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeLogResponseDto.java b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeLogResponseDto.java
new file mode 100644
index 00000000..03d2b5ac
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeLogResponseDto.java
@@ -0,0 +1,29 @@
+package com.aisip.OnO.backend.admin.dto;
+
+import com.aisip.OnO.backend.mission.entity.MissionLog;
+import com.aisip.OnO.backend.practicenote.entity.PracticeNote;
+import java.time.LocalDateTime;
+
+public record AdminPracticeLogResponseDto(
+        Long missionLogId,
+        Long userId,
+        String userName,
+        String userEmail,
+        Long practiceNoteId,
+        String practiceTitle,
+        Long point,
+        LocalDateTime createdAt
+) {
+    public static AdminPracticeLogResponseDto from(MissionLog missionLog, PracticeNote practiceNote) {
+        return new AdminPracticeLogResponseDto(
+                missionLog.getId(),
+                missionLog.getUser().getId(),
+                missionLog.getUser().getName(),
+                missionLog.getUser().getEmail(),
+                missionLog.getReferenceId(),
+                practiceNote != null ? practiceNote.getTitle() : "-",
+                missionLog.getPoint(),
+                missionLog.getCreatedAt()
+        );
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeNoteResponseDto.java b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeNoteResponseDto.java
new file mode 100644
index 00000000..1a1423cf
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminPracticeNoteResponseDto.java
@@ -0,0 +1,31 @@
+package com.aisip.OnO.backend.admin.dto;
+
+import com.aisip.OnO.backend.practicenote.entity.PracticeNote;
+import com.aisip.OnO.backend.user.entity.User;
+import java.time.LocalDateTime;
+
+public record AdminPracticeNoteResponseDto(
+        Long practiceNoteId,
+        Long userId,
+        String userName,
+        String userEmail,
+        String practiceTitle,
+        Long problemCount,
+        Long practiceCount,
+        LocalDateTime lastSolvedAt,
+        LocalDateTime createdAt
+) {
+    public static AdminPracticeNoteResponseDto from(PracticeNote practiceNote, User user, Long problemCount) {
+        return new AdminPracticeNoteResponseDto(
+                practiceNote.getId(),
+                practiceNote.getUserId(),
+                user != null ? user.getName() : "-",
+                user != null ? user.getEmail() : "-",
+                practiceNote.getTitle(),
+                problemCount,
+                practiceNote.getPracticeCount(),
+                practiceNote.getLastSolvedAt(),
+                practiceNote.getCreatedAt()
+        );
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
index 7d355cd7..5c853845 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
@@ -1,9 +1,15 @@
 package com.aisip.OnO.backend.mission.repository;
 
+import com.aisip.OnO.backend.mission.entity.MissionType;
 import com.aisip.OnO.backend.mission.entity.MissionLog;
 import java.util.List;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MissionLogRepository extends JpaRepository<MissionLog, Long>, MissionLogRepositoryCustom {
     List<MissionLog> findAllByUserId(Long userId);
+
+    List<MissionLog> findAllByMissionType(MissionType missionType, Pageable pageable);
+
+    long countByMissionType(MissionType missionType);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index 730924ae..f4654928 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -1,11 +1,14 @@
 package com.aisip.OnO.backend.mission.service;
 
+import com.aisip.OnO.backend.admin.dto.AdminPracticeLogResponseDto;
 import com.aisip.OnO.backend.common.exception.ApplicationException;
 import com.aisip.OnO.backend.mission.dto.MissionRegisterDto;
 import com.aisip.OnO.backend.mission.entity.MissionLog;
 import com.aisip.OnO.backend.mission.entity.MissionType;
 import com.aisip.OnO.backend.mission.exception.MissionErrorCase;
 import com.aisip.OnO.backend.mission.repository.MissionLogRepository;
+import com.aisip.OnO.backend.practicenote.entity.PracticeNote;
+import com.aisip.OnO.backend.practicenote.repository.PracticeNoteRepository;
 import com.aisip.OnO.backend.user.entity.User;
 import com.aisip.OnO.backend.user.repository.UserRepository;
 import java.time.LocalDate;
@@ -13,6 +16,10 @@
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,6 +32,8 @@ public class MissionLogService {
 
     private final UserRepository userRepository;
 
+    private final PracticeNoteRepository practiceNoteRepository;
+
     private static final Long DAILY_MISSION_POINT_LIMIT = 200L;
 
     public Long registerMissionLog(@NotNull MissionRegisterDto missionRegisterDto) {
@@ -167,4 +176,22 @@ public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalD
     public List<com.aisip.OnO.backend.user.entity.User> getActiveUsersByDate(LocalDate date) {
         return missionLogRepository.getActiveUsersByDate(date);
     }
+
+    @Transactional(readOnly = true)
+    public Page<AdminPracticeLogResponseDto> findAdminPracticeLogs(int page, int size) {
+        PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        List<MissionLog> missionLogs = missionLogRepository.findAllByMissionType(MissionType.NOTE_PRACTICE, pageRequest);
+        long total = missionLogRepository.countByMissionType(MissionType.NOTE_PRACTICE);
+
+        List<AdminPracticeLogResponseDto> content = missionLogs.stream()
+                .map(missionLog -> {
+                    PracticeNote practiceNote = missionLog.getReferenceId() != null
+                            ? practiceNoteRepository.findById(missionLog.getReferenceId()).orElse(null)
+                            : null;
+                    return AdminPracticeLogResponseDto.from(missionLog, practiceNote);
+                })
+                .toList();
+
+        return new PageImpl<>(content, pageRequest, total);
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
index 624e554b..cb940ef4 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.practicenote.service;
 
+import com.aisip.OnO.backend.admin.dto.AdminPracticeNoteResponseDto;
 import com.aisip.OnO.backend.common.exception.ApplicationException;
 import com.aisip.OnO.backend.common.response.CursorPageResponse;
 import com.aisip.OnO.backend.mission.service.MissionLogService;
@@ -13,8 +14,14 @@
 import com.aisip.OnO.backend.problem.exception.ProblemErrorCase;
 import com.aisip.OnO.backend.problem.repository.ProblemRepository;
 import com.aisip.OnO.backend.practicenote.repository.PracticeNoteRepository;
+import com.aisip.OnO.backend.user.entity.User;
+import com.aisip.OnO.backend.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +46,8 @@ public class PracticeNoteService {
 
     private final MissionLogService missionLogService;
 
+    private final UserRepository userRepository;
+
     private PracticeNote getPracticeEntity(Long practiceId){
 
         return practiceNoteRepository.findById(practiceId)
@@ -226,4 +235,20 @@ public CursorPageResponse<PracticeNoteThumbnailResponseDto> findPracticeThumbnai
         log.info("userId: {} find practice thumbnails with cursor: {}, size: {}, hasNext: {}", userId, cursor, size, hasNext);
         return CursorPageResponse.of(dtoList, nextCursor, hasNext, size);
     }
+
+    @Transactional(readOnly = true)
+    public Page<AdminPracticeNoteResponseDto> findAdminPracticeNotes(int page, int size) {
+        PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        Page<PracticeNote> practiceNotePage = practiceNoteRepository.findAll(pageRequest);
+
+        List<AdminPracticeNoteResponseDto> content = practiceNotePage.getContent().stream()
+                .map(practiceNote -> {
+                    User user = userRepository.findById(practiceNote.getUserId()).orElse(null);
+                    Long problemCount = (long) practiceNoteRepository.findProblemIdListByPracticeNoteId(practiceNote.getId()).size();
+                    return AdminPracticeNoteResponseDto.from(practiceNote, user, problemCount);
+                })
+                .toList();
+
+        return new PageImpl<>(content, pageRequest, practiceNotePage.getTotalElements());
+    }
 }
diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html
index c5ad9724..ee8307c6 100644
--- a/src/main/resources/templates/admin.html
+++ b/src/main/resources/templates/admin.html
@@ -18,6 +18,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/main}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             대시보드
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <form th:action="@{/logout}" method="post">
             <button type="submit" class="bg-red-500 hover:bg-red-600 text-white px-4 py-2 rounded-md text-sm font-medium transition duration-150">
               로그아웃
@@ -37,7 +40,7 @@ <h2 class="text-3xl font-bold text-gray-900 mb-2">관리자 대시보드</h2>
     </div>
 
     <!-- Grid Cards -->
-    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
       <!-- Users Card -->
       <a th:href="@{/admin/users}" class="block group">
         <div class="bg-white rounded-lg shadow-md hover:shadow-xl transition-shadow duration-300 p-6 border-l-4 border-blue-500">
@@ -74,6 +77,24 @@ <h3 class="text-xl font-semibold text-gray-800 mb-2">문제 관리</h3>
         </div>
       </a>
 
+      <!-- Practice Notes Card -->
+      <a th:href="@{/admin/practice-notes}" class="block group">
+        <div class="bg-white rounded-lg shadow-md hover:shadow-xl transition-shadow duration-300 p-6 border-l-4 border-pink-500">
+          <div class="flex items-center justify-between mb-4">
+            <div class="p-3 bg-pink-100 rounded-full">
+              <svg class="w-8 h-8 text-pink-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6l4 2m4-2a8 8 0 11-16 0 8 8 0 0116 0z"></path>
+              </svg>
+            </div>
+            <svg class="w-6 h-6 text-gray-400 group-hover:text-pink-600 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path>
+            </svg>
+          </div>
+          <h3 class="text-xl font-semibold text-gray-800 mb-2">복습 관리</h3>
+          <p class="text-gray-600 text-sm">복습노트 및 복습 기록 조회</p>
+        </div>
+      </a>
+
       <!-- Analytics Card -->
       <a th:href="@{/admin/analysis}" class="block group">
         <div class="bg-white rounded-lg shadow-md hover:shadow-xl transition-shadow duration-300 p-6 border-l-4 border-purple-500">
@@ -96,13 +117,16 @@ <h3 class="text-xl font-semibold text-gray-800 mb-2">통계 분석</h3>
     <!-- Quick Stats -->
     <div class="mt-12 bg-white rounded-lg shadow-md p-6">
       <h3 class="text-lg font-semibold text-gray-800 mb-4">빠른 이동</h3>
-      <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+      <div class="grid grid-cols-1 md:grid-cols-4 gap-4">
         <a th:href="@{/admin/users(page=0)}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
           <p class="text-sm text-gray-600">최신 유저 목록 보기</p>
         </a>
         <a th:href="@{/admin/problems(page=0)}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
           <p class="text-sm text-gray-600">최신 문제 목록 보기</p>
         </a>
+        <a th:href="@{/admin/practice-notes}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
+          <p class="text-sm text-gray-600">복습 목록 보기</p>
+        </a>
         <a th:href="@{/admin/analysis}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
           <p class="text-sm text-gray-600">통계 보기</p>
         </a>
@@ -110,4 +134,4 @@ <h3 class="text-lg font-semibold text-gray-800 mb-4">빠른 이동</h3>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 66015b23..7b10391f 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">
             통계
           </a>
@@ -265,7 +268,7 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
     <!-- Quick Actions -->
     <div class="bg-white rounded-lg shadow-md p-6">
       <h3 class="text-lg font-semibold text-gray-900 mb-4">빠른 이동</h3>
-      <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+      <div class="grid grid-cols-1 md:grid-cols-4 gap-4">
         <a th:href="@{/admin/users}" class="flex items-center p-4 bg-blue-50 hover:bg-blue-100 rounded-lg transition-colors group">
           <div class="p-2 bg-blue-200 rounded-lg group-hover:bg-blue-300 transition-colors">
             <svg class="w-6 h-6 text-blue-700" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -290,6 +293,18 @@ <h3 class="text-lg font-semibold text-gray-900 mb-4">빠른 이동</h3>
           </div>
         </a>
 
+        <a th:href="@{/admin/practice-notes}" class="flex items-center p-4 bg-pink-50 hover:bg-pink-100 rounded-lg transition-colors group">
+          <div class="p-2 bg-pink-200 rounded-lg group-hover:bg-pink-300 transition-colors">
+            <svg class="w-6 h-6 text-pink-700" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6l4 2m4-2a8 8 0 11-16 0 8 8 0 0116 0z"></path>
+            </svg>
+          </div>
+          <div class="ml-4">
+            <p class="text-sm font-medium text-gray-900">복습 관리</p>
+            <p class="text-xs text-gray-500">복습노트 및 기록 보기</p>
+          </div>
+        </a>
+
         <a th:href="@{/admin/main}" class="flex items-center p-4 bg-purple-50 hover:bg-purple-100 rounded-lg transition-colors group">
           <div class="p-2 bg-purple-200 rounded-lg group-hover:bg-purple-300 transition-colors">
             <svg class="w-6 h-6 text-purple-700" fill="none" stroke="currentColor" viewBox="0 0 24 24">
diff --git a/src/main/resources/templates/daily-users.html b/src/main/resources/templates/daily-users.html
index b9896d8d..6a3354be 100644
--- a/src/main/resources/templates/daily-users.html
+++ b/src/main/resources/templates/daily-users.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">
             통계
           </a>
@@ -108,4 +111,4 @@ <h2 class="text-2xl font-bold text-gray-900">
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/practice-notes.html b/src/main/resources/templates/practice-notes.html
new file mode 100644
index 00000000..2a3bdf3a
--- /dev/null
+++ b/src/main/resources/templates/practice-notes.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>OnO 관리자 - 복습 관리</title>
+  <script src="https://cdn.tailwindcss.com"></script>
+</head>
+<body class="bg-gradient-to-br from-gray-50 to-gray-100 min-h-screen">
+  <nav class="bg-white shadow-lg">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+      <div class="flex justify-between h-16">
+        <div class="flex items-center">
+          <a th:href="@{/admin/main}">
+            <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
+          </a>
+        </div>
+        <div class="flex items-center space-x-4">
+          <a th:href="@{/admin/main}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">대시보드</a>
+          <a th:href="@{/admin/users}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">유저</a>
+          <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">문제</a>
+          <a th:href="@{/admin/practice-notes}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">복습</a>
+          <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">통계</a>
+          <form th:action="@{/logout}" method="post">
+            <button type="submit" class="bg-red-500 hover:bg-red-600 text-white px-4 py-2 rounded-md text-sm font-medium transition duration-150">
+              로그아웃
+            </button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </nav>
+
+  <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+    <div class="mb-6">
+      <h2 class="text-2xl font-bold text-gray-900">복습 관리</h2>
+      <p class="text-gray-600 mt-1">
+        복습노트 <span class="font-semibold text-indigo-600" th:text="${totalPracticeNotes}">0</span>개,
+        복습 기록 <span class="font-semibold text-pink-600" th:text="${totalPracticeLogs}">0</span>개
+      </p>
+    </div>
+
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-8">
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-indigo-500">
+        <p class="text-sm font-medium text-gray-500 uppercase">총 복습노트 수</p>
+        <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${totalPracticeNotes}">0</p>
+      </div>
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-pink-500">
+        <p class="text-sm font-medium text-gray-500 uppercase">총 복습 기록 수</p>
+        <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${totalPracticeLogs}">0</p>
+      </div>
+    </div>
+
+    <section class="bg-white rounded-lg shadow-md overflow-hidden mb-8">
+      <div class="px-6 py-4 bg-gray-50 border-b border-gray-200 flex items-center justify-between">
+        <h3 class="text-lg font-semibold text-gray-900">복습노트 목록</h3>
+        <form th:action="@{/admin/practice-notes}" method="get" class="flex items-center space-x-2">
+          <input type="hidden" name="notePage" value="0">
+          <input type="hidden" name="logPage" th:value="${logPage}">
+          <select name="size" class="rounded-md border-gray-300 text-sm">
+            <option value="20" th:selected="${size == 20}">20개</option>
+            <option value="50" th:selected="${size == 50}">50개</option>
+            <option value="100" th:selected="${size == 100}">100개</option>
+          </select>
+          <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white px-3 py-2 rounded-md text-sm font-medium">적용</button>
+        </form>
+      </div>
+      <div class="overflow-x-auto">
+        <table class="min-w-full divide-y divide-gray-200">
+          <thead class="bg-gray-50">
+            <tr>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트 ID</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">제목</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">문제 수</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습 횟수</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">마지막 복습일</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">작성일</th>
+            </tr>
+          </thead>
+          <tbody class="bg-white divide-y divide-gray-200">
+            <tr th:each="note : ${practiceNotes}" class="hover:bg-gray-50">
+              <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${note.practiceNoteId}">1</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600">
+                <a th:href="@{/admin/user/{userId}(userId=${note.userId})}" class="text-indigo-600 hover:text-indigo-800 font-medium" th:text="${note.userName}">유저</a>
+                <p class="text-xs text-gray-500" th:text="${note.userEmail}">user@example.com</p>
+              </td>
+              <td class="px-6 py-4 text-sm text-gray-900" th:text="${note.practiceTitle}">복습노트</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${note.problemCount}">0</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${note.practiceCount}">0</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600">
+                <span th:if="${note.lastSolvedAt != null}" th:text="${#temporals.format(note.lastSolvedAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</span>
+                <span th:unless="${note.lastSolvedAt != null}" class="text-gray-400">-</span>
+              </td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(note.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
+            </tr>
+            <tr th:if="${#lists.isEmpty(practiceNotes)}">
+              <td colspan="7" class="px-6 py-8 text-center text-gray-500">복습노트가 없습니다</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div th:if="${noteTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex justify-end space-x-2">
+        <a th:if="${notePage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage - 1}, logPage=${logPage}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
+        <span th:if="${notePage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
+        <span class="px-4 py-2 text-sm text-gray-600">
+          <span th:text="${notePage + 1}">1</span> / <span th:text="${noteTotalPages}">1</span>
+        </span>
+        <a th:if="${notePage < noteTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage + 1}, logPage=${logPage}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
+        <span th:if="${notePage >= noteTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
+      </div>
+    </section>
+
+    <section class="bg-white rounded-lg shadow-md overflow-hidden">
+      <div class="px-6 py-4 bg-gray-50 border-b border-gray-200">
+        <h3 class="text-lg font-semibold text-gray-900">복습 기록</h3>
+      </div>
+      <div class="overflow-x-auto">
+        <table class="min-w-full divide-y divide-gray-200">
+          <thead class="bg-gray-50">
+            <tr>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">기록 ID</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">포인트</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">완료일</th>
+            </tr>
+          </thead>
+          <tbody class="bg-white divide-y divide-gray-200">
+            <tr th:each="log : ${practiceLogs}" class="hover:bg-gray-50">
+              <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${log.missionLogId}">1</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600">
+                <a th:href="@{/admin/user/{userId}(userId=${log.userId})}" class="text-indigo-600 hover:text-indigo-800 font-medium" th:text="${log.userName}">유저</a>
+                <p class="text-xs text-gray-500" th:text="${log.userEmail}">user@example.com</p>
+              </td>
+              <td class="px-6 py-4 text-sm text-gray-900">
+                <span th:text="${log.practiceTitle}">복습노트</span>
+                <span class="text-xs text-gray-500" th:text="'#' + ${log.practiceNoteId}">#1</span>
+              </td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${log.point} + 'pt'">15pt</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(log.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
+            </tr>
+            <tr th:if="${#lists.isEmpty(practiceLogs)}">
+              <td colspan="5" class="px-6 py-8 text-center text-gray-500">복습 기록이 없습니다</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div th:if="${logTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex justify-end space-x-2">
+        <a th:if="${logPage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage - 1}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
+        <span th:if="${logPage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
+        <span class="px-4 py-2 text-sm text-gray-600">
+          <span th:text="${logPage + 1}">1</span> / <span th:text="${logTotalPages}">1</span>
+        </span>
+        <a th:if="${logPage < logTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage + 1}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
+        <span th:if="${logPage >= logTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
+      </div>
+    </section>
+  </div>
+</body>
+</html>
diff --git a/src/main/resources/templates/problem.html b/src/main/resources/templates/problem.html
index 1eaa1dc4..6595da26 100644
--- a/src/main/resources/templates/problem.html
+++ b/src/main/resources/templates/problem.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             통계
           </a>
@@ -227,4 +230,4 @@ <h3 class="text-lg font-semibold text-gray-900">AI 분석 결과</h3>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/problems.html b/src/main/resources/templates/problems.html
index 4ff00d15..716e7148 100644
--- a/src/main/resources/templates/problems.html
+++ b/src/main/resources/templates/problems.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             통계
           </a>
@@ -177,4 +180,4 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html
index 064f835a..e99f0fed 100644
--- a/src/main/resources/templates/user.html
+++ b/src/main/resources/templates/user.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             통계
           </a>
@@ -454,4 +457,4 @@ <h3 class="text-lg font-medium text-gray-900 mb-4" id="modalTitle">레벨 수정
     }
   </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index ada8a187..c10e2bb9 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -26,6 +26,9 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
           <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             문제
           </a>
+          <a th:href="@{/admin/practice-notes}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
+            복습
+          </a>
           <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">
             통계
           </a>

From aa6c805631ac241cfc8de9d880cd3af72e6544af Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 22:36:47 +0900
Subject: [PATCH 05/43] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B5=9C=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   | 22 +++++-
 .../repository/MissionLogRepository.java      | 22 ++++++
 .../repository/MissionLogRepositoryImpl.java  | 42 +++++++----
 .../mission/service/MissionLogService.java    | 44 ++++++++++++
 .../repository/PracticeNoteRepository.java    | 14 ++++
 .../service/PracticeNoteService.java          | 42 +++++++++++
 .../problem/service/ProblemService.java       |  5 ++
 .../user/repository/UserRepository.java       | 17 +++++
 .../OnO/backend/user/service/UserService.java | 53 +++++++-------
 src/main/resources/templates/analysis.html    | 69 +++++++++++++++++--
 10 files changed, 285 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index c237280c..17ca66a9 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -1,6 +1,7 @@
 package com.aisip.OnO.backend.admin.controller;
 
 import com.aisip.OnO.backend.mission.service.MissionLogService;
+import com.aisip.OnO.backend.practicenote.service.PracticeNoteService;
 import com.aisip.OnO.backend.problem.service.ProblemService;
 import com.aisip.OnO.backend.user.dto.UserResponseDto;
 import com.aisip.OnO.backend.user.entity.User;
@@ -28,6 +29,7 @@ public class AdminAnalysisController {
     private final UserService userService;
     private final ProblemService problemService;
     private final MissionLogService missionLogService;
+    private final PracticeNoteService practiceNoteService;
 
     @GetMapping("/analysis")
     public String getAllAnalysis(
@@ -37,8 +39,10 @@ public String getAllAnalysis(
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
             Model model
     ) {
-        int allUserCount = userService.findAllUsers().size();
-        int allProblemCount = problemService.findAllProblems().size();
+        long allUserCount = userService.countAllUsers();
+        long allProblemCount = problemService.countAllProblems();
+        long allPracticeNoteCount = practiceNoteService.countAllPracticeNotes();
+        long allPracticeLogCount = missionLogService.countNotePracticeLogs();
 
         LocalDate today = LocalDate.now();
         LocalDate selectedStartDate = startDate != null ? startDate : today.minusDays(29);
@@ -53,11 +57,19 @@ public String getAllAnalysis(
         // 선택 기간 날짜별 출석 유저 수 및 신규 가입자 수
         Map<LocalDate, Long> dailyActiveUsers = missionLogService.getDailyActiveUsersCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(selectedStartDate, selectedEndDate);
+        Map<LocalDate, Long> dailyPracticeNotes = practiceNoteService.getDailyPracticeNotesCount(selectedStartDate, selectedEndDate);
+        Map<LocalDate, Long> dailyPracticeLogs = missionLogService.getDailyNotePracticeLogsCount(selectedStartDate, selectedEndDate);
 
         // 선택 기간 신규 가입자 총합
         long recentNewUsersCount = dailyNewUsers.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
+        long periodPracticeNoteCount = dailyPracticeNotes.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
+        long periodPracticeLogCount = dailyPracticeLogs.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
 
         // 하루 평균 방문자 수 (선택 기간)
         double averageDailyVisitors = dailyActiveUsers.values().stream()
@@ -67,9 +79,15 @@ public String getAllAnalysis(
 
         model.addAttribute("allUserCount", allUserCount);
         model.addAttribute("allProblemCount", allProblemCount);
+        model.addAttribute("allPracticeNoteCount", allPracticeNoteCount);
+        model.addAttribute("allPracticeLogCount", allPracticeLogCount);
         model.addAttribute("dailyActiveUsers", dailyActiveUsers);
         model.addAttribute("dailyNewUsers", dailyNewUsers);
+        model.addAttribute("dailyPracticeNotes", dailyPracticeNotes);
+        model.addAttribute("dailyPracticeLogs", dailyPracticeLogs);
         model.addAttribute("recentNewUsersCount", recentNewUsersCount);
+        model.addAttribute("periodPracticeNoteCount", periodPracticeNoteCount);
+        model.addAttribute("periodPracticeLogCount", periodPracticeLogCount);
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
         model.addAttribute("startDate", selectedStartDate);
         model.addAttribute("endDate", selectedEndDate);
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
index 5c853845..05c0866e 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
@@ -2,9 +2,12 @@
 
 import com.aisip.OnO.backend.mission.entity.MissionType;
 import com.aisip.OnO.backend.mission.entity.MissionLog;
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface MissionLogRepository extends JpaRepository<MissionLog, Long>, MissionLogRepositoryCustom {
     List<MissionLog> findAllByUserId(Long userId);
@@ -12,4 +15,23 @@ public interface MissionLogRepository extends JpaRepository<MissionLog, Long>, M
     List<MissionLog> findAllByMissionType(MissionType missionType, Pageable pageable);
 
     long countByMissionType(MissionType missionType);
+
+    long countByMissionTypeAndCreatedAtBetween(
+            MissionType missionType,
+            LocalDateTime startDateTime,
+            LocalDateTime endDateTime
+    );
+
+    @Query("""
+            SELECT FUNCTION('DATE', m.createdAt), COUNT(m)
+            FROM MissionLog m
+            WHERE m.missionType = :missionType
+              AND m.createdAt BETWEEN :startDateTime AND :endDateTime
+            GROUP BY FUNCTION('DATE', m.createdAt)
+            """)
+    List<Object[]> countDailyByMissionType(
+            @Param("missionType") MissionType missionType,
+            @Param("startDateTime") LocalDateTime startDateTime,
+            @Param("endDateTime") LocalDateTime endDateTime
+    );
 }
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
index e4121667..903b86e4 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
@@ -2,6 +2,10 @@
 
 import com.aisip.OnO.backend.mission.entity.MissionType;
 import com.aisip.OnO.backend.user.entity.User;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 
@@ -94,21 +98,33 @@ public Map<LocalDate, Long> getDailyActiveUsersCount(int days) {
     @Override
     public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalDate endDate) {
         Map<LocalDate, Long> result = new LinkedHashMap<>();
+        DateExpression<LocalDate> createdDate = Expressions.dateTemplate(
+                LocalDate.class,
+                "date({0})",
+                missionLog.createdAt
+        );
+        NumberExpression<Long> activeUserCount = missionLog.user.id.countDistinct();
+
+        java.util.List<Tuple> dailyCounts = queryFactory
+                .select(createdDate, activeUserCount)
+                .from(missionLog)
+                .where(missionLog.missionType.eq(MissionType.USER_LOGIN)
+                        .and(missionLog.createdAt.between(startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX)))
+                )
+                .groupBy(createdDate)
+                .fetch();
+
+        Map<LocalDate, Long> countByDate = new LinkedHashMap<>();
+        for (Tuple row : dailyCounts) {
+            LocalDate date = row.get(createdDate);
+            Long count = row.get(activeUserCount);
+            if (date != null) {
+                countByDate.put(date, count != null ? count : 0L);
+            }
+        }
 
-        // 최근 날짜가 위로 오도록 역순으로 조회
         for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
-            LocalDateTime startOfDay = date.atStartOfDay();
-            LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
-
-            Long count = queryFactory
-                    .select(missionLog.user.id.countDistinct())
-                    .from(missionLog)
-                    .where(missionLog.missionType.eq(MissionType.USER_LOGIN)
-                            .and(missionLog.createdAt.between(startOfDay, endOfDay))
-                    )
-                    .fetchOne();
-
-            result.put(date, count != null ? count : 0L);
+            result.put(date, countByDate.getOrDefault(date, 0L));
         }
 
         return result;
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index f4654928..c8429880 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -11,7 +11,12 @@
 import com.aisip.OnO.backend.practicenote.repository.PracticeNoteRepository;
 import com.aisip.OnO.backend.user.entity.User;
 import com.aisip.OnO.backend.user.repository.UserRepository;
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
@@ -194,4 +199,43 @@ public Page<AdminPracticeLogResponseDto> findAdminPracticeLogs(int page, int siz
 
         return new PageImpl<>(content, pageRequest, total);
     }
+
+    @Transactional(readOnly = true)
+    public long countNotePracticeLogs() {
+        return missionLogRepository.countByMissionType(MissionType.NOTE_PRACTICE);
+    }
+
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyNotePracticeLogsCount(LocalDate startDate, LocalDate endDate) {
+        Map<LocalDate, Long> result = new LinkedHashMap<>();
+        missionLogRepository.countDailyByMissionType(
+                        MissionType.NOTE_PRACTICE,
+                        startDate.atStartOfDay(),
+                        endDate.atTime(LocalTime.MAX)
+                )
+                .forEach(row -> result.put(toLocalDate(row[0]), (Long) row[1]));
+
+        Map<LocalDate, Long> orderedResult = new LinkedHashMap<>();
+        for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
+            orderedResult.put(date, result.getOrDefault(date, 0L));
+        }
+
+        return orderedResult;
+    }
+
+    private LocalDate toLocalDate(Object value) {
+        if (value instanceof LocalDate localDate) {
+            return localDate;
+        }
+        if (value instanceof LocalDateTime localDateTime) {
+            return localDateTime.toLocalDate();
+        }
+        if (value instanceof Date date) {
+            return date.toLocalDate();
+        }
+        if (value instanceof Timestamp timestamp) {
+            return timestamp.toLocalDateTime().toLocalDate();
+        }
+        return LocalDate.parse(value.toString());
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java b/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
index da8b8479..05732cc1 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
@@ -5,12 +5,26 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface PracticeNoteRepository extends JpaRepository<PracticeNote, Long>, PracticeNoteRepositoryCustom {
 
     List<PracticeNote> findAllByUserId(Long userId);
 
+    long countByCreatedAtBetween(LocalDateTime startDateTime, LocalDateTime endDateTime);
+
+    @Query("""
+            SELECT FUNCTION('DATE', p.createdAt), COUNT(p)
+            FROM PracticeNote p
+            WHERE p.createdAt BETWEEN :startDateTime AND :endDateTime
+            GROUP BY FUNCTION('DATE', p.createdAt)
+            """)
+    List<Object[]> countDailyPracticeNotes(
+            @Param("startDateTime") LocalDateTime startDateTime,
+            @Param("endDateTime") LocalDateTime endDateTime
+    );
+
     @Query("SELECT p.id FROM PracticeNote p WHERE p.userId = :userId")
     List<Long> findAllPracticeIdsByUserId(@Param("userId") Long userId);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
index cb940ef4..ca3f5f6f 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
@@ -25,7 +25,14 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Date;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -251,4 +258,39 @@ public Page<AdminPracticeNoteResponseDto> findAdminPracticeNotes(int page, int s
 
         return new PageImpl<>(content, pageRequest, practiceNotePage.getTotalElements());
     }
+
+    @Transactional(readOnly = true)
+    public long countAllPracticeNotes() {
+        return practiceNoteRepository.count();
+    }
+
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyPracticeNotesCount(LocalDate startDate, LocalDate endDate) {
+        Map<LocalDate, Long> result = new LinkedHashMap<>();
+        practiceNoteRepository.countDailyPracticeNotes(startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX))
+                .forEach(row -> result.put(toLocalDate(row[0]), (Long) row[1]));
+
+        Map<LocalDate, Long> orderedResult = new LinkedHashMap<>();
+        for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
+            orderedResult.put(date, result.getOrDefault(date, 0L));
+        }
+
+        return orderedResult;
+    }
+
+    private LocalDate toLocalDate(Object value) {
+        if (value instanceof LocalDate localDate) {
+            return localDate;
+        }
+        if (value instanceof LocalDateTime localDateTime) {
+            return localDateTime.toLocalDate();
+        }
+        if (value instanceof Date date) {
+            return date.toLocalDate();
+        }
+        if (value instanceof Timestamp timestamp) {
+            return timestamp.toLocalDateTime().toLocalDate();
+        }
+        return LocalDate.parse(value.toString());
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index d7ed5ee9..267f03b2 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -126,6 +126,11 @@ public List<ProblemResponseDto> findAllProblems() {
                 .collect(Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    public long countAllProblems() {
+        return problemRepository.count();
+    }
+
     @Transactional(readOnly = true)
     public Long findProblemCountByUser(Long userId) {
         log.info("userId: {} find problem count", userId);
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
index e3476947..f30042f1 100644
--- a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
@@ -4,7 +4,11 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
@@ -15,4 +19,17 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByName(String name);
 
     Page<User> findAll(Pageable pageable);
+
+    List<User> findAllByCreatedAtBetweenOrderByCreatedAtDesc(LocalDateTime startDateTime, LocalDateTime endDateTime);
+
+    @Query("""
+            SELECT FUNCTION('DATE', u.createdAt), COUNT(u)
+            FROM User u
+            WHERE u.createdAt BETWEEN :startDateTime AND :endDateTime
+            GROUP BY FUNCTION('DATE', u.createdAt)
+            """)
+    List<Object[]> countDailyNewUsers(
+            @Param("startDateTime") LocalDateTime startDateTime,
+            @Param("endDateTime") LocalDateTime endDateTime
+    );
 }
diff --git a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
index 3c940d0a..8915b7dc 100644
--- a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
+++ b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
@@ -17,6 +17,8 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -103,6 +105,11 @@ public List<UserResponseDto> findAllUsers() {
                 .collect(Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    public long countAllUsers() {
+        return userRepository.count();
+    }
+
     @Transactional
     public void updateUser(Long userId, UserRegisterDto userRegisterDto) {
 
@@ -163,26 +170,15 @@ public Map<LocalDate, Long> getDailyNewUsersCount(int days) {
     @Transactional(readOnly = true)
     public Map<LocalDate, Long> getDailyNewUsersCount(LocalDate startDate, LocalDate endDate) {
         Map<LocalDate, Long> result = new LinkedHashMap<>();
-        List<User> allUsers = userRepository.findAll();
+        userRepository.countDailyNewUsers(startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX))
+                .forEach(row -> result.put(toLocalDate(row[0]), (Long) row[1]));
 
-        // 최근 날짜가 위로 오도록 역순으로 조회
+        Map<LocalDate, Long> orderedResult = new LinkedHashMap<>();
         for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
-            LocalDateTime startOfDay = date.atStartOfDay();
-            LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
-
-            long count = allUsers.stream()
-                    .filter(user -> {
-                        LocalDateTime createdAt = user.getCreatedAt();
-                        return createdAt != null &&
-                                !createdAt.isBefore(startOfDay) &&
-                                !createdAt.isAfter(endOfDay);
-                    })
-                    .count();
-
-            result.put(date, count);
+            orderedResult.put(date, result.getOrDefault(date, 0L));
         }
 
-        return result;
+        return orderedResult;
     }
 
     @Transactional(readOnly = true)
@@ -190,15 +186,24 @@ public List<UserResponseDto> getUsersByDate(LocalDate date) {
         LocalDateTime startOfDay = date.atStartOfDay();
         LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
 
-        return userRepository.findAll().stream()
-                .filter(user -> {
-                    LocalDateTime createdAt = user.getCreatedAt();
-                    return createdAt != null &&
-                            !createdAt.isBefore(startOfDay) &&
-                            !createdAt.isAfter(endOfDay);
-                })
-                .sorted((u1, u2) -> u2.getCreatedAt().compareTo(u1.getCreatedAt()))
+        return userRepository.findAllByCreatedAtBetweenOrderByCreatedAtDesc(startOfDay, endOfDay).stream()
                 .map(UserResponseDto::from)
                 .collect(Collectors.toList());
     }
+
+    private LocalDate toLocalDate(Object value) {
+        if (value instanceof LocalDate localDate) {
+            return localDate;
+        }
+        if (value instanceof LocalDateTime localDateTime) {
+            return localDateTime.toLocalDate();
+        }
+        if (value instanceof Date date) {
+            return date.toLocalDate();
+        }
+        if (value instanceof Timestamp timestamp) {
+            return timestamp.toLocalDateTime().toLocalDate();
+        }
+        return LocalDate.parse(value.toString());
+    }
 }
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 7b10391f..057d0eff 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -151,20 +151,37 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
       </div>
 
       <!-- System Health -->
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-pink-500">
+        <div class="flex items-center justify-between">
+          <div>
+            <p class="text-sm font-medium text-gray-500 uppercase">총 복습노트 수</p>
+            <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${allPracticeNoteCount}">0</p>
+          </div>
+          <div class="p-3 bg-pink-100 rounded-full">
+            <svg class="w-8 h-8 text-pink-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6l4 2m4-2a8 8 0 11-16 0 8 8 0 0116 0z"></path>
+            </svg>
+          </div>
+        </div>
+        <div class="mt-4">
+          <a th:href="@{/admin/practice-notes}" class="text-sm text-pink-600 hover:text-pink-800 font-medium">복습 관리 보기 →</a>
+        </div>
+      </div>
+
       <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-indigo-500">
         <div class="flex items-center justify-between">
           <div>
-            <p class="text-sm font-medium text-gray-500 uppercase">시스템 상태</p>
-            <p class="mt-2 text-xl font-bold text-green-600">정상</p>
+            <p class="text-sm font-medium text-gray-500 uppercase">총 복습 기록 수</p>
+            <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${allPracticeLogCount}">0</p>
           </div>
           <div class="p-3 bg-indigo-100 rounded-full">
             <svg class="w-8 h-8 text-indigo-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2m-4 0V3m0 2v4m0-4h4m-4 0H7"></path>
             </svg>
           </div>
         </div>
         <div class="mt-4">
-          <p class="text-sm text-gray-500">모든 시스템 작동 중</p>
+          <p class="text-xs text-gray-500">복습노트 사용 미션 기준</p>
         </div>
       </div>
     </div>
@@ -175,7 +192,7 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
         <h3 class="text-lg font-semibold text-gray-900">상세 통계</h3>
       </div>
       <div class="p-6">
-        <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
+        <div class="grid grid-cols-1 md:grid-cols-3 gap-8">
           <!-- User Statistics -->
           <div>
             <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
@@ -207,6 +224,34 @@ <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
               </div>
             </div>
           </div>
+
+          <!-- Practice Statistics -->
+          <div>
+            <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
+              <svg class="w-5 h-5 mr-2 text-pink-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6l4 2m4-2a8 8 0 11-16 0 8 8 0 0116 0z"></path>
+              </svg>
+              복습 통계
+            </h4>
+            <div class="space-y-3">
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">총 복습노트 수</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${allPracticeNoteCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">총 복습 기록 수</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${allPracticeLogCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 복습노트 생성</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${periodPracticeNoteCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 복습 수행</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${periodPracticeLogCount}">0</span>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -224,6 +269,8 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">날짜</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">출석 유저 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">신규 가입자 수</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트 생성 수</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습 수행 수</th>
               </tr>
             </thead>
             <tbody class="bg-white divide-y divide-gray-200">
@@ -253,9 +300,19 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                     <span class="ml-1 text-gray-500">명</span>
                   </span>
                 </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span class="font-semibold" th:classappend="${dailyPracticeNotes[entry.key] > 0 ? 'text-pink-600' : 'text-gray-400'}"
+                        th:text="${dailyPracticeNotes[entry.key]}">0</span>
+                  <span class="ml-1 text-gray-500">개</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span class="font-semibold" th:classappend="${dailyPracticeLogs[entry.key] > 0 ? 'text-indigo-600' : 'text-gray-400'}"
+                        th:text="${dailyPracticeLogs[entry.key]}">0</span>
+                  <span class="ml-1 text-gray-500">회</span>
+                </td>
               </tr>
               <tr th:if="${#maps.isEmpty(dailyActiveUsers)}">
-                <td colspan="3" class="px-4 py-8 text-center text-gray-500">
+                <td colspan="5" class="px-4 py-8 text-center text-gray-500">
                   데이터가 없습니다
                 </td>
               </tr>

From 865d2a8f9a67dc245b85cf06bae1064055108a6f Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:05:22 +0900
Subject: [PATCH 06/43] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EB=B8=94=EB=A1=9D=20=EC=9D=B4=EB=8F=99=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/practice-notes.html   | 38 ++++++++++--
 src/main/resources/templates/problems.html    | 61 +++++++++++--------
 src/main/resources/templates/users.html       | 36 ++++++++---
 3 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/templates/practice-notes.html b/src/main/resources/templates/practice-notes.html
index 2a3bdf3a..d5df7768 100644
--- a/src/main/resources/templates/practice-notes.html
+++ b/src/main/resources/templates/practice-notes.html
@@ -101,13 +101,26 @@ <h3 class="text-lg font-semibold text-gray-900">복습노트 목록</h3>
         </table>
       </div>
 
-      <div th:if="${noteTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex justify-end space-x-2">
+      <div th:if="${noteTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex flex-wrap justify-end gap-2">
         <a th:if="${notePage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage - 1}, logPage=${logPage}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
         <span th:if="${notePage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
-        <span class="px-4 py-2 text-sm text-gray-600">
-          <span th:text="${notePage + 1}">1</span> / <span th:text="${noteTotalPages}">1</span>
+
+        <a th:if="${hasPreviousNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart - 10}, logPage=${logPage}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&lt;&lt;</a>
+        <span th:unless="${hasPreviousNoteBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&lt;&lt;</span>
+
+        <span th:each="page : ${#numbers.sequence(notePageBlockStart, notePageBlockEnd)}">
+          <a th:if="${page == notePage}"
+             class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white" th:text="${page + 1}">1</a>
+          <a th:if="${page != notePage}" th:href="@{/admin/practice-notes(notePage=${page}, logPage=${logPage}, size=${size})}"
+             class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50" th:text="${page + 1}">1</a>
         </span>
+
+        <a th:if="${hasNextNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart + 10}, logPage=${logPage}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&gt;&gt;</a>
+        <span th:unless="${hasNextNoteBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&gt;&gt;</span>
+
         <a th:if="${notePage < noteTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage + 1}, logPage=${logPage}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
         <span th:if="${notePage >= noteTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
@@ -150,13 +163,26 @@ <h3 class="text-lg font-semibold text-gray-900">복습 기록</h3>
         </table>
       </div>
 
-      <div th:if="${logTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex justify-end space-x-2">
+      <div th:if="${logTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex flex-wrap justify-end gap-2">
         <a th:if="${logPage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage - 1}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
         <span th:if="${logPage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
-        <span class="px-4 py-2 text-sm text-gray-600">
-          <span th:text="${logPage + 1}">1</span> / <span th:text="${logTotalPages}">1</span>
+
+        <a th:if="${hasPreviousLogBlock}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPageBlockStart - 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&lt;&lt;</a>
+        <span th:unless="${hasPreviousLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&lt;&lt;</span>
+
+        <span th:each="page : ${#numbers.sequence(logPageBlockStart, logPageBlockEnd)}">
+          <a th:if="${page == logPage}"
+             class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white" th:text="${page + 1}">1</a>
+          <a th:if="${page != logPage}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${page}, size=${size})}"
+             class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50" th:text="${page + 1}">1</a>
         </span>
+
+        <a th:if="${hasNextLogBlock}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPageBlockStart + 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&gt;&gt;</a>
+        <span th:unless="${hasNextLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&gt;&gt;</span>
+
         <a th:if="${logPage < logTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage + 1}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
         <span th:if="${logPage >= logTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
diff --git a/src/main/resources/templates/problems.html b/src/main/resources/templates/problems.html
index 716e7148..6c0acd1f 100644
--- a/src/main/resources/templates/problems.html
+++ b/src/main/resources/templates/problems.html
@@ -60,7 +60,6 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">폴더 ID</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">메모</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">출처</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">이미지</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">분석</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">푼 날짜</th>
               <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">작성일</th>
@@ -80,37 +79,27 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
                 <span th:unless="${problem.reference != null and !problem.reference.isEmpty()}" class="text-gray-400">-</span>
               </td>
               <td class="px-6 py-4 text-sm text-gray-600">
-                <div class="flex flex-wrap gap-1">
-                  <span th:each="image : ${problem.imageUrlList}" class="inline-block">
-                    <a th:href="@{/admin/user/image/view(url=${image.imageUrl})}" target="_blank"
-                       class="block border border-gray-200 rounded hover:border-indigo-400 transition"
-                       th:title="${image.problemImageType}">
-                      <img th:src="${image.imageUrl}"
-                           alt="문제 이미지"
-                           class="w-12 h-12 object-cover rounded">
-                    </a>
-                  </span>
-                  <span th:if="${#lists.isEmpty(problem.imageUrlList)}" class="text-gray-400 text-xs">이미지 없음</span>
-                </div>
-              </td>
-              <td class="px-6 py-4 text-sm text-gray-600">
-                <span th:if="${problem.analysis != null and problem.analysis.status == 'COMPLETED'}"
+                <span th:if="${problem.analysisStatus == 'COMPLETED'}"
                       class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-green-100 text-green-800">
                   분석 완료
                 </span>
-                <span th:if="${problem.analysis != null and problem.analysis.status == 'PENDING'}"
+                <span th:if="${problem.analysisStatus == 'PROCESSING'}"
                       class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800">
                   분석중
                 </span>
-                <span th:if="${problem.analysis != null and problem.analysis.status == 'NOT_STARTED'}"
+                <span th:if="${problem.analysisStatus == 'NOT_STARTED'}"
                       class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-blue-100 text-blue-800">
                   분석 대기
                 </span>
-                <span th:if="${problem.analysis != null and problem.analysis.status == 'FAILED'}"
+                <span th:if="${problem.analysisStatus == 'FAILED'}"
                       class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-red-100 text-red-800">
                   분석 실패
                 </span>
-                <span th:if="${problem.analysis == null}"
+                <span th:if="${problem.analysisStatus == 'NO_IMAGE'}"
+                      class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-gray-100 text-gray-600">
+                  이미지 없음
+                </span>
+                <span th:if="${problem.analysisStatus == null}"
                       class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-gray-100 text-gray-600">
                   미등록
                 </span>
@@ -122,7 +111,7 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
               <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(problem.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
             </tr>
             <tr th:if="${#lists.isEmpty(problems)}">
-              <td colspan="8" class="px-6 py-8 text-center text-gray-500">
+              <td colspan="7" class="px-6 py-8 text-center text-gray-500">
                 문제가 없습니다
               </td>
             </tr>
@@ -134,12 +123,12 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
     <!-- Pagination -->
     <div th:if="${totalPages > 1}" class="mt-6 flex items-center justify-between">
       <div class="text-sm text-gray-700">
-        <span class="font-medium" th:text="${currentPage * size + 1}">1</span>
-        부터 <span class="font-medium" th:text="${currentPage * size + #lists.size(problems)}">20</span>
+        <span class="font-medium" th:text="${pageStartItem}">1</span>
+        부터 <span class="font-medium" th:text="${pageEndItem}">20</span>
         까지 (총 <span class="font-medium" th:text="${totalProblems}">100</span>개)
       </div>
 
-      <div class="flex space-x-2">
+      <div class="flex flex-wrap justify-end gap-2">
         <!-- Previous Button -->
         <a th:if="${currentPage > 0}"
            th:href="@{/admin/problems(page=${currentPage - 1}, size=${size})}"
@@ -151,9 +140,19 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
           이전
         </span>
 
+        <a th:if="${hasPreviousBlock}"
+           th:href="@{/admin/problems(page=${pageBlockStart - 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
+          &lt;&lt;
+        </a>
+        <span th:unless="${hasPreviousBlock}"
+              class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400 cursor-not-allowed">
+          &lt;&lt;
+        </span>
+
         <!-- Page Numbers -->
-        <div class="flex space-x-1">
-          <th:block th:each="page : ${#numbers.sequence(0, totalPages - 1)}">
+        <div class="flex flex-wrap gap-1">
+          <th:block th:each="page : ${#numbers.sequence(pageBlockStart, pageBlockEnd)}">
             <a th:if="${page == currentPage}"
                class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white">
               <span th:text="${page + 1}">1</span>
@@ -166,6 +165,16 @@ <h2 class="text-2xl font-bold text-gray-900">문제 관리</h2>
           </th:block>
         </div>
 
+        <a th:if="${hasNextBlock}"
+           th:href="@{/admin/problems(page=${pageBlockStart + 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
+          &gt;&gt;
+        </a>
+        <span th:unless="${hasNextBlock}"
+              class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400 cursor-not-allowed">
+          &gt;&gt;
+        </span>
+
         <!-- Next Button -->
         <a th:if="${currentPage < totalPages - 1}"
            th:href="@{/admin/problems(page=${currentPage + 1}, size=${size})}"
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index c10e2bb9..23d63e41 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -109,7 +109,7 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
             </tr>
           </thead>
           <tbody class="bg-white divide-y divide-gray-200">
-            <tr th:each="user, iterStat : ${users}" class="hover:bg-gray-50 transition-colors cursor-pointer"
+            <tr th:each="user : ${users}" class="hover:bg-gray-50 transition-colors cursor-pointer"
                 th:onclick="'location.href=\'/admin/user/' + ${user.userId} + '\''">
               <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${user.userId}">1</td>
               <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900" th:text="${user.name}">유저 이름</td>
@@ -120,7 +120,7 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
                   <span class="ml-2 text-xs text-gray-500" th:text="'(' + ${user.totalStudyCurrentPoint} + 'pt)'"> (0pt)</span>
                 </div>
               </td>
-              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900" th:text="${problemCounts[iterStat.index]}">0</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900" th:text="${user.problemCount}">0</td>
               <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(user.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
             </tr>
             <tr th:if="${#lists.isEmpty(users)}">
@@ -136,12 +136,12 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
     <!-- Pagination -->
     <div th:if="${totalPages > 1}" class="mt-6 flex items-center justify-between">
       <div class="text-sm text-gray-700">
-        <span class="font-medium" th:text="${currentPage * size + 1}">1</span>
-        부터 <span class="font-medium" th:text="${currentPage * size + #lists.size(users)}">20</span>
+        <span class="font-medium" th:text="${pageStartItem}">1</span>
+        부터 <span class="font-medium" th:text="${pageEndItem}">20</span>
         까지 (총 <span class="font-medium" th:text="${totalUsers}">100</span>개)
       </div>
 
-      <div class="flex space-x-2">
+      <div class="flex flex-wrap justify-end gap-2">
         <!-- Previous Button -->
         <a th:if="${currentPage > 0}"
            th:href="@{/admin/users(page=${currentPage - 1}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
@@ -153,9 +153,20 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
           이전
         </span>
 
+        <!-- Previous Page Block -->
+        <a th:if="${hasPreviousBlock}"
+           th:href="@{/admin/users(page=${pageBlockStart - 10}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
+          &lt;&lt;
+        </a>
+        <span th:unless="${hasPreviousBlock}"
+              class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400 cursor-not-allowed">
+          &lt;&lt;
+        </span>
+
         <!-- Page Numbers -->
-        <div class="flex space-x-1">
-          <th:block th:each="page : ${#numbers.sequence(0, totalPages - 1)}">
+        <div class="flex flex-wrap gap-1">
+          <th:block th:each="page : ${#numbers.sequence(pageBlockStart, pageBlockEnd)}">
             <a th:if="${page == currentPage}"
                class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white">
               <span th:text="${page + 1}">1</span>
@@ -168,6 +179,17 @@ <h2 class="text-2xl font-bold text-gray-900">유저 관리</h2>
           </th:block>
         </div>
 
+        <!-- Next Page Block -->
+        <a th:if="${hasNextBlock}"
+           th:href="@{/admin/users(page=${pageBlockStart + 10}, size=${size}, sortBy=${sortBy}, direction=${direction})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
+          &gt;&gt;
+        </a>
+        <span th:unless="${hasNextBlock}"
+              class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400 cursor-not-allowed">
+          &gt;&gt;
+        </span>
+
         <!-- Next Button -->
         <a th:if="${currentPage < totalPages - 1}"
            th:href="@{/admin/users(page=${currentPage + 1}, size=${size}, sortBy=${sortBy}, direction=${direction})}"

From e23dbfaccaf02269cab046a34e484333d8704481 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:05:49 +0900
Subject: [PATCH 07/43] =?UTF-8?q?[fix]=20=ED=86=B5=EA=B3=84=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=EB=B3=84=20=EC=A1=B0=ED=9A=8C=20=ED=83=80=EC=9E=85=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   |  4 ++
 .../repository/MissionLogRepositoryImpl.java  | 20 +++++++-
 src/main/resources/templates/analysis.html    | 50 ++++++++++++-------
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index 17ca66a9..402885d3 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -91,6 +91,10 @@ public String getAllAnalysis(
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
         model.addAttribute("startDate", selectedStartDate);
         model.addAttribute("endDate", selectedEndDate);
+        model.addAttribute("quickStart7Days", today.minusDays(6));
+        model.addAttribute("quickStart30Days", today.minusDays(29));
+        model.addAttribute("quickStart90Days", today.minusDays(89));
+        model.addAttribute("today", today);
 
         return "analysis";
     }
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
index 903b86e4..f48c0450 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepositoryImpl.java
@@ -9,6 +9,8 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -116,7 +118,7 @@ public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalD
 
         Map<LocalDate, Long> countByDate = new LinkedHashMap<>();
         for (Tuple row : dailyCounts) {
-            LocalDate date = row.get(createdDate);
+            LocalDate date = toLocalDate(row.get(createdDate));
             Long count = row.get(activeUserCount);
             if (date != null) {
                 countByDate.put(date, count != null ? count : 0L);
@@ -152,4 +154,20 @@ private LocalDateTime getStartOfToday() {
     private LocalDateTime getEndOfToday() {
         return LocalDate.now().atTime(LocalTime.MAX);
     }
+
+    private LocalDate toLocalDate(Object value) {
+        if (value instanceof LocalDate localDate) {
+            return localDate;
+        }
+        if (value instanceof LocalDateTime localDateTime) {
+            return localDateTime.toLocalDate();
+        }
+        if (value instanceof Date date) {
+            return date.toLocalDate();
+        }
+        if (value instanceof Timestamp timestamp) {
+            return timestamp.toLocalDateTime().toLocalDate();
+        }
+        return value != null ? LocalDate.parse(value.toString()) : null;
+    }
 }
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 057d0eff..7b0043a1 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -50,29 +50,45 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
       <p class="text-gray-600 mt-1">OnO 애플리케이션 통계 개요</p>
     </div>
 
-    <form th:action="@{/admin/analysis}" method="get" class="mb-8 bg-white rounded-lg shadow-md p-4">
-      <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-end">
+    <form th:action="@{/admin/analysis}" method="get" class="mb-8 bg-white rounded-lg shadow-md border border-gray-100 overflow-hidden">
+      <div class="px-5 py-4 bg-gray-50 border-b border-gray-100 flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
         <div>
-          <label for="startDate" class="block text-sm font-medium text-gray-700 mb-1">시작일</label>
-          <input id="startDate" name="startDate" type="date" th:value="${startDate}"
-                 class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+          <p class="text-sm font-semibold text-gray-900">기간별 통계 조회</p>
+          <p class="mt-1 text-xs text-gray-500">
+            <span th:text="${#temporals.format(startDate, 'yyyy-MM-dd')}">2024-01-01</span>
+            부터
+            <span th:text="${#temporals.format(endDate, 'yyyy-MM-dd')}">2024-01-30</span>
+            까지
+          </p>
+        </div>
+        <div class="flex flex-wrap gap-2">
+          <a th:href="@{/admin/analysis(startDate=${quickStart7Days}, endDate=${today})}"
+             class="px-3 py-2 bg-white border border-gray-200 rounded-md text-xs font-medium text-gray-700 hover:border-indigo-300 hover:text-indigo-700 transition">최근 7일</a>
+          <a th:href="@{/admin/analysis(startDate=${quickStart30Days}, endDate=${today})}"
+             class="px-3 py-2 bg-white border border-gray-200 rounded-md text-xs font-medium text-gray-700 hover:border-indigo-300 hover:text-indigo-700 transition">최근 30일</a>
+          <a th:href="@{/admin/analysis(startDate=${quickStart90Days}, endDate=${today})}"
+             class="px-3 py-2 bg-white border border-gray-200 rounded-md text-xs font-medium text-gray-700 hover:border-indigo-300 hover:text-indigo-700 transition">최근 90일</a>
+        </div>
+      </div>
+      <div class="p-5 grid grid-cols-1 md:grid-cols-[1fr_1fr_auto] gap-4 items-end">
+        <div>
+          <label for="startDate" class="block text-xs font-semibold text-gray-500 uppercase tracking-wide mb-2">시작일</label>
+          <div class="relative">
+            <input id="startDate" name="startDate" type="date" th:value="${startDate}"
+                   class="w-full h-11 rounded-lg border border-gray-200 bg-gray-50 px-4 text-sm text-gray-900 shadow-sm outline-none transition focus:border-indigo-500 focus:bg-white focus:ring-4 focus:ring-indigo-100">
+          </div>
         </div>
         <div>
-          <label for="endDate" class="block text-sm font-medium text-gray-700 mb-1">종료일</label>
-          <input id="endDate" name="endDate" type="date" th:value="${endDate}"
-                 class="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
+          <label for="endDate" class="block text-xs font-semibold text-gray-500 uppercase tracking-wide mb-2">종료일</label>
+          <div class="relative">
+            <input id="endDate" name="endDate" type="date" th:value="${endDate}"
+                   class="w-full h-11 rounded-lg border border-gray-200 bg-gray-50 px-4 text-sm text-gray-900 shadow-sm outline-none transition focus:border-indigo-500 focus:bg-white focus:ring-4 focus:ring-indigo-100">
+          </div>
         </div>
-        <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white px-4 py-2 rounded-md text-sm font-medium transition">
-          기간 적용
+        <button type="submit" class="h-11 bg-indigo-600 hover:bg-indigo-700 text-white px-5 rounded-lg text-sm font-semibold shadow-sm transition">
+          적용
         </button>
       </div>
-      <p class="mt-3 text-xs text-gray-500">
-        현재 기간:
-        <span th:text="${#temporals.format(startDate, 'yyyy-MM-dd')}">2024-01-01</span>
-        부터
-        <span th:text="${#temporals.format(endDate, 'yyyy-MM-dd')}">2024-01-30</span>
-        까지
-      </p>
     </form>
 
     <!-- Key Metrics -->

From 41226c65764aefe508ee51946312e4f5795989b9 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:06:05 +0900
Subject: [PATCH 08/43] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=95=20=EC=B5=9C=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminPracticeNoteController.java          | 18 ++++-
 .../controller/AdminProblemController.java    | 35 +++++----
 .../admin/controller/AdminUserController.java | 73 +++++--------------
 .../admin/dto/AdminProblemResponseDto.java    | 14 ++++
 .../admin/dto/AdminUserResponseDto.java       | 27 +++++++
 .../repository/MissionLogRepository.java      |  3 +
 .../mission/service/MissionLogService.java    | 21 ++++--
 .../repository/PracticeNoteRepository.java    |  8 ++
 .../service/PracticeNoteService.java          | 25 ++++++-
 .../repository/ProblemRepositoryCustom.java   |  5 ++
 .../repository/ProblemRepositoryImpl.java     | 35 +++++++++
 .../problem/service/ProblemService.java       |  8 ++
 .../backend/user/repository/UserAdminRow.java |  9 +++
 .../user/repository/UserRepository.java       |  2 +-
 .../user/repository/UserRepositoryCustom.java |  8 ++
 .../user/repository/UserRepositoryImpl.java   | 65 +++++++++++++++++
 .../OnO/backend/user/service/UserService.java | 16 +++-
 17 files changed, 286 insertions(+), 86 deletions(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/admin/dto/AdminProblemResponseDto.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/admin/dto/AdminUserResponseDto.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/user/repository/UserAdminRow.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryCustom.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryImpl.java

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
index 750deaee..788203c6 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
@@ -35,13 +35,27 @@ public String getPracticeNotes(
 
         Page<AdminPracticeNoteResponseDto> practiceNotes = practiceNoteService.findAdminPracticeNotes(selectedNotePage, selectedSize);
         Page<AdminPracticeLogResponseDto> practiceLogs = missionLogService.findAdminPracticeLogs(selectedLogPage, selectedSize);
+        int noteTotalPages = practiceNotes.getTotalPages();
+        int logTotalPages = practiceLogs.getTotalPages();
+        int notePageBlockStart = (selectedNotePage / 10) * 10;
+        int logPageBlockStart = (selectedLogPage / 10) * 10;
+        int notePageBlockEnd = Math.min(notePageBlockStart + 9, Math.max(noteTotalPages - 1, 0));
+        int logPageBlockEnd = Math.min(logPageBlockStart + 9, Math.max(logTotalPages - 1, 0));
 
         model.addAttribute("practiceNotes", practiceNotes.getContent());
         model.addAttribute("practiceLogs", practiceLogs.getContent());
         model.addAttribute("notePage", selectedNotePage);
         model.addAttribute("logPage", selectedLogPage);
-        model.addAttribute("noteTotalPages", practiceNotes.getTotalPages());
-        model.addAttribute("logTotalPages", practiceLogs.getTotalPages());
+        model.addAttribute("noteTotalPages", noteTotalPages);
+        model.addAttribute("logTotalPages", logTotalPages);
+        model.addAttribute("notePageBlockStart", notePageBlockStart);
+        model.addAttribute("notePageBlockEnd", notePageBlockEnd);
+        model.addAttribute("logPageBlockStart", logPageBlockStart);
+        model.addAttribute("logPageBlockEnd", logPageBlockEnd);
+        model.addAttribute("hasPreviousNoteBlock", notePageBlockStart > 0);
+        model.addAttribute("hasNextNoteBlock", notePageBlockEnd < noteTotalPages - 1);
+        model.addAttribute("hasPreviousLogBlock", logPageBlockStart > 0);
+        model.addAttribute("hasNextLogBlock", logPageBlockEnd < logTotalPages - 1);
         model.addAttribute("totalPracticeNotes", practiceNotes.getTotalElements());
         model.addAttribute("totalPracticeLogs", practiceLogs.getTotalElements());
         model.addAttribute("size", selectedSize);
diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
index f2d60dc3..fe711425 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.admin.controller;
 
+import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
 import com.aisip.OnO.backend.folder.dto.FolderResponseDto;
 import com.aisip.OnO.backend.folder.entity.Folder;
 import com.aisip.OnO.backend.folder.service.FolderService;
@@ -9,6 +10,7 @@
 import com.aisip.OnO.backend.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
-
 @Slf4j
 @RequiredArgsConstructor
 @Controller
@@ -34,21 +34,24 @@ public String getAllProblems(
             @RequestParam(defaultValue = "20", name = "size") int size,
             Model model
     ) {
-        List<ProblemResponseDto> allProblems = problemService.findAllProblems();
-
-        // 페이징 계산
-        int totalProblems = allProblems.size();
-        int totalPages = (int) Math.ceil((double) totalProblems / size);
-        int startIndex = page * size;
-        int endIndex = Math.min(startIndex + size, totalProblems);
-
-        List<ProblemResponseDto> pagedProblems = allProblems.subList(startIndex, endIndex);
+        int selectedPage = Math.max(page, 0);
+        int selectedSize = Math.max(size, 1);
+        Page<AdminProblemResponseDto> problemPage = problemService.findAdminProblems(selectedPage, selectedSize);
+        int totalPages = problemPage.getTotalPages();
+        int pageBlockStart = (selectedPage / 10) * 10;
+        int pageBlockEnd = Math.min(pageBlockStart + 9, Math.max(totalPages - 1, 0));
 
-        model.addAttribute("problems", pagedProblems);
-        model.addAttribute("currentPage", page);
+        model.addAttribute("problems", problemPage.getContent());
+        model.addAttribute("currentPage", selectedPage);
         model.addAttribute("totalPages", totalPages);
-        model.addAttribute("totalProblems", totalProblems);
-        model.addAttribute("size", size);
+        model.addAttribute("totalProblems", problemPage.getTotalElements());
+        model.addAttribute("size", selectedSize);
+        model.addAttribute("pageStartItem", problemPage.isEmpty() ? 0 : selectedPage * selectedSize + 1);
+        model.addAttribute("pageEndItem", selectedPage * selectedSize + problemPage.getNumberOfElements());
+        model.addAttribute("pageBlockStart", pageBlockStart);
+        model.addAttribute("pageBlockEnd", pageBlockEnd);
+        model.addAttribute("hasPreviousBlock", pageBlockStart > 0);
+        model.addAttribute("hasNextBlock", pageBlockEnd < totalPages - 1);
 
         return "problems";
     }
@@ -66,4 +69,4 @@ public String getProblemDetail(@PathVariable(name = "problemId") Long problemId,
 
         return "problem";
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
index 17def2a1..b2eebcb0 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminUserController.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.admin.controller;
 
+import com.aisip.OnO.backend.admin.dto.AdminUserResponseDto;
 import com.aisip.OnO.backend.folder.dto.FolderResponseDto;
 import com.aisip.OnO.backend.folder.service.FolderService;
 import com.aisip.OnO.backend.mission.entity.MissionLog;
@@ -14,15 +15,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -44,63 +42,30 @@ public String getAllUsers(
             @RequestParam(defaultValue = "desc", name = "direction") String direction,
             Model model
     ) {
-        List<UserResponseDto> allUsers = userService.findAllUsers();
-        Map<Long, Long> problemCountByUserId = allUsers.stream()
-                .collect(Collectors.toMap(
-                        UserResponseDto::userId,
-                        user -> problemService.findProblemCountByUser(user.userId())
-                ));
-
-        Comparator<UserResponseDto> comparator = getUserComparator(sortBy, problemCountByUserId);
-        if ("desc".equalsIgnoreCase(direction)) {
-            comparator = comparator.reversed();
-        }
-
-        List<UserResponseDto> sortedUsers = allUsers.stream()
-                .sorted(comparator.thenComparing(UserResponseDto::userId, Comparator.reverseOrder()))
-                .toList();
-
-        // 페이징 계산
-        int totalUsers = sortedUsers.size();
-        int totalPages = (int) Math.ceil((double) totalUsers / size);
-        int startIndex = page * size;
-        int endIndex = Math.min(startIndex + size, totalUsers);
-
-        List<UserResponseDto> pagedUsers = startIndex >= totalUsers
-                ? List.of()
-                : sortedUsers.subList(startIndex, endIndex);
-
-        // 각 유저의 문제 개수 계산
-        List<Long> problemCounts = pagedUsers.stream()
-                .map(user -> problemCountByUserId.get(user.userId()))
-                .toList();
-
-        model.addAttribute("users", pagedUsers);
-        model.addAttribute("problemCounts", problemCounts);
-        model.addAttribute("currentPage", page);
+        int selectedPage = Math.max(page, 0);
+        int selectedSize = Math.max(size, 1);
+        Page<AdminUserResponseDto> userPage = userService.findAdminUsers(selectedPage, selectedSize, sortBy, direction);
+        int totalPages = userPage.getTotalPages();
+        int pageBlockStart = (selectedPage / 10) * 10;
+        int pageBlockEnd = Math.min(pageBlockStart + 9, Math.max(totalPages - 1, 0));
+
+        model.addAttribute("users", userPage.getContent());
+        model.addAttribute("currentPage", selectedPage);
         model.addAttribute("totalPages", totalPages);
-        model.addAttribute("totalUsers", totalUsers);
-        model.addAttribute("size", size);
+        model.addAttribute("totalUsers", userPage.getTotalElements());
+        model.addAttribute("size", selectedSize);
+        model.addAttribute("pageStartItem", userPage.isEmpty() ? 0 : selectedPage * selectedSize + 1);
+        model.addAttribute("pageEndItem", selectedPage * selectedSize + userPage.getNumberOfElements());
         model.addAttribute("sortBy", sortBy);
         model.addAttribute("direction", direction);
+        model.addAttribute("pageBlockStart", pageBlockStart);
+        model.addAttribute("pageBlockEnd", pageBlockEnd);
+        model.addAttribute("hasPreviousBlock", pageBlockStart > 0);
+        model.addAttribute("hasNextBlock", pageBlockEnd < totalPages - 1);
 
         return "users";
     }
 
-    private Comparator<UserResponseDto> getUserComparator(String sortBy, Map<Long, Long> problemCountByUserId) {
-        Function<UserResponseDto, Long> sortKey = switch (sortBy) {
-            case "level" -> UserResponseDto::totalStudyLevel;
-            case "problemCount" -> user -> problemCountByUserId.getOrDefault(user.userId(), 0L);
-            default -> null;
-        };
-
-        if (sortKey == null) {
-            return Comparator.comparing(UserResponseDto::createdAt);
-        }
-
-        return Comparator.comparing(sortKey);
-    }
-
     @GetMapping("/user/{userId}")
     public String getUserDetailsById(@PathVariable(name = "userId") Long userId, Model model) {
         UserResponseDto user = userService.findUser(userId);
diff --git a/src/main/java/com/aisip/OnO/backend/admin/dto/AdminProblemResponseDto.java b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminProblemResponseDto.java
new file mode 100644
index 00000000..d29d7459
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminProblemResponseDto.java
@@ -0,0 +1,14 @@
+package com.aisip.OnO.backend.admin.dto;
+
+import java.time.LocalDateTime;
+
+public record AdminProblemResponseDto(
+        Long problemId,
+        Long folderId,
+        String memo,
+        String reference,
+        String analysisStatus,
+        LocalDateTime solvedAt,
+        LocalDateTime createdAt
+) {
+}
diff --git a/src/main/java/com/aisip/OnO/backend/admin/dto/AdminUserResponseDto.java b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminUserResponseDto.java
new file mode 100644
index 00000000..41a92f85
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/admin/dto/AdminUserResponseDto.java
@@ -0,0 +1,27 @@
+package com.aisip.OnO.backend.admin.dto;
+
+import com.aisip.OnO.backend.user.entity.User;
+
+import java.time.LocalDateTime;
+
+public record AdminUserResponseDto(
+        Long userId,
+        String name,
+        String email,
+        Long totalStudyLevel,
+        Long totalStudyCurrentPoint,
+        Long problemCount,
+        LocalDateTime createdAt
+) {
+    public static AdminUserResponseDto from(User user, Long problemCount) {
+        return new AdminUserResponseDto(
+                user.getId(),
+                user.getName(),
+                user.getEmail(),
+                user.getUserMissionStatus().getTotalStudyLevel(),
+                user.getUserMissionStatus().getTotalStudyPoint(),
+                problemCount != null ? problemCount : 0L,
+                user.getCreatedAt()
+        );
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
index 05c0866e..e9318f54 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
@@ -14,6 +14,9 @@ public interface MissionLogRepository extends JpaRepository<MissionLog, Long>, M
 
     List<MissionLog> findAllByMissionType(MissionType missionType, Pageable pageable);
 
+    @Query("SELECT m FROM MissionLog m JOIN FETCH m.user WHERE m.missionType = :missionType")
+    List<MissionLog> findAllByMissionTypeWithUser(@Param("missionType") MissionType missionType, Pageable pageable);
+
     long countByMissionType(MissionType missionType);
 
     long countByMissionTypeAndCreatedAtBetween(
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index c8429880..0b170042 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -19,6 +19,8 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.domain.Page;
@@ -185,16 +187,21 @@ public List<com.aisip.OnO.backend.user.entity.User> getActiveUsersByDate(LocalDa
     @Transactional(readOnly = true)
     public Page<AdminPracticeLogResponseDto> findAdminPracticeLogs(int page, int size) {
         PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
-        List<MissionLog> missionLogs = missionLogRepository.findAllByMissionType(MissionType.NOTE_PRACTICE, pageRequest);
+        List<MissionLog> missionLogs = missionLogRepository.findAllByMissionTypeWithUser(MissionType.NOTE_PRACTICE, pageRequest);
         long total = missionLogRepository.countByMissionType(MissionType.NOTE_PRACTICE);
+        List<Long> practiceNoteIds = missionLogs.stream()
+                .map(MissionLog::getReferenceId)
+                .filter(java.util.Objects::nonNull)
+                .distinct()
+                .toList();
+        Map<Long, PracticeNote> practiceNotesById = practiceNoteRepository.findAllById(practiceNoteIds).stream()
+                .collect(Collectors.toMap(PracticeNote::getId, Function.identity()));
 
         List<AdminPracticeLogResponseDto> content = missionLogs.stream()
-                .map(missionLog -> {
-                    PracticeNote practiceNote = missionLog.getReferenceId() != null
-                            ? practiceNoteRepository.findById(missionLog.getReferenceId()).orElse(null)
-                            : null;
-                    return AdminPracticeLogResponseDto.from(missionLog, practiceNote);
-                })
+                .map(missionLog -> AdminPracticeLogResponseDto.from(
+                        missionLog,
+                        practiceNotesById.get(missionLog.getReferenceId())
+                ))
                 .toList();
 
         return new PageImpl<>(content, pageRequest, total);
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java b/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
index 05732cc1..1ee22960 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/repository/PracticeNoteRepository.java
@@ -25,6 +25,14 @@ List<Object[]> countDailyPracticeNotes(
             @Param("endDateTime") LocalDateTime endDateTime
     );
 
+    @Query("""
+            SELECT m.practiceNote.id, COUNT(m.problem.id)
+            FROM ProblemPracticeNoteMapping m
+            WHERE m.practiceNote.id IN :practiceNoteIds
+            GROUP BY m.practiceNote.id
+            """)
+    List<Object[]> countProblemsByPracticeNoteIds(@Param("practiceNoteIds") List<Long> practiceNoteIds);
+
     @Query("SELECT p.id FROM PracticeNote p WHERE p.userId = :userId")
     List<Long> findAllPracticeIdsByUserId(@Param("userId") Long userId);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
index ca3f5f6f..62683f5c 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteService.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -247,11 +248,29 @@ public CursorPageResponse<PracticeNoteThumbnailResponseDto> findPracticeThumbnai
     public Page<AdminPracticeNoteResponseDto> findAdminPracticeNotes(int page, int size) {
         PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
         Page<PracticeNote> practiceNotePage = practiceNoteRepository.findAll(pageRequest);
+        List<PracticeNote> practiceNotes = practiceNotePage.getContent();
+        List<Long> userIds = practiceNotes.stream()
+                .map(PracticeNote::getUserId)
+                .distinct()
+                .toList();
+        List<Long> practiceNoteIds = practiceNotes.stream()
+                .map(PracticeNote::getId)
+                .toList();
 
-        List<AdminPracticeNoteResponseDto> content = practiceNotePage.getContent().stream()
+        Map<Long, User> usersById = userRepository.findAllById(userIds).stream()
+                .collect(Collectors.toMap(User::getId, Function.identity()));
+        Map<Long, Long> problemCountsByPracticeNoteId = practiceNoteIds.isEmpty()
+                ? Map.of()
+                : practiceNoteRepository.countProblemsByPracticeNoteIds(practiceNoteIds).stream()
+                .collect(Collectors.toMap(
+                        row -> (Long) row[0],
+                        row -> (Long) row[1]
+                ));
+
+        List<AdminPracticeNoteResponseDto> content = practiceNotes.stream()
                 .map(practiceNote -> {
-                    User user = userRepository.findById(practiceNote.getUserId()).orElse(null);
-                    Long problemCount = (long) practiceNoteRepository.findProblemIdListByPracticeNoteId(practiceNote.getId()).size();
+                    User user = usersById.get(practiceNote.getUserId());
+                    Long problemCount = problemCountsByPracticeNoteId.getOrDefault(practiceNote.getId(), 0L);
                     return AdminPracticeNoteResponseDto.from(practiceNote, user, problemCount);
                 })
                 .toList();
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
index 661b383f..1dde7b32 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
@@ -1,6 +1,9 @@
 package com.aisip.OnO.backend.problem.repository;
 
+import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
 import com.aisip.OnO.backend.problem.entity.Problem;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,6 +18,8 @@ public interface ProblemRepositoryCustom {
 
     List<Problem> findAll();
 
+    Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable);
+
     List<Problem> findAllProblemsByPracticeId(Long practiceId);
 
     /**
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
index d814244a..3ea48ae8 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
@@ -1,9 +1,14 @@
 package com.aisip.OnO.backend.problem.repository;
 
+import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
 import com.aisip.OnO.backend.problem.entity.Problem;
 import com.aisip.OnO.backend.problem.entity.QProblem;
+import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,6 +16,7 @@
 import static com.aisip.OnO.backend.practicenote.entity.QPracticeNote.practiceNote;
 import static com.aisip.OnO.backend.practicenote.entity.QProblemPracticeNoteMapping.problemPracticeNoteMapping;
 import static com.aisip.OnO.backend.problem.entity.QProblem.problem;
+import static com.aisip.OnO.backend.problem.entity.QProblemAnalysis.problemAnalysis;
 import static com.aisip.OnO.backend.problem.entity.QProblemImageData.problemImageData;
 import static com.aisip.OnO.backend.tag.entity.QProblemTagMapping.problemTagMapping;
 
@@ -66,6 +72,35 @@ public List<Problem> findAll() {
                 .fetch();
     }
 
+    @Override
+    public Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable) {
+        List<AdminProblemResponseDto> content = queryFactory
+                .select(Projections.constructor(
+                        AdminProblemResponseDto.class,
+                        problem.id,
+                        problem.folder.id,
+                        problem.memo,
+                        problem.reference,
+                        problemAnalysis.status.stringValue(),
+                        problem.solvedAt,
+                        problem.createdAt
+                ))
+                .from(problem)
+                .leftJoin(problem.folder)
+                .leftJoin(problem.problemAnalysis, problemAnalysis)
+                .orderBy(problem.createdAt.desc(), problem.id.desc())
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        Long total = queryFactory
+                .select(problem.count())
+                .from(problem)
+                .fetchOne();
+
+        return new PageImpl<>(content, pageable, total != null ? total : 0L);
+    }
+
     @Override
     public List<Problem> findAllProblemsByPracticeId(Long practiceId) {
         return queryFactory
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index 267f03b2..179d3a7d 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.problem.service;
 
+import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
 import com.aisip.OnO.backend.common.exception.ApplicationException;
 import com.aisip.OnO.backend.common.response.CursorPageResponse;
 import com.aisip.OnO.backend.config.rabbitmq.producer.S3DeleteProducer;
@@ -32,6 +33,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -131,6 +134,11 @@ public long countAllProblems() {
         return problemRepository.count();
     }
 
+    @Transactional(readOnly = true)
+    public Page<AdminProblemResponseDto> findAdminProblems(int page, int size) {
+        return problemRepository.findAdminProblems(PageRequest.of(page, size));
+    }
+
     @Transactional(readOnly = true)
     public Long findProblemCountByUser(Long userId) {
         log.info("userId: {} find problem count", userId);
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserAdminRow.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserAdminRow.java
new file mode 100644
index 00000000..52ff0e42
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserAdminRow.java
@@ -0,0 +1,9 @@
+package com.aisip.OnO.backend.user.repository;
+
+import com.aisip.OnO.backend.user.entity.User;
+
+public record UserAdminRow(
+        User user,
+        Long problemCount
+) {
+}
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
index f30042f1..9401fdbc 100644
--- a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<User, Long> {
+public interface UserRepository extends JpaRepository<User, Long>, UserRepositoryCustom {
     Optional<User> findByEmail(String email);
 
     Optional<User> findByIdentifier(String identifier);
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryCustom.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryCustom.java
new file mode 100644
index 00000000..01598b84
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryCustom.java
@@ -0,0 +1,8 @@
+package com.aisip.OnO.backend.user.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface UserRepositoryCustom {
+    Page<UserAdminRow> findAdminUsers(Pageable pageable, String sortBy, String direction);
+}
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryImpl.java
new file mode 100644
index 00000000..dc2cef3a
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepositoryImpl.java
@@ -0,0 +1,65 @@
+package com.aisip.OnO.backend.user.repository;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Order;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+import static com.aisip.OnO.backend.problem.entity.QProblem.problem;
+import static com.aisip.OnO.backend.user.entity.QUser.user;
+
+public class UserRepositoryImpl implements UserRepositoryCustom {
+
+    private final JPAQueryFactory queryFactory;
+
+    public UserRepositoryImpl(EntityManager entityManager) {
+        this.queryFactory = new JPAQueryFactory(entityManager);
+    }
+
+    @Override
+    public Page<UserAdminRow> findAdminUsers(Pageable pageable, String sortBy, String direction) {
+        NumberExpression<Long> problemCount = problem.id.count();
+
+        List<Tuple> rows = queryFactory
+                .select(user, problemCount)
+                .from(user)
+                .leftJoin(problem).on(problem.userId.eq(user.id))
+                .groupBy(user.id)
+                .orderBy(getOrderSpecifier(sortBy, direction, problemCount), user.id.desc())
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        List<UserAdminRow> content = rows.stream()
+                .map(row -> new UserAdminRow(row.get(user), row.get(problemCount)))
+                .toList();
+
+        Long total = queryFactory
+                .select(user.count())
+                .from(user)
+                .fetchOne();
+
+        return new PageImpl<>(content, pageable, total != null ? total : 0L);
+    }
+
+    private OrderSpecifier<?> getOrderSpecifier(
+            String sortBy,
+            String direction,
+            NumberExpression<Long> problemCount
+    ) {
+        Order order = "asc".equalsIgnoreCase(direction) ? Order.ASC : Order.DESC;
+
+        return switch (sortBy) {
+            case "level" -> new OrderSpecifier<>(order, user.userMissionStatus.totalStudyLevel);
+            case "problemCount" -> new OrderSpecifier<>(order, problemCount);
+            default -> new OrderSpecifier<>(order, user.createdAt);
+        };
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
index 8915b7dc..fce6363d 100644
--- a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
+++ b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.user.service;
 
+import com.aisip.OnO.backend.admin.dto.AdminUserResponseDto;
 import com.aisip.OnO.backend.folder.service.FolderService;
 import com.aisip.OnO.backend.practicenote.service.PracticeNoteService;
 import com.aisip.OnO.backend.problem.service.ProblemService;
@@ -12,19 +13,21 @@
 import com.aisip.OnO.backend.util.webhook.DiscordWebhookNotificationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.sql.Date;
-import java.sql.Timestamp;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
@@ -105,6 +108,13 @@ public List<UserResponseDto> findAllUsers() {
                 .collect(Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    public Page<AdminUserResponseDto> findAdminUsers(int page, int size, String sortBy, String direction) {
+        PageRequest pageRequest = PageRequest.of(page, size);
+        return userRepository.findAdminUsers(pageRequest, sortBy, direction)
+                .map(row -> AdminUserResponseDto.from(row.user(), row.problemCount()));
+    }
+
     @Transactional(readOnly = true)
     public long countAllUsers() {
         return userRepository.count();

From 6df9c9f4dc7f8acee613899d080e33540a42cae5 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:16:09 +0900
Subject: [PATCH 09/43] =?UTF-8?q?[feat]=20=EB=B3=B5=EC=8A=B5=20=EB=85=B8?=
 =?UTF-8?q?=ED=8A=B8,=20=EB=B3=B5=EC=8A=B5=20=EA=B8=B0=EB=A1=9D=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminPracticeNoteController.java          |  39 ++++--
 src/main/resources/templates/admin.html       |   8 +-
 .../resources/templates/practice-logs.html    | 119 ++++++++++++++++++
 .../resources/templates/practice-notes.html   |  83 ++----------
 4 files changed, 159 insertions(+), 90 deletions(-)
 create mode 100644 src/main/resources/templates/practice-logs.html

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
index 788203c6..87fbed99 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminPracticeNoteController.java
@@ -25,41 +25,54 @@ public class AdminPracticeNoteController {
     @GetMapping("/practice-notes")
     public String getPracticeNotes(
             @RequestParam(defaultValue = "0", name = "notePage") int notePage,
-            @RequestParam(defaultValue = "0", name = "logPage") int logPage,
             @RequestParam(defaultValue = "20", name = "size") int size,
             Model model
     ) {
         int selectedNotePage = Math.max(notePage, 0);
-        int selectedLogPage = Math.max(logPage, 0);
         int selectedSize = Math.max(size, 1);
 
         Page<AdminPracticeNoteResponseDto> practiceNotes = practiceNoteService.findAdminPracticeNotes(selectedNotePage, selectedSize);
-        Page<AdminPracticeLogResponseDto> practiceLogs = missionLogService.findAdminPracticeLogs(selectedLogPage, selectedSize);
         int noteTotalPages = practiceNotes.getTotalPages();
-        int logTotalPages = practiceLogs.getTotalPages();
         int notePageBlockStart = (selectedNotePage / 10) * 10;
-        int logPageBlockStart = (selectedLogPage / 10) * 10;
         int notePageBlockEnd = Math.min(notePageBlockStart + 9, Math.max(noteTotalPages - 1, 0));
-        int logPageBlockEnd = Math.min(logPageBlockStart + 9, Math.max(logTotalPages - 1, 0));
 
         model.addAttribute("practiceNotes", practiceNotes.getContent());
-        model.addAttribute("practiceLogs", practiceLogs.getContent());
         model.addAttribute("notePage", selectedNotePage);
-        model.addAttribute("logPage", selectedLogPage);
         model.addAttribute("noteTotalPages", noteTotalPages);
-        model.addAttribute("logTotalPages", logTotalPages);
         model.addAttribute("notePageBlockStart", notePageBlockStart);
         model.addAttribute("notePageBlockEnd", notePageBlockEnd);
-        model.addAttribute("logPageBlockStart", logPageBlockStart);
-        model.addAttribute("logPageBlockEnd", logPageBlockEnd);
         model.addAttribute("hasPreviousNoteBlock", notePageBlockStart > 0);
         model.addAttribute("hasNextNoteBlock", notePageBlockEnd < noteTotalPages - 1);
+        model.addAttribute("totalPracticeNotes", practiceNotes.getTotalElements());
+        model.addAttribute("size", selectedSize);
+
+        return "practice-notes";
+    }
+
+    @GetMapping("/practice-logs")
+    public String getPracticeLogs(
+            @RequestParam(defaultValue = "0", name = "logPage") int logPage,
+            @RequestParam(defaultValue = "20", name = "size") int size,
+            Model model
+    ) {
+        int selectedLogPage = Math.max(logPage, 0);
+        int selectedSize = Math.max(size, 1);
+
+        Page<AdminPracticeLogResponseDto> practiceLogs = missionLogService.findAdminPracticeLogs(selectedLogPage, selectedSize);
+        int logTotalPages = practiceLogs.getTotalPages();
+        int logPageBlockStart = (selectedLogPage / 10) * 10;
+        int logPageBlockEnd = Math.min(logPageBlockStart + 9, Math.max(logTotalPages - 1, 0));
+
+        model.addAttribute("practiceLogs", practiceLogs.getContent());
+        model.addAttribute("logPage", selectedLogPage);
+        model.addAttribute("logTotalPages", logTotalPages);
+        model.addAttribute("logPageBlockStart", logPageBlockStart);
+        model.addAttribute("logPageBlockEnd", logPageBlockEnd);
         model.addAttribute("hasPreviousLogBlock", logPageBlockStart > 0);
         model.addAttribute("hasNextLogBlock", logPageBlockEnd < logTotalPages - 1);
-        model.addAttribute("totalPracticeNotes", practiceNotes.getTotalElements());
         model.addAttribute("totalPracticeLogs", practiceLogs.getTotalElements());
         model.addAttribute("size", selectedSize);
 
-        return "practice-notes";
+        return "practice-logs";
     }
 }
diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html
index ee8307c6..d9381100 100644
--- a/src/main/resources/templates/admin.html
+++ b/src/main/resources/templates/admin.html
@@ -90,8 +90,8 @@ <h3 class="text-xl font-semibold text-gray-800 mb-2">문제 관리</h3>
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path>
             </svg>
           </div>
-          <h3 class="text-xl font-semibold text-gray-800 mb-2">복습 관리</h3>
-          <p class="text-gray-600 text-sm">복습노트 및 복습 기록 조회</p>
+          <h3 class="text-xl font-semibold text-gray-800 mb-2">복습노트 관리</h3>
+          <p class="text-gray-600 text-sm">복습노트 목록 조회</p>
         </div>
       </a>
 
@@ -124,8 +124,8 @@ <h3 class="text-lg font-semibold text-gray-800 mb-4">빠른 이동</h3>
         <a th:href="@{/admin/problems(page=0)}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
           <p class="text-sm text-gray-600">최신 문제 목록 보기</p>
         </a>
-        <a th:href="@{/admin/practice-notes}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
-          <p class="text-sm text-gray-600">복습 목록 보기</p>
+        <a th:href="@{/admin/practice-logs}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
+          <p class="text-sm text-gray-600">복습 기록 보기</p>
         </a>
         <a th:href="@{/admin/analysis}" class="text-center p-4 bg-gray-50 hover:bg-gray-100 rounded-lg transition-colors">
           <p class="text-sm text-gray-600">통계 보기</p>
diff --git a/src/main/resources/templates/practice-logs.html b/src/main/resources/templates/practice-logs.html
new file mode 100644
index 00000000..17b049cd
--- /dev/null
+++ b/src/main/resources/templates/practice-logs.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>OnO 관리자 - 복습 기록</title>
+  <script src="https://cdn.tailwindcss.com"></script>
+</head>
+<body class="bg-gradient-to-br from-gray-50 to-gray-100 min-h-screen">
+  <nav class="bg-white shadow-lg">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+      <div class="flex justify-between h-16">
+        <div class="flex items-center">
+          <a th:href="@{/admin/main}">
+            <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
+          </a>
+        </div>
+        <div class="flex items-center space-x-4">
+          <a th:href="@{/admin/main}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">대시보드</a>
+          <a th:href="@{/admin/users}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">유저</a>
+          <a th:href="@{/admin/problems}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">문제</a>
+          <a th:href="@{/admin/practice-notes}" class="text-indigo-600 px-3 py-2 rounded-md text-sm font-medium border-b-2 border-indigo-600">복습</a>
+          <a th:href="@{/admin/analysis}" class="text-gray-700 hover:text-indigo-600 px-3 py-2 rounded-md text-sm font-medium">통계</a>
+          <form th:action="@{/logout}" method="post">
+            <button type="submit" class="bg-red-500 hover:bg-red-600 text-white px-4 py-2 rounded-md text-sm font-medium transition duration-150">
+              로그아웃
+            </button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </nav>
+
+  <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+    <div class="mb-6 flex items-start justify-between">
+      <div>
+        <h2 class="text-2xl font-bold text-gray-900">복습 기록</h2>
+        <p class="text-gray-600 mt-1">
+          총 <span class="font-semibold text-pink-600" th:text="${totalPracticeLogs}">0</span>개
+        </p>
+      </div>
+      <a th:href="@{/admin/practice-notes}" class="px-4 py-2 bg-white border border-gray-200 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">
+        복습노트 목록
+      </a>
+    </div>
+
+    <section class="bg-white rounded-lg shadow-md overflow-hidden">
+      <div class="px-6 py-4 bg-gray-50 border-b border-gray-200 flex items-center justify-between">
+        <h3 class="text-lg font-semibold text-gray-900">복습 기록 목록</h3>
+        <form th:action="@{/admin/practice-logs}" method="get" class="flex items-center space-x-2">
+          <input type="hidden" name="logPage" value="0">
+          <select name="size" class="rounded-md border-gray-300 text-sm">
+            <option value="20" th:selected="${size == 20}">20개</option>
+            <option value="50" th:selected="${size == 50}">50개</option>
+            <option value="100" th:selected="${size == 100}">100개</option>
+          </select>
+          <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white px-3 py-2 rounded-md text-sm font-medium">적용</button>
+        </form>
+      </div>
+      <div class="overflow-x-auto">
+        <table class="min-w-full divide-y divide-gray-200">
+          <thead class="bg-gray-50">
+            <tr>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">기록 ID</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">포인트</th>
+              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">완료일</th>
+            </tr>
+          </thead>
+          <tbody class="bg-white divide-y divide-gray-200">
+            <tr th:each="log : ${practiceLogs}" class="hover:bg-gray-50">
+              <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${log.missionLogId}">1</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600">
+                <a th:href="@{/admin/user/{userId}(userId=${log.userId})}" class="text-indigo-600 hover:text-indigo-800 font-medium" th:text="${log.userName}">유저</a>
+                <p class="text-xs text-gray-500" th:text="${log.userEmail}">user@example.com</p>
+              </td>
+              <td class="px-6 py-4 text-sm text-gray-900">
+                <span th:text="${log.practiceTitle}">복습노트</span>
+                <span class="text-xs text-gray-500" th:text="'#' + ${log.practiceNoteId}">#1</span>
+              </td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${log.point} + 'pt'">15pt</td>
+              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(log.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
+            </tr>
+            <tr th:if="${#lists.isEmpty(practiceLogs)}">
+              <td colspan="5" class="px-6 py-8 text-center text-gray-500">복습 기록이 없습니다</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div th:if="${logTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex flex-wrap justify-end gap-2">
+        <a th:if="${logPage > 0}" th:href="@{/admin/practice-logs(logPage=${logPage - 1}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
+        <span th:if="${logPage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
+
+        <a th:if="${hasPreviousLogBlock}" th:href="@{/admin/practice-logs(logPage=${logPageBlockStart - 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&lt;&lt;</a>
+        <span th:unless="${hasPreviousLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&lt;&lt;</span>
+
+        <span th:each="page : ${#numbers.sequence(logPageBlockStart, logPageBlockEnd)}">
+          <a th:if="${page == logPage}"
+             class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white" th:text="${page + 1}">1</a>
+          <a th:if="${page != logPage}" th:href="@{/admin/practice-logs(logPage=${page}, size=${size})}"
+             class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50" th:text="${page + 1}">1</a>
+        </span>
+
+        <a th:if="${hasNextLogBlock}" th:href="@{/admin/practice-logs(logPage=${logPageBlockStart + 10}, size=${size})}"
+           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&gt;&gt;</a>
+        <span th:unless="${hasNextLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&gt;&gt;</span>
+
+        <a th:if="${logPage < logTotalPages - 1}" th:href="@{/admin/practice-logs(logPage=${logPage + 1}, size=${size})}"
+           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
+        <span th:if="${logPage >= logTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
+      </div>
+    </section>
+  </div>
+</body>
+</html>
diff --git a/src/main/resources/templates/practice-notes.html b/src/main/resources/templates/practice-notes.html
index d5df7768..cc3e8a59 100644
--- a/src/main/resources/templates/practice-notes.html
+++ b/src/main/resources/templates/practice-notes.html
@@ -35,8 +35,7 @@ <h1 class="text-2xl font-bold text-indigo-600">OnO 관리자</h1>
     <div class="mb-6">
       <h2 class="text-2xl font-bold text-gray-900">복습 관리</h2>
       <p class="text-gray-600 mt-1">
-        복습노트 <span class="font-semibold text-indigo-600" th:text="${totalPracticeNotes}">0</span>개,
-        복습 기록 <span class="font-semibold text-pink-600" th:text="${totalPracticeLogs}">0</span>개
+        복습노트 <span class="font-semibold text-indigo-600" th:text="${totalPracticeNotes}">0</span>개
       </p>
     </div>
 
@@ -45,10 +44,10 @@ <h2 class="text-2xl font-bold text-gray-900">복습 관리</h2>
         <p class="text-sm font-medium text-gray-500 uppercase">총 복습노트 수</p>
         <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${totalPracticeNotes}">0</p>
       </div>
-      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-pink-500">
-        <p class="text-sm font-medium text-gray-500 uppercase">총 복습 기록 수</p>
-        <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${totalPracticeLogs}">0</p>
-      </div>
+      <a th:href="@{/admin/practice-logs}" class="bg-white rounded-lg shadow-md p-6 border-l-4 border-pink-500 hover:bg-pink-50 transition">
+        <p class="text-sm font-medium text-gray-500 uppercase">복습 기록</p>
+        <p class="mt-2 text-lg font-bold text-gray-900">복습 기록 페이지로 이동</p>
+      </a>
     </div>
 
     <section class="bg-white rounded-lg shadow-md overflow-hidden mb-8">
@@ -56,7 +55,6 @@ <h2 class="text-2xl font-bold text-gray-900">복습 관리</h2>
         <h3 class="text-lg font-semibold text-gray-900">복습노트 목록</h3>
         <form th:action="@{/admin/practice-notes}" method="get" class="flex items-center space-x-2">
           <input type="hidden" name="notePage" value="0">
-          <input type="hidden" name="logPage" th:value="${logPage}">
           <select name="size" class="rounded-md border-gray-300 text-sm">
             <option value="20" th:selected="${size == 20}">20개</option>
             <option value="50" th:selected="${size == 50}">50개</option>
@@ -102,92 +100,31 @@ <h3 class="text-lg font-semibold text-gray-900">복습노트 목록</h3>
       </div>
 
       <div th:if="${noteTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex flex-wrap justify-end gap-2">
-        <a th:if="${notePage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage - 1}, logPage=${logPage}, size=${size})}"
+        <a th:if="${notePage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage - 1}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
         <span th:if="${notePage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
 
-        <a th:if="${hasPreviousNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart - 10}, logPage=${logPage}, size=${size})}"
+        <a th:if="${hasPreviousNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart - 10}, size=${size})}"
            class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&lt;&lt;</a>
         <span th:unless="${hasPreviousNoteBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&lt;&lt;</span>
 
         <span th:each="page : ${#numbers.sequence(notePageBlockStart, notePageBlockEnd)}">
           <a th:if="${page == notePage}"
              class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white" th:text="${page + 1}">1</a>
-          <a th:if="${page != notePage}" th:href="@{/admin/practice-notes(notePage=${page}, logPage=${logPage}, size=${size})}"
+          <a th:if="${page != notePage}" th:href="@{/admin/practice-notes(notePage=${page}, size=${size})}"
              class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50" th:text="${page + 1}">1</a>
         </span>
 
-        <a th:if="${hasNextNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart + 10}, logPage=${logPage}, size=${size})}"
+        <a th:if="${hasNextNoteBlock}" th:href="@{/admin/practice-notes(notePage=${notePageBlockStart + 10}, size=${size})}"
            class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&gt;&gt;</a>
         <span th:unless="${hasNextNoteBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&gt;&gt;</span>
 
-        <a th:if="${notePage < noteTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage + 1}, logPage=${logPage}, size=${size})}"
+        <a th:if="${notePage < noteTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage + 1}, size=${size})}"
            class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
         <span th:if="${notePage >= noteTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
       </div>
     </section>
 
-    <section class="bg-white rounded-lg shadow-md overflow-hidden">
-      <div class="px-6 py-4 bg-gray-50 border-b border-gray-200">
-        <h3 class="text-lg font-semibold text-gray-900">복습 기록</h3>
-      </div>
-      <div class="overflow-x-auto">
-        <table class="min-w-full divide-y divide-gray-200">
-          <thead class="bg-gray-50">
-            <tr>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">기록 ID</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">포인트</th>
-              <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">완료일</th>
-            </tr>
-          </thead>
-          <tbody class="bg-white divide-y divide-gray-200">
-            <tr th:each="log : ${practiceLogs}" class="hover:bg-gray-50">
-              <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${log.missionLogId}">1</td>
-              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600">
-                <a th:href="@{/admin/user/{userId}(userId=${log.userId})}" class="text-indigo-600 hover:text-indigo-800 font-medium" th:text="${log.userName}">유저</a>
-                <p class="text-xs text-gray-500" th:text="${log.userEmail}">user@example.com</p>
-              </td>
-              <td class="px-6 py-4 text-sm text-gray-900">
-                <span th:text="${log.practiceTitle}">복습노트</span>
-                <span class="text-xs text-gray-500" th:text="'#' + ${log.practiceNoteId}">#1</span>
-              </td>
-              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${log.point} + 'pt'">15pt</td>
-              <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(log.createdAt, 'yyyy-MM-dd HH:mm')}">2024-01-01 00:00</td>
-            </tr>
-            <tr th:if="${#lists.isEmpty(practiceLogs)}">
-              <td colspan="5" class="px-6 py-8 text-center text-gray-500">복습 기록이 없습니다</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-
-      <div th:if="${logTotalPages > 1}" class="px-6 py-4 bg-gray-50 border-t border-gray-200 flex flex-wrap justify-end gap-2">
-        <a th:if="${logPage > 0}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage - 1}, size=${size})}"
-           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">이전</a>
-        <span th:if="${logPage == 0}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">이전</span>
-
-        <a th:if="${hasPreviousLogBlock}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPageBlockStart - 10}, size=${size})}"
-           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&lt;&lt;</a>
-        <span th:unless="${hasPreviousLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&lt;&lt;</span>
-
-        <span th:each="page : ${#numbers.sequence(logPageBlockStart, logPageBlockEnd)}">
-          <a th:if="${page == logPage}"
-             class="px-4 py-2 bg-indigo-600 border border-indigo-600 rounded-md text-sm font-medium text-white" th:text="${page + 1}">1</a>
-          <a th:if="${page != logPage}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${page}, size=${size})}"
-             class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50" th:text="${page + 1}">1</a>
-        </span>
-
-        <a th:if="${hasNextLogBlock}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPageBlockStart + 10}, size=${size})}"
-           class="px-3 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">&gt;&gt;</a>
-        <span th:unless="${hasNextLogBlock}" class="px-3 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">&gt;&gt;</span>
-
-        <a th:if="${logPage < logTotalPages - 1}" th:href="@{/admin/practice-notes(notePage=${notePage}, logPage=${logPage + 1}, size=${size})}"
-           class="px-4 py-2 bg-white border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50">다음</a>
-        <span th:if="${logPage >= logTotalPages - 1}" class="px-4 py-2 bg-gray-100 border border-gray-300 rounded-md text-sm font-medium text-gray-400">다음</span>
-      </div>
-    </section>
   </div>
 </body>
 </html>

From bc9869654f43799d0c2d2c72dda36ec915f706af Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:16:27 +0900
Subject: [PATCH 10/43] =?UTF-8?q?[feat]=20=EB=AC=B8=EC=A0=9C=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B3=B5=EC=8A=B5=20?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminProblemController.java    |  8 +++
 .../repository/ProblemSolveRepository.java    |  4 +-
 .../service/ProblemSolveService.java          | 11 +++-
 src/main/resources/templates/problem.html     | 51 +++++++++++++++++++
 4 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
index fe711425..9e94d5b5 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
@@ -6,6 +6,8 @@
 import com.aisip.OnO.backend.folder.service.FolderService;
 import com.aisip.OnO.backend.problem.dto.ProblemResponseDto;
 import com.aisip.OnO.backend.problem.service.ProblemService;
+import com.aisip.OnO.backend.problemsolve.dto.ProblemSolveResponseDto;
+import com.aisip.OnO.backend.problemsolve.service.ProblemSolveService;
 import com.aisip.OnO.backend.user.dto.UserResponseDto;
 import com.aisip.OnO.backend.user.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -18,6 +20,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @Slf4j
 @RequiredArgsConstructor
 @Controller
@@ -27,6 +31,7 @@ public class AdminProblemController {
     private final ProblemService problemService;
     private final UserService userService;
     private final FolderService folderService;
+    private final ProblemSolveService problemSolveService;
 
     @GetMapping("/problems")
     public String getAllProblems(
@@ -64,8 +69,11 @@ public String getProblemDetail(@PathVariable(name = "problemId") Long problemId,
         // 폴더 및 작성자 정보 조회
         FolderResponseDto folder = folderService.findFolder(problem.folderId());
         UserResponseDto user = userService.findUser(folder.userId());
+        List<ProblemSolveResponseDto> problemSolves = problemSolveService.getAdminProblemSolvesByProblemId(problemId);
         model.addAttribute("folder", folder);
         model.addAttribute("user", user);
+        model.addAttribute("problemSolves", problemSolves);
+        model.addAttribute("problemSolveCount", problemSolves.size());
 
         return "problem";
     }
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
index 1c929975..bc1abe64 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
@@ -15,7 +15,7 @@ public interface ProblemSolveRepository extends JpaRepository<ProblemSolve, Long
             "WHERE pr.id = :problemSolveId")
     Optional<ProblemSolve> findByIdWithImages(@Param("problemSolveId") Long problemSolveId);
 
-    @Query("SELECT pr FROM ProblemSolve pr " +
+    @Query("SELECT DISTINCT pr FROM ProblemSolve pr " +
             "LEFT JOIN FETCH pr.images " +
             "WHERE pr.problem.id = :problemId " +
             "ORDER BY pr.practicedAt DESC")
@@ -40,4 +40,4 @@ public interface ProblemSolveRepository extends JpaRepository<ProblemSolve, Long
     Long countByProblemId(@Param("problemId") Long problemId);
 
     void deleteAllByProblemId(Long problemId);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
index 4f681e70..8c047180 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
@@ -67,6 +67,15 @@ public List<ProblemSolveResponseDto> getProblemSolvesByProblemId(Long problemId,
                 .collect(Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    public List<ProblemSolveResponseDto> getAdminProblemSolvesByProblemId(Long problemId) {
+        List<ProblemSolve> problemSolves = problemSolveRepository.findAllByProblemIdWithImages(problemId);
+
+        return problemSolves.stream()
+                .map(ProblemSolveResponseDto::from)
+                .collect(Collectors.toList());
+    }
+
     @Transactional(readOnly = true)
     public List<ProblemSolveResponseDto> getUserProblemSolves(Long userId) {
         List<ProblemSolve> problemSolves = problemSolveRepository.findAllByUserId(userId);
@@ -227,4 +236,4 @@ public Long getProblemSolveCountByProblemId(Long problemId, Long userId) {
     public Long getUserProblemSolveCount(Long userId) {
         return problemSolveRepository.countByUserId(userId);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/templates/problem.html b/src/main/resources/templates/problem.html
index 6595da26..40e0bc27 100644
--- a/src/main/resources/templates/problem.html
+++ b/src/main/resources/templates/problem.html
@@ -221,6 +221,57 @@ <h3 class="text-lg font-semibold text-gray-900">AI 분석 결과</h3>
       </div>
     </div>
 
+    <!-- Problem Solve Records -->
+    <div class="bg-white rounded-lg shadow-md overflow-hidden mt-6">
+      <div class="px-6 py-5 border-b border-gray-200 bg-gray-50 flex items-center justify-between">
+        <h3 class="text-lg font-semibold text-gray-900">문제 복습 기록</h3>
+        <span class="text-sm text-gray-500">
+          총 <span class="font-semibold text-indigo-600" th:text="${problemSolveCount}">0</span>개
+        </span>
+      </div>
+      <div class="px-6 py-5">
+        <div th:if="${!#lists.isEmpty(problemSolves)}" class="overflow-x-auto">
+          <table class="min-w-full divide-y divide-gray-200">
+            <thead class="bg-gray-50">
+              <tr>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">기록 ID</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">유저 ID</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습일</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">정답 상태</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">소요 시간</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">회고</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">이미지</th>
+              </tr>
+            </thead>
+            <tbody class="bg-white divide-y divide-gray-200">
+              <tr th:each="solve : ${problemSolves}" class="hover:bg-gray-50">
+                <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${solve.problemSolveId}">1</td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <a th:href="@{/admin/user/{userId}(userId=${solve.userId})}" class="text-indigo-600 hover:text-indigo-800 font-medium" th:text="${solve.userId}">1</a>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600" th:text="${#temporals.format(solve.practicedAt, 'yyyy-MM-dd HH:mm')}">2024-01-01</td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600" th:text="${solve.answerStatus}">CORRECT</td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span th:if="${solve.timeSpentSeconds != null}" th:text="${solve.timeSpentSeconds} + '초'">60초</span>
+                  <span th:unless="${solve.timeSpentSeconds != null}" class="text-gray-400">-</span>
+                </td>
+                <td class="px-4 py-3 text-sm text-gray-600">
+                  <span th:if="${solve.reflection != null and !solve.reflection.isEmpty()}" th:text="${#strings.abbreviate(solve.reflection, 60)}">회고</span>
+                  <span th:unless="${solve.reflection != null and !solve.reflection.isEmpty()}" class="text-gray-400">-</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span th:text="${#lists.size(solve.imageUrls)} + '장'">0장</span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div th:if="${#lists.isEmpty(problemSolves)}" class="text-center py-8 text-gray-500">
+          이 문제에 작성된 복습 기록이 없습니다
+        </div>
+      </div>
+    </div>
+
     <!-- Back Button -->
     <div class="mt-6 flex justify-end">
       <a th:href="@{/admin/problems}"

From b8b65b61c44f7fe1ec4c52b3d22122c57b7eda28 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:16:39 +0900
Subject: [PATCH 11/43] =?UTF-8?q?[feat]=20=ED=86=B5=EA=B3=84=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=B0=A9=EB=AC=B8=20=EC=88=98=20/=20?=
 =?UTF-8?q?=ED=95=A9=EA=B3=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   | 10 +++++
 .../mission/service/MissionLogService.java    | 11 ++++-
 src/main/resources/templates/analysis.html    | 41 +++++++++++++++++--
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index 402885d3..0bc79421 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -56,6 +56,7 @@ public String getAllAnalysis(
 
         // 선택 기간 날짜별 출석 유저 수 및 신규 가입자 수
         Map<LocalDate, Long> dailyActiveUsers = missionLogService.getDailyActiveUsersCount(selectedStartDate, selectedEndDate);
+        Map<LocalDate, Long> dailyVisits = missionLogService.getDailyVisitCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyPracticeNotes = practiceNoteService.getDailyPracticeNotesCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyPracticeLogs = missionLogService.getDailyNotePracticeLogsCount(selectedStartDate, selectedEndDate);
@@ -64,6 +65,12 @@ public String getAllAnalysis(
         long recentNewUsersCount = dailyNewUsers.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
+        long periodVisitCount = dailyVisits.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
+        long periodActiveUserCount = dailyActiveUsers.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
         long periodPracticeNoteCount = dailyPracticeNotes.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
@@ -82,10 +89,13 @@ public String getAllAnalysis(
         model.addAttribute("allPracticeNoteCount", allPracticeNoteCount);
         model.addAttribute("allPracticeLogCount", allPracticeLogCount);
         model.addAttribute("dailyActiveUsers", dailyActiveUsers);
+        model.addAttribute("dailyVisits", dailyVisits);
         model.addAttribute("dailyNewUsers", dailyNewUsers);
         model.addAttribute("dailyPracticeNotes", dailyPracticeNotes);
         model.addAttribute("dailyPracticeLogs", dailyPracticeLogs);
         model.addAttribute("recentNewUsersCount", recentNewUsersCount);
+        model.addAttribute("periodVisitCount", periodVisitCount);
+        model.addAttribute("periodActiveUserCount", periodActiveUserCount);
         model.addAttribute("periodPracticeNoteCount", periodPracticeNoteCount);
         model.addAttribute("periodPracticeLogCount", periodPracticeLogCount);
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index 0b170042..8e8b8a1a 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -179,6 +179,11 @@ public Map<LocalDate, Long> getDailyActiveUsersCount(LocalDate startDate, LocalD
         return missionLogRepository.getDailyActiveUsersCount(startDate, endDate);
     }
 
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyVisitCount(LocalDate startDate, LocalDate endDate) {
+        return getDailyMissionCount(MissionType.USER_LOGIN, startDate, endDate);
+    }
+
     @Transactional(readOnly = true)
     public List<com.aisip.OnO.backend.user.entity.User> getActiveUsersByDate(LocalDate date) {
         return missionLogRepository.getActiveUsersByDate(date);
@@ -214,9 +219,13 @@ public long countNotePracticeLogs() {
 
     @Transactional(readOnly = true)
     public Map<LocalDate, Long> getDailyNotePracticeLogsCount(LocalDate startDate, LocalDate endDate) {
+        return getDailyMissionCount(MissionType.NOTE_PRACTICE, startDate, endDate);
+    }
+
+    private Map<LocalDate, Long> getDailyMissionCount(MissionType missionType, LocalDate startDate, LocalDate endDate) {
         Map<LocalDate, Long> result = new LinkedHashMap<>();
         missionLogRepository.countDailyByMissionType(
-                        MissionType.NOTE_PRACTICE,
+                        missionType,
                         startDate.atStartOfDay(),
                         endDate.atTime(LocalTime.MAX)
                 )
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 7b0043a1..255e8ea0 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -222,6 +222,10 @@ <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
                 <span class="text-sm font-medium text-gray-600">총 유저 수</span>
                 <span class="text-sm font-bold text-gray-900" th:text="${allUserCount}">0</span>
               </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 방문 횟수</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${periodVisitCount}">0</span>
+              </div>
             </div>
           </div>
 
@@ -283,6 +287,7 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
             <thead class="bg-gray-50">
               <tr>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">날짜</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">방문 횟수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">출석 유저 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">신규 가입자 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트 생성 수</th>
@@ -292,6 +297,11 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
             <tbody class="bg-white divide-y divide-gray-200">
               <tr th:each="entry : ${dailyActiveUsers}" class="hover:bg-gray-50">
                 <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${#temporals.format(entry.key, 'yyyy-MM-dd (E)')}">2024-01-01</td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span class="font-semibold" th:classappend="${dailyVisits[entry.key] > 0 ? 'text-cyan-600' : 'text-gray-400'}"
+                        th:text="${dailyVisits[entry.key]}">0</span>
+                  <span class="ml-1 text-gray-500">회</span>
+                </td>
                 <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
                   <a th:if="${entry.value > 0}"
                      th:href="@{/admin/analysis/daily-active-users(date=${entry.key})}"
@@ -328,11 +338,36 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                 </td>
               </tr>
               <tr th:if="${#maps.isEmpty(dailyActiveUsers)}">
-                <td colspan="5" class="px-4 py-8 text-center text-gray-500">
+                <td colspan="6" class="px-4 py-8 text-center text-gray-500">
                   데이터가 없습니다
                 </td>
               </tr>
             </tbody>
+            <tfoot class="bg-gray-50 border-t border-gray-200">
+              <tr>
+                <td class="px-4 py-3 whitespace-nowrap text-sm font-bold text-gray-900">합계</td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-cyan-700" th:text="${periodVisitCount}">0</span>
+                  <span class="ml-1 text-gray-500">회</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-blue-700" th:text="${periodActiveUserCount}">0</span>
+                  <span class="ml-1 text-gray-500">명</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-orange-700" th:text="${recentNewUsersCount}">0</span>
+                  <span class="ml-1 text-gray-500">명</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-pink-700" th:text="${periodPracticeNoteCount}">0</span>
+                  <span class="ml-1 text-gray-500">개</span>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-indigo-700" th:text="${periodPracticeLogCount}">0</span>
+                  <span class="ml-1 text-gray-500">회</span>
+                </td>
+              </tr>
+            </tfoot>
           </table>
         </div>
       </div>
@@ -373,8 +408,8 @@ <h3 class="text-lg font-semibold text-gray-900 mb-4">빠른 이동</h3>
             </svg>
           </div>
           <div class="ml-4">
-            <p class="text-sm font-medium text-gray-900">복습 관리</p>
-            <p class="text-xs text-gray-500">복습노트 및 기록 보기</p>
+            <p class="text-sm font-medium text-gray-900">복습노트 관리</p>
+            <p class="text-xs text-gray-500">복습노트 목록 보기</p>
           </div>
         </a>
 

From a64887ad7d759a36e2de527b9865ff203c5de2d8 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 25 Apr 2026 23:25:25 +0900
Subject: [PATCH 12/43] =?UTF-8?q?[feat]=20=ED=86=B5=EA=B3=84=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B3=A0=EC=9C=A0=20=EB=B0=A9=EB=AC=B8=20?=
 =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EC=88=98,=20DAU=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   | 12 ++++----
 .../repository/MissionLogRepository.java      | 12 ++++++++
 .../mission/service/MissionLogService.java    |  9 ++++++
 src/main/resources/templates/analysis.html    | 30 +++++++++++++++++--
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index 0bc79421..e0ced9a0 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -16,6 +16,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -71,6 +72,7 @@ public String getAllAnalysis(
         long periodActiveUserCount = dailyActiveUsers.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
+        long periodUniqueVisitorCount = missionLogService.countUniqueVisitors(selectedStartDate, selectedEndDate);
         long periodPracticeNoteCount = dailyPracticeNotes.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
@@ -78,11 +80,10 @@ public String getAllAnalysis(
                 .mapToLong(Long::longValue)
                 .sum();
 
-        // 하루 평균 방문자 수 (선택 기간)
-        double averageDailyVisitors = dailyActiveUsers.values().stream()
-                .mapToLong(Long::longValue)
-                .average()
-                .orElse(0.0);
+        long selectedDays = ChronoUnit.DAYS.between(selectedStartDate, selectedEndDate) + 1;
+        double averageDailyVisitors = selectedDays > 0
+                ? (double) periodActiveUserCount / selectedDays
+                : 0.0;
 
         model.addAttribute("allUserCount", allUserCount);
         model.addAttribute("allProblemCount", allProblemCount);
@@ -96,6 +97,7 @@ public String getAllAnalysis(
         model.addAttribute("recentNewUsersCount", recentNewUsersCount);
         model.addAttribute("periodVisitCount", periodVisitCount);
         model.addAttribute("periodActiveUserCount", periodActiveUserCount);
+        model.addAttribute("periodUniqueVisitorCount", periodUniqueVisitorCount);
         model.addAttribute("periodPracticeNoteCount", periodPracticeNoteCount);
         model.addAttribute("periodPracticeLogCount", periodPracticeLogCount);
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
diff --git a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
index e9318f54..6a2b211c 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/repository/MissionLogRepository.java
@@ -25,6 +25,18 @@ long countByMissionTypeAndCreatedAtBetween(
             LocalDateTime endDateTime
     );
 
+    @Query("""
+            SELECT COUNT(DISTINCT m.user.id)
+            FROM MissionLog m
+            WHERE m.missionType = :missionType
+              AND m.createdAt BETWEEN :startDateTime AND :endDateTime
+            """)
+    long countDistinctUsersByMissionTypeAndCreatedAtBetween(
+            @Param("missionType") MissionType missionType,
+            @Param("startDateTime") LocalDateTime startDateTime,
+            @Param("endDateTime") LocalDateTime endDateTime
+    );
+
     @Query("""
             SELECT FUNCTION('DATE', m.createdAt), COUNT(m)
             FROM MissionLog m
diff --git a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
index 8e8b8a1a..4a9f58d1 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/service/MissionLogService.java
@@ -184,6 +184,15 @@ public Map<LocalDate, Long> getDailyVisitCount(LocalDate startDate, LocalDate en
         return getDailyMissionCount(MissionType.USER_LOGIN, startDate, endDate);
     }
 
+    @Transactional(readOnly = true)
+    public long countUniqueVisitors(LocalDate startDate, LocalDate endDate) {
+        return missionLogRepository.countDistinctUsersByMissionTypeAndCreatedAtBetween(
+                MissionType.USER_LOGIN,
+                startDate.atStartOfDay(),
+                endDate.atTime(LocalTime.MAX)
+        );
+    }
+
     @Transactional(readOnly = true)
     public List<com.aisip.OnO.backend.user.entity.User> getActiveUsersByDate(LocalDate date) {
         return missionLogRepository.getActiveUsersByDate(date);
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index 255e8ea0..bd7abb99 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -130,10 +130,27 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
       </div>
 
       <!-- Average Daily Visitors -->
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-cyan-500">
+        <div class="flex items-center justify-between">
+          <div>
+            <p class="text-sm font-medium text-gray-500 uppercase">선택 기간 고유 방문 유저</p>
+            <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${periodUniqueVisitorCount}">0</p>
+          </div>
+          <div class="p-3 bg-cyan-100 rounded-full">
+            <svg class="w-8 h-8 text-cyan-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18 18.72a9.094 9.094 0 003.75.78 9 9 0 00-9-9 9.094 9.094 0 00-3.75.78M18 18.72A8.966 8.966 0 0112.75 21a8.966 8.966 0 01-5.25-2.28M18 18.72A5.985 5.985 0 0012.75 15a5.985 5.985 0 00-5.25 3.72M15.75 6a3 3 0 11-6 0 3 3 0 016 0z"></path>
+            </svg>
+          </div>
+        </div>
+        <div class="mt-4">
+          <p class="text-xs text-gray-500">선택 기간 로그인한 서로 다른 유저</p>
+        </div>
+      </div>
+
       <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-purple-500">
         <div class="flex items-center justify-between">
           <div>
-            <p class="text-sm font-medium text-gray-500 uppercase">하루 평균 방문자 수</p>
+            <p class="text-sm font-medium text-gray-500 uppercase">선택 기간 평균 DAU</p>
             <p class="mt-2 text-3xl font-bold text-gray-900"
                th:text="${#numbers.formatDecimal(averageDailyVisitors, 1, 1)}">0.0</p>
           </div>
@@ -144,7 +161,7 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
           </div>
         </div>
         <div class="mt-4">
-          <p class="text-xs text-gray-500">선택 기간 기준</p>
+          <p class="text-xs text-gray-500">날짜별 출석 유저 수 평균</p>
         </div>
       </div>
 
@@ -226,6 +243,15 @@ <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
                 <span class="text-sm font-medium text-gray-600">선택 기간 방문 횟수</span>
                 <span class="text-sm font-bold text-gray-900" th:text="${periodVisitCount}">0</span>
               </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 고유 방문 유저</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${periodUniqueVisitorCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 평균 DAU</span>
+                <span class="text-sm font-bold text-gray-900"
+                      th:text="${#numbers.formatDecimal(averageDailyVisitors, 1, 1)}">0.0</span>
+              </div>
             </div>
           </div>
 

From 504c56187bd54e4b44f77434b3ca0df413437469 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:02:34 +0900
Subject: [PATCH 13/43] =?UTF-8?q?[feat]=20=EB=AC=B8=EC=A0=9C/=EB=B6=84?=
 =?UTF-8?q?=EC=84=9D=20=ED=86=B5=EA=B3=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAnalysisController.java   |  31 ++++++
 .../repository/ProblemRepositoryCustom.java   |  11 ++
 .../repository/ProblemRepositoryImpl.java     |  85 ++++++++++++++-
 .../problem/service/ProblemService.java       |  35 ++++++
 src/main/resources/templates/analysis.html    | 100 +++++++++++++++++-
 5 files changed, 259 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
index e0ced9a0..aa566a11 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
@@ -2,6 +2,7 @@
 
 import com.aisip.OnO.backend.mission.service.MissionLogService;
 import com.aisip.OnO.backend.practicenote.service.PracticeNoteService;
+import com.aisip.OnO.backend.problem.entity.AnalysisStatus;
 import com.aisip.OnO.backend.problem.service.ProblemService;
 import com.aisip.OnO.backend.user.dto.UserResponseDto;
 import com.aisip.OnO.backend.user.entity.User;
@@ -44,6 +45,8 @@ public String getAllAnalysis(
         long allProblemCount = problemService.countAllProblems();
         long allPracticeNoteCount = practiceNoteService.countAllPracticeNotes();
         long allPracticeLogCount = missionLogService.countNotePracticeLogs();
+        long allProblemAnalysisCount = problemService.countAllProblemAnalyses();
+        Map<AnalysisStatus, Long> allAnalysisStatusCounts = problemService.countProblemAnalysesByStatus();
 
         LocalDate today = LocalDate.now();
         LocalDate selectedStartDate = startDate != null ? startDate : today.minusDays(29);
@@ -61,6 +64,8 @@ public String getAllAnalysis(
         Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyPracticeNotes = practiceNoteService.getDailyPracticeNotesCount(selectedStartDate, selectedEndDate);
         Map<LocalDate, Long> dailyPracticeLogs = missionLogService.getDailyNotePracticeLogsCount(selectedStartDate, selectedEndDate);
+        Map<LocalDate, Long> dailyProblems = problemService.getDailyProblemsCount(selectedStartDate, selectedEndDate);
+        Map<AnalysisStatus, Long> periodAnalysisStatusCounts = problemService.countProblemAnalysesByStatus(selectedStartDate, selectedEndDate);
 
         // 선택 기간 신규 가입자 총합
         long recentNewUsersCount = dailyNewUsers.values().stream()
@@ -79,6 +84,18 @@ public String getAllAnalysis(
         long periodPracticeLogCount = dailyPracticeLogs.values().stream()
                 .mapToLong(Long::longValue)
                 .sum();
+        long periodProblemCount = dailyProblems.values().stream()
+                .mapToLong(Long::longValue)
+                .sum();
+        long periodCompletedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.COMPLETED, 0L);
+        long periodFailedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.FAILED, 0L);
+        long periodProcessingAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.PROCESSING, 0L);
+        long periodNotStartedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.NOT_STARTED, 0L);
+        long periodNoImageAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.NO_IMAGE, 0L);
+        long periodFinishedAnalysisCount = periodCompletedAnalysisCount + periodFailedAnalysisCount;
+        double periodAnalysisFailureRate = periodFinishedAnalysisCount == 0
+                ? 0.0
+                : (double) periodFailedAnalysisCount * 100 / periodFinishedAnalysisCount;
 
         long selectedDays = ChronoUnit.DAYS.between(selectedStartDate, selectedEndDate) + 1;
         double averageDailyVisitors = selectedDays > 0
@@ -89,17 +106,31 @@ public String getAllAnalysis(
         model.addAttribute("allProblemCount", allProblemCount);
         model.addAttribute("allPracticeNoteCount", allPracticeNoteCount);
         model.addAttribute("allPracticeLogCount", allPracticeLogCount);
+        model.addAttribute("allProblemAnalysisCount", allProblemAnalysisCount);
+        model.addAttribute("allCompletedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.COMPLETED, 0L));
+        model.addAttribute("allFailedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.FAILED, 0L));
+        model.addAttribute("allProcessingAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.PROCESSING, 0L));
+        model.addAttribute("allNotStartedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.NOT_STARTED, 0L));
+        model.addAttribute("allNoImageAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.NO_IMAGE, 0L));
         model.addAttribute("dailyActiveUsers", dailyActiveUsers);
         model.addAttribute("dailyVisits", dailyVisits);
         model.addAttribute("dailyNewUsers", dailyNewUsers);
         model.addAttribute("dailyPracticeNotes", dailyPracticeNotes);
         model.addAttribute("dailyPracticeLogs", dailyPracticeLogs);
+        model.addAttribute("dailyProblems", dailyProblems);
         model.addAttribute("recentNewUsersCount", recentNewUsersCount);
         model.addAttribute("periodVisitCount", periodVisitCount);
         model.addAttribute("periodActiveUserCount", periodActiveUserCount);
         model.addAttribute("periodUniqueVisitorCount", periodUniqueVisitorCount);
         model.addAttribute("periodPracticeNoteCount", periodPracticeNoteCount);
         model.addAttribute("periodPracticeLogCount", periodPracticeLogCount);
+        model.addAttribute("periodProblemCount", periodProblemCount);
+        model.addAttribute("periodCompletedAnalysisCount", periodCompletedAnalysisCount);
+        model.addAttribute("periodFailedAnalysisCount", periodFailedAnalysisCount);
+        model.addAttribute("periodProcessingAnalysisCount", periodProcessingAnalysisCount);
+        model.addAttribute("periodNotStartedAnalysisCount", periodNotStartedAnalysisCount);
+        model.addAttribute("periodNoImageAnalysisCount", periodNoImageAnalysisCount);
+        model.addAttribute("periodAnalysisFailureRate", periodAnalysisFailureRate);
         model.addAttribute("averageDailyVisitors", averageDailyVisitors);
         model.addAttribute("startDate", selectedStartDate);
         model.addAttribute("endDate", selectedEndDate);
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
index 1dde7b32..63a09041 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryCustom.java
@@ -1,11 +1,14 @@
 package com.aisip.OnO.backend.problem.repository;
 
 import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
+import com.aisip.OnO.backend.problem.entity.AnalysisStatus;
 import com.aisip.OnO.backend.problem.entity.Problem;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public interface ProblemRepositoryCustom {
@@ -20,6 +23,14 @@ public interface ProblemRepositoryCustom {
 
     Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable);
 
+    Map<LocalDate, Long> countDailyProblems(LocalDate startDate, LocalDate endDate);
+
+    long countProblemAnalysesForActiveProblems();
+
+    Map<AnalysisStatus, Long> countProblemAnalysesByStatusForActiveProblems();
+
+    Map<AnalysisStatus, Long> countProblemAnalysesByStatusForActiveProblems(LocalDate startDate, LocalDate endDate);
+
     List<Problem> findAllProblemsByPracticeId(Long practiceId);
 
     /**
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
index 3ea48ae8..e427f186 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepositoryImpl.java
@@ -1,18 +1,29 @@
 package com.aisip.OnO.backend.problem.repository;
 
 import com.aisip.OnO.backend.admin.dto.AdminProblemResponseDto;
+import com.aisip.OnO.backend.problem.entity.AnalysisStatus;
 import com.aisip.OnO.backend.problem.entity.Problem;
 import com.aisip.OnO.backend.problem.entity.QProblem;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.sql.Date;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.EnumMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
+import static com.aisip.OnO.backend.folder.entity.QFolder.folder;
 import static com.aisip.OnO.backend.practicenote.entity.QPracticeNote.practiceNote;
 import static com.aisip.OnO.backend.practicenote.entity.QProblemPracticeNoteMapping.problemPracticeNoteMapping;
 import static com.aisip.OnO.backend.problem.entity.QProblem.problem;
@@ -78,7 +89,7 @@ public Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable) {
                 .select(Projections.constructor(
                         AdminProblemResponseDto.class,
                         problem.id,
-                        problem.folder.id,
+                        folder.id,
                         problem.memo,
                         problem.reference,
                         problemAnalysis.status.stringValue(),
@@ -86,7 +97,7 @@ public Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable) {
                         problem.createdAt
                 ))
                 .from(problem)
-                .leftJoin(problem.folder)
+                .leftJoin(problem.folder, folder)
                 .leftJoin(problem.problemAnalysis, problemAnalysis)
                 .orderBy(problem.createdAt.desc(), problem.id.desc())
                 .offset(pageable.getOffset())
@@ -101,6 +112,76 @@ public Page<AdminProblemResponseDto> findAdminProblems(Pageable pageable) {
         return new PageImpl<>(content, pageable, total != null ? total : 0L);
     }
 
+    @Override
+    public Map<LocalDate, Long> countDailyProblems(LocalDate startDate, LocalDate endDate) {
+        DateExpression<Date> createdDate = Expressions.dateTemplate(
+                Date.class,
+                "date({0})",
+                problem.createdAt
+        );
+
+        List<Tuple> rows = queryFactory
+                .select(createdDate, problem.count())
+                .from(problem)
+                .where(problem.createdAt.between(startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX)))
+                .groupBy(createdDate)
+                .fetch();
+
+        Map<LocalDate, Long> countsByDate = new LinkedHashMap<>();
+        rows.forEach(row -> {
+            Date date = row.get(createdDate);
+            if (date != null) {
+                countsByDate.put(date.toLocalDate(), row.get(problem.count()));
+            }
+        });
+
+        Map<LocalDate, Long> result = new LinkedHashMap<>();
+        for (LocalDate date = endDate; !date.isBefore(startDate); date = date.minusDays(1)) {
+            result.put(date, countsByDate.getOrDefault(date, 0L));
+        }
+
+        return result;
+    }
+
+    @Override
+    public long countProblemAnalysesForActiveProblems() {
+        Long count = queryFactory
+                .select(problemAnalysis.count())
+                .from(problemAnalysis)
+                .join(problemAnalysis.problem, problem)
+                .where(problem.deletedAt.isNull())
+                .fetchOne();
+
+        return count != null ? count : 0L;
+    }
+
+    @Override
+    public Map<AnalysisStatus, Long> countProblemAnalysesByStatusForActiveProblems() {
+        return countProblemAnalysesByStatusForActiveProblems(null, null);
+    }
+
+    @Override
+    public Map<AnalysisStatus, Long> countProblemAnalysesByStatusForActiveProblems(LocalDate startDate, LocalDate endDate) {
+        var query = queryFactory
+                .select(problemAnalysis.status, problemAnalysis.count())
+                .from(problemAnalysis)
+                .join(problemAnalysis.problem, problem)
+                .where(problem.deletedAt.isNull());
+
+        if (startDate != null && endDate != null) {
+            query.where(problemAnalysis.updatedAt.between(startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX)));
+        }
+
+        List<Tuple> rows = query
+                .groupBy(problemAnalysis.status)
+                .fetch();
+
+        Map<AnalysisStatus, Long> result = new EnumMap<>(AnalysisStatus.class);
+        rows.forEach(row -> result.put(row.get(problemAnalysis.status), row.get(problemAnalysis.count())));
+
+        return result;
+    }
+
     @Override
     public List<Problem> findAllProblemsByPracticeId(Long practiceId) {
         return queryFactory
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index 179d3a7d..0eceac62 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -36,10 +36,15 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.EnumMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -134,6 +139,36 @@ public long countAllProblems() {
         return problemRepository.count();
     }
 
+    @Transactional(readOnly = true)
+    public long countAllProblemAnalyses() {
+        return problemRepository.countProblemAnalysesForActiveProblems();
+    }
+
+    @Transactional(readOnly = true)
+    public Map<LocalDate, Long> getDailyProblemsCount(LocalDate startDate, LocalDate endDate) {
+        return problemRepository.countDailyProblems(startDate, endDate);
+    }
+
+    @Transactional(readOnly = true)
+    public Map<AnalysisStatus, Long> countProblemAnalysesByStatus() {
+        return fillMissingAnalysisStatuses(problemRepository.countProblemAnalysesByStatusForActiveProblems());
+    }
+
+    @Transactional(readOnly = true)
+    public Map<AnalysisStatus, Long> countProblemAnalysesByStatus(LocalDate startDate, LocalDate endDate) {
+        return fillMissingAnalysisStatuses(problemRepository.countProblemAnalysesByStatusForActiveProblems(startDate, endDate));
+    }
+
+    private Map<AnalysisStatus, Long> fillMissingAnalysisStatuses(Map<AnalysisStatus, Long> source) {
+        Map<AnalysisStatus, Long> result = new EnumMap<>(AnalysisStatus.class);
+
+        for (AnalysisStatus status : AnalysisStatus.values()) {
+            result.put(status, source.getOrDefault(status, 0L));
+        }
+
+        return result;
+    }
+
     @Transactional(readOnly = true)
     public Page<AdminProblemResponseDto> findAdminProblems(int page, int size) {
         return problemRepository.findAdminProblems(PageRequest.of(page, size));
diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index bd7abb99..4fa69138 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -130,6 +130,41 @@ <h2 class="text-2xl font-bold text-gray-900">시스템 통계</h2>
       </div>
 
       <!-- Average Daily Visitors -->
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-emerald-500">
+        <div class="flex items-center justify-between">
+          <div>
+            <p class="text-sm font-medium text-gray-500 uppercase">선택 기간 문제 등록 수</p>
+            <p class="mt-2 text-3xl font-bold text-gray-900" th:text="${periodProblemCount}">0</p>
+          </div>
+          <div class="p-3 bg-emerald-100 rounded-full">
+            <svg class="w-8 h-8 text-emerald-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"></path>
+            </svg>
+          </div>
+        </div>
+        <div class="mt-4">
+          <p class="text-xs text-gray-500">선택 기간 작성된 문제</p>
+        </div>
+      </div>
+
+      <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-red-500">
+        <div class="flex items-center justify-between">
+          <div>
+            <p class="text-sm font-medium text-gray-500 uppercase">선택 기간 분석 실패율</p>
+            <p class="mt-2 text-3xl font-bold text-gray-900"
+               th:text="${#numbers.formatDecimal(periodAnalysisFailureRate, 1, 1)} + '%'">0.0%</p>
+          </div>
+          <div class="p-3 bg-red-100 rounded-full">
+            <svg class="w-8 h-8 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v4m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"></path>
+            </svg>
+          </div>
+        </div>
+        <div class="mt-4">
+          <p class="text-xs text-gray-500">완료/실패 처리된 분석 기준</p>
+        </div>
+      </div>
+
       <div class="bg-white rounded-lg shadow-md p-6 border-l-4 border-cyan-500">
         <div class="flex items-center justify-between">
           <div>
@@ -268,6 +303,59 @@ <h4 class="text-md font-semibold text-gray-800 mb-4 flex items-center">
                 <span class="text-sm font-medium text-gray-600">총 문제 수</span>
                 <span class="text-sm font-bold text-gray-900" th:text="${allProblemCount}">0</span>
               </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 문제 등록</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${periodProblemCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">총 분석 데이터 수</span>
+                <span class="text-sm font-bold text-gray-900" th:text="${allProblemAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">전체 분석 완료</span>
+                <span class="text-sm font-bold text-green-700" th:text="${allCompletedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">전체 분석 실패</span>
+                <span class="text-sm font-bold text-red-700" th:text="${allFailedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">전체 분석 중</span>
+                <span class="text-sm font-bold text-yellow-700" th:text="${allProcessingAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">전체 분석 대기</span>
+                <span class="text-sm font-bold text-blue-700" th:text="${allNotStartedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">전체 이미지 없음</span>
+                <span class="text-sm font-bold text-gray-700" th:text="${allNoImageAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 분석 완료</span>
+                <span class="text-sm font-bold text-green-700" th:text="${periodCompletedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 분석 실패</span>
+                <span class="text-sm font-bold text-red-700" th:text="${periodFailedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 분석 실패율</span>
+                <span class="text-sm font-bold text-red-700"
+                      th:text="${#numbers.formatDecimal(periodAnalysisFailureRate, 1, 1)} + '%'">0.0%</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 분석 중</span>
+                <span class="text-sm font-bold text-yellow-700" th:text="${periodProcessingAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 분석 대기</span>
+                <span class="text-sm font-bold text-blue-700" th:text="${periodNotStartedAnalysisCount}">0</span>
+              </div>
+              <div class="flex justify-between items-center p-3 bg-gray-50 rounded-lg">
+                <span class="text-sm font-medium text-gray-600">선택 기간 이미지 없음</span>
+                <span class="text-sm font-bold text-gray-700" th:text="${periodNoImageAnalysisCount}">0</span>
+              </div>
             </div>
           </div>
 
@@ -316,6 +404,7 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">방문 횟수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">출석 유저 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">신규 가입자 수</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">문제 등록 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습노트 생성 수</th>
                 <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">복습 수행 수</th>
               </tr>
@@ -352,6 +441,11 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                     <span class="ml-1 text-gray-500">명</span>
                   </span>
                 </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
+                  <span class="font-semibold" th:classappend="${dailyProblems[entry.key] > 0 ? 'text-emerald-600' : 'text-gray-400'}"
+                        th:text="${dailyProblems[entry.key]}">0</span>
+                  <span class="ml-1 text-gray-500">개</span>
+                </td>
                 <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-600">
                   <span class="font-semibold" th:classappend="${dailyPracticeNotes[entry.key] > 0 ? 'text-pink-600' : 'text-gray-400'}"
                         th:text="${dailyPracticeNotes[entry.key]}">0</span>
@@ -364,7 +458,7 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                 </td>
               </tr>
               <tr th:if="${#maps.isEmpty(dailyActiveUsers)}">
-                <td colspan="6" class="px-4 py-8 text-center text-gray-500">
+                <td colspan="7" class="px-4 py-8 text-center text-gray-500">
                   데이터가 없습니다
                 </td>
               </tr>
@@ -384,6 +478,10 @@ <h3 class="text-lg font-semibold text-gray-900">날짜별 출석 유저 수</h3>
                   <span class="font-bold text-orange-700" th:text="${recentNewUsersCount}">0</span>
                   <span class="ml-1 text-gray-500">명</span>
                 </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
+                  <span class="font-bold text-emerald-700" th:text="${periodProblemCount}">0</span>
+                  <span class="ml-1 text-gray-500">개</span>
+                </td>
                 <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-700">
                   <span class="font-bold text-pink-700" th:text="${periodPracticeNoteCount}">0</span>
                   <span class="ml-1 text-gray-500">개</span>

From 9f281affe56db828b3c176a20ec9cc8ec3a5f2c5 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:02:42 +0900
Subject: [PATCH 14/43] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=A1=B0=ED=9A=8C=20=EB=B0=8F=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B3=B4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminProblemController.java    |  7 +++++
 .../controller/ProblemControllerTest.java     | 29 +++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
index 9e94d5b5..2ef6b3e6 100644
--- a/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
+++ b/src/main/java/com/aisip/OnO/backend/admin/controller/AdminProblemController.java
@@ -43,6 +43,13 @@ public String getAllProblems(
         int selectedSize = Math.max(size, 1);
         Page<AdminProblemResponseDto> problemPage = problemService.findAdminProblems(selectedPage, selectedSize);
         int totalPages = problemPage.getTotalPages();
+
+        if (totalPages > 0 && selectedPage >= totalPages) {
+            selectedPage = totalPages - 1;
+            problemPage = problemService.findAdminProblems(selectedPage, selectedSize);
+            totalPages = problemPage.getTotalPages();
+        }
+
         int pageBlockStart = (selectedPage / 10) * 10;
         int pageBlockEnd = Math.min(pageBlockStart + 9, Math.max(totalPages - 1, 0));
 
diff --git a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
index e5d885af..da945347 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
@@ -19,6 +19,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.mock.web.MockMultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -75,7 +76,9 @@ void setUp() {
                     LocalDateTime.now(),
                     LocalDateTime.now(),
                     imageUrlList,
-                    null
+                    null,
+                    List.of(),
+                    List.of()
             );
 
             problemResponseDtoList.add(problemResponseDto);
@@ -181,18 +184,20 @@ void registerProblem() throws Exception {
     @WithMockCustomUser()
     void registerProblemImageData() throws Exception {
         // When & Then
-        mockMvc.perform(post("/api/problems/imageData")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(
-                                new ProblemImageDataRegisterDto(
-                                        1L,
-                                        "problemImage",
-                                        ProblemImageType.PROBLEM_IMAGE
-                                )
-                        )))
+        MockMultipartFile image = new MockMultipartFile(
+                "problemImages",
+                "problem.png",
+                MediaType.IMAGE_PNG_VALUE,
+                "problem-image".getBytes()
+        );
+
+        mockMvc.perform(multipart("/api/problems/{problemId}/imageData", 1L)
+                        .file(image)
+                        .param("problemImageTypes", ProblemImageType.PROBLEM_IMAGE.name()))
                 .andExpect(status().isOk());
 
-        //verify(problemService, times(1)).registerProblemImageData(any(), eq(1L));  // userId가 1L인 것도 검증
+        verify(problemService, times(1)).uploadProblemImages(eq(1L), eq(1L), any(), any());
+        verify(problemService, times(1)).analysisProblem(eq(1L));
     }
 
     @Test
@@ -255,4 +260,4 @@ void deleteProblemImageData() throws Exception {
 
         Mockito.verify(problemService, Mockito.times(1)).deleteProblemImageData(imageUrl);
     }
-}
\ No newline at end of file
+}

From 56456fc2a58ee2e66dd7885e4282a5bedeaaf83e Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:17:32 +0900
Subject: [PATCH 15/43] =?UTF-8?q?[feat]=20Loki=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A7=91=20=EC=8A=A4=ED=83=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.dev.yml       | 45 ++++++++++++++++++++++++++++++
 docker-compose.prod.yml      | 45 ++++++++++++++++++++++++++++++
 monitoring/loki.dev.yml      | 53 ++++++++++++++++++++++++++++++++++++
 monitoring/loki.prod.yml     | 53 ++++++++++++++++++++++++++++++++++++
 monitoring/promtail.dev.yml  | 52 +++++++++++++++++++++++++++++++++++
 monitoring/promtail.prod.yml | 53 ++++++++++++++++++++++++++++++++++++
 6 files changed, 301 insertions(+)
 create mode 100644 monitoring/loki.dev.yml
 create mode 100644 monitoring/loki.prod.yml
 create mode 100644 monitoring/promtail.dev.yml
 create mode 100644 monitoring/promtail.prod.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e3f1c120..d339ba1e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -145,6 +145,46 @@ services:
     profiles:
       - monitoring
 
+  # Loki - DEVELOPMENT (Profile: monitoring)
+  loki-dev:
+    image: grafana/loki:2.9.8
+    container_name: ono-loki-dev
+    restart: unless-stopped
+    command:
+      - -config.file=/etc/loki/loki.yml
+    ports:
+      - "127.0.0.1:3101:3100"
+    volumes:
+      - ./monitoring/loki.dev.yml:/etc/loki/loki.yml:ro
+      - loki_dev_data:/loki
+    mem_limit: 512m
+    cpus: "0.50"
+    networks:
+      - ono-network
+    profiles:
+      - monitoring
+
+  # Promtail - DEVELOPMENT (Profile: monitoring)
+  promtail-dev:
+    image: grafana/promtail:2.9.8
+    container_name: ono-promtail-dev
+    restart: unless-stopped
+    command:
+      - -config.file=/etc/promtail/promtail.yml
+    volumes:
+      - ./monitoring/promtail.dev.yml:/etc/promtail/promtail.yml:ro
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - promtail_dev_positions:/tmp
+    mem_limit: 256m
+    cpus: "0.25"
+    depends_on:
+      - loki-dev
+    networks:
+      - ono-network
+    profiles:
+      - monitoring
+
   mysql-exporter-dev:
     image: prom/mysqld-exporter:v0.15.1
     container_name: ono-mysql-exporter-dev
@@ -180,6 +220,7 @@ services:
       - ./monitoring/grafana/dashboards:/etc/grafana/dashboards:ro
     depends_on:
       - prometheus-dev
+      - loki-dev
     networks:
       - ono-network
     profiles:
@@ -201,5 +242,9 @@ volumes:
     driver: local
   prometheus_dev_data:
     driver: local
+  loki_dev_data:
+    driver: local
+  promtail_dev_positions:
+    driver: local
   grafana_dev_data:
     driver: local
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 6df7a3b0..7554eca3 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -199,6 +199,46 @@ services:
     profiles:
       - monitoring
 
+  # Loki - PRODUCTION (Profile: monitoring)
+  loki-prod:
+    image: grafana/loki:2.9.8
+    container_name: ono-loki-prod
+    restart: unless-stopped
+    command:
+      - -config.file=/etc/loki/loki.yml
+    ports:
+      - "127.0.0.1:3100:3100"
+    volumes:
+      - ./monitoring/loki.prod.yml:/etc/loki/loki.yml:ro
+      - loki_prod_data:/loki
+    mem_limit: 768m
+    cpus: "0.75"
+    networks:
+      - ono-network
+    profiles:
+      - monitoring
+
+  # Promtail - PRODUCTION (Profile: monitoring)
+  promtail-prod:
+    image: grafana/promtail:2.9.8
+    container_name: ono-promtail-prod
+    restart: unless-stopped
+    command:
+      - -config.file=/etc/promtail/promtail.yml
+    volumes:
+      - ./monitoring/promtail.prod.yml:/etc/promtail/promtail.yml:ro
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - promtail_prod_positions:/tmp
+    mem_limit: 256m
+    cpus: "0.25"
+    depends_on:
+      - loki-prod
+    networks:
+      - ono-network
+    profiles:
+      - monitoring
+
   mysql-exporter-prod:
     image: prom/mysqld-exporter:v0.15.1
     container_name: ono-mysql-exporter-prod
@@ -234,6 +274,7 @@ services:
       - ./monitoring/grafana/dashboards:/etc/grafana/dashboards:ro
     depends_on:
       - prometheus-prod
+      - loki-prod
     networks:
       - ono-network
     profiles:
@@ -254,5 +295,9 @@ volumes:
     driver: local
   prometheus_prod_data:
     driver: local
+  loki_prod_data:
+    driver: local
+  promtail_prod_positions:
+    driver: local
   grafana_prod_data:
     driver: local
diff --git a/monitoring/loki.dev.yml b/monitoring/loki.dev.yml
new file mode 100644
index 00000000..cc5c1b99
--- /dev/null
+++ b/monitoring/loki.dev.yml
@@ -0,0 +1,53 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2024-01-01
+      store: tsdb
+      object_store: filesystem
+      schema: v13
+      index:
+        prefix: index_
+        period: 24h
+
+limits_config:
+  retention_period: 168h
+  allow_structured_metadata: false
+  ingestion_rate_mb: 4
+  ingestion_burst_size_mb: 8
+  per_stream_rate_limit: 1MB
+  per_stream_rate_limit_burst: 2MB
+  reject_old_samples: true
+  reject_old_samples_max_age: 168h
+
+compactor:
+  working_directory: /loki/compactor
+  retention_enabled: true
+  delete_request_store: filesystem
+
+ruler:
+  storage:
+    type: local
+    local:
+      directory: /loki/rules
+  rule_path: /loki/rules-temp
+  alertmanager_url: http://localhost:9093
+  ring:
+    kvstore:
+      store: inmemory
+  enable_api: true
diff --git a/monitoring/loki.prod.yml b/monitoring/loki.prod.yml
new file mode 100644
index 00000000..66b6caa2
--- /dev/null
+++ b/monitoring/loki.prod.yml
@@ -0,0 +1,53 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2024-01-01
+      store: tsdb
+      object_store: filesystem
+      schema: v13
+      index:
+        prefix: index_
+        period: 24h
+
+limits_config:
+  retention_period: 720h
+  allow_structured_metadata: false
+  ingestion_rate_mb: 4
+  ingestion_burst_size_mb: 8
+  per_stream_rate_limit: 1MB
+  per_stream_rate_limit_burst: 2MB
+  reject_old_samples: true
+  reject_old_samples_max_age: 720h
+
+compactor:
+  working_directory: /loki/compactor
+  retention_enabled: true
+  delete_request_store: filesystem
+
+ruler:
+  storage:
+    type: local
+    local:
+      directory: /loki/rules
+  rule_path: /loki/rules-temp
+  alertmanager_url: http://localhost:9093
+  ring:
+    kvstore:
+      store: inmemory
+  enable_api: true
diff --git a/monitoring/promtail.dev.yml b/monitoring/promtail.dev.yml
new file mode 100644
index 00000000..7fb01b99
--- /dev/null
+++ b/monitoring/promtail.dev.yml
@@ -0,0 +1,52 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yml
+
+clients:
+  - url: http://loki-dev:3100/loki/api/v1/push
+
+scrape_configs:
+  - job_name: ono-dev-docker
+    docker_sd_configs:
+      - host: unix:///var/run/docker.sock
+        refresh_interval: 5s
+        filters:
+          - name: name
+            values:
+              - ono-app-dev
+              - ono-mysql-dev
+              - ono-redis-dev
+              - ono-rabbitmq-dev
+              - ono-prometheus-dev
+              - ono-grafana-dev
+              - ono-loki-dev
+              - ono-promtail-dev
+              - ono-mysql-exporter-dev
+    relabel_configs:
+      - source_labels: [__meta_docker_container_name]
+        regex: '/(.*)'
+        target_label: container
+      - source_labels: [__meta_docker_container_label_com_docker_compose_service]
+        target_label: compose_service
+      - source_labels: [__meta_docker_container_label_com_docker_compose_project]
+        target_label: compose_project
+      - source_labels: [__meta_docker_container_id]
+        target_label: __path__
+        replacement: /var/lib/docker/containers/$1/$1-json.log
+      - target_label: job
+        replacement: ono-service
+      - target_label: environment
+        replacement: dev
+      - target_label: source
+        replacement: docker-json
+    pipeline_stages:
+      - docker: {}
+      - drop:
+          older_than: 168h
+      - regex:
+          expression: '(^|[[:space:]])(?P<level>TRACE|DEBUG|INFO|WARN|ERROR|FATAL)([[:space:]]|$)'
+      - labels:
+          level:
diff --git a/monitoring/promtail.prod.yml b/monitoring/promtail.prod.yml
new file mode 100644
index 00000000..2d6bd3ec
--- /dev/null
+++ b/monitoring/promtail.prod.yml
@@ -0,0 +1,53 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yml
+
+clients:
+  - url: http://loki-prod:3100/loki/api/v1/push
+
+scrape_configs:
+  - job_name: ono-prod-docker
+    docker_sd_configs:
+      - host: unix:///var/run/docker.sock
+        refresh_interval: 5s
+        filters:
+          - name: name
+            values:
+              - ono-app-prod-blue
+              - ono-app-prod-green
+              - ono-mysql-prod
+              - ono-redis-prod
+              - ono-rabbitmq-prod
+              - ono-prometheus-prod
+              - ono-grafana-prod
+              - ono-loki-prod
+              - ono-promtail-prod
+              - ono-mysql-exporter-prod
+    relabel_configs:
+      - source_labels: [__meta_docker_container_name]
+        regex: '/(.*)'
+        target_label: container
+      - source_labels: [__meta_docker_container_label_com_docker_compose_service]
+        target_label: compose_service
+      - source_labels: [__meta_docker_container_label_com_docker_compose_project]
+        target_label: compose_project
+      - source_labels: [__meta_docker_container_id]
+        target_label: __path__
+        replacement: /var/lib/docker/containers/$1/$1-json.log
+      - target_label: job
+        replacement: ono-service
+      - target_label: environment
+        replacement: prod
+      - target_label: source
+        replacement: docker-json
+    pipeline_stages:
+      - docker: {}
+      - drop:
+          older_than: 720h
+      - regex:
+          expression: '(^|[[:space:]])(?P<level>TRACE|DEBUG|INFO|WARN|ERROR|FATAL)([[:space:]]|$)'
+      - labels:
+          level:

From e66b196800fe4ee5ccf09a4835d4ee50eaf2221a Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:17:50 +0900
Subject: [PATCH 16/43] =?UTF-8?q?[feat]=20Grafana=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../grafana/dashboards/ono-error-logs.json    | 296 ++++++++++++++++++
 .../dev/datasources/datasource.yml            |   7 +
 .../prod/datasources/datasource.yml           |   7 +
 3 files changed, 310 insertions(+)
 create mode 100644 monitoring/grafana/dashboards/ono-error-logs.json

diff --git a/monitoring/grafana/dashboards/ono-error-logs.json b/monitoring/grafana/dashboards/ono-error-logs.json
new file mode 100644
index 00000000..b3a3cbc7
--- /dev/null
+++ b/monitoring/grafana/dashboards/ono-error-logs.json
@@ -0,0 +1,296 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 1
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "loki"
+          },
+          "editorMode": "code",
+          "expr": "sum(count_over_time({environment=~\"$environment\", level=\"ERROR\"}[$__range]))",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Error Logs",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 18,
+        "x": 6,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [
+            "lastNotNull",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "loki"
+          },
+          "editorMode": "code",
+          "expr": "sum by (container) (count_over_time({environment=~\"$environment\", level=\"ERROR\"}[$__interval]))",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Errors by Container",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki"
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 3,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": true,
+        "showTime": true,
+        "sortOrder": "Descending",
+        "wrapLogMessage": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "loki"
+          },
+          "editorMode": "code",
+          "expr": "{environment=~\"$environment\", level=\"ERROR\"} |~ \"$search\"",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Error Log Stream",
+      "type": "logs"
+    }
+  ],
+  "refresh": "30s",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [
+    "ono",
+    "logs",
+    "errors",
+    "loki"
+  ],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "dev",
+            "prod"
+          ],
+          "value": [
+            "dev",
+            "prod"
+          ]
+        },
+        "hide": 0,
+        "includeAll": true,
+        "label": "Environment",
+        "multi": true,
+        "name": "environment",
+        "options": [
+          {
+            "selected": true,
+            "text": "dev",
+            "value": "dev"
+          },
+          {
+            "selected": true,
+            "text": "prod",
+            "value": "prod"
+          }
+        ],
+        "query": "dev,prod",
+        "queryValue": "",
+        "skipUrlSync": false,
+        "type": "custom"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": ".+",
+          "value": ".+"
+        },
+        "hide": 0,
+        "label": "Search",
+        "name": "search",
+        "options": [
+          {
+            "selected": true,
+            "text": ".+",
+            "value": ".+"
+          }
+        ],
+        "query": ".+",
+        "skipUrlSync": false,
+        "type": "textbox"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "OnO Error Logs",
+  "uid": "ono-error-logs",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/monitoring/grafana/provisioning/dev/datasources/datasource.yml b/monitoring/grafana/provisioning/dev/datasources/datasource.yml
index 4d13d158..d1662c47 100644
--- a/monitoring/grafana/provisioning/dev/datasources/datasource.yml
+++ b/monitoring/grafana/provisioning/dev/datasources/datasource.yml
@@ -8,3 +8,10 @@ datasources:
     url: http://prometheus-dev:9090/prometheus
     isDefault: true
     editable: true
+
+  - name: Loki
+    uid: loki
+    type: loki
+    access: proxy
+    url: http://loki-dev:3100
+    editable: true
diff --git a/monitoring/grafana/provisioning/prod/datasources/datasource.yml b/monitoring/grafana/provisioning/prod/datasources/datasource.yml
index f552df23..947d0d82 100644
--- a/monitoring/grafana/provisioning/prod/datasources/datasource.yml
+++ b/monitoring/grafana/provisioning/prod/datasources/datasource.yml
@@ -8,3 +8,10 @@ datasources:
     url: http://prometheus-prod:9090/prometheus
     isDefault: true
     editable: true
+
+  - name: Loki
+    uid: loki
+    type: loki
+    access: proxy
+    url: http://loki-prod:3100
+    editable: true

From 8d29c3626dd037a737949b52de487517e51a47fe Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:18:48 +0900
Subject: [PATCH 17/43] =?UTF-8?q?[ci]=20Loki=20=EB=AA=A8=EB=8B=88=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81=20=EB=B0=B0=ED=8F=AC=20=EA=B2=80=EC=A6=9D=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci-dev.yml             | 47 ++++++++++++++++++++---
 .github/workflows/ci-prod.yml            | 48 +++++++++++++++++++++---
 .github/workflows/restart-monitoring.yml |  8 ++--
 3 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
index c35e9636..7798b948 100644
--- a/.github/workflows/ci-dev.yml
+++ b/.github/workflows/ci-dev.yml
@@ -159,13 +159,13 @@ jobs:
       - name: Deploy Monitoring Stack
         run: |
           docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring pull \
-            mysql-exporter-dev prometheus-dev grafana-dev
-          docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring stop prometheus-dev grafana-dev mysql-exporter-dev || true
-          docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring rm -f prometheus-dev grafana-dev mysql-exporter-dev || true
+            mysql-exporter-dev prometheus-dev loki-dev promtail-dev grafana-dev
+          docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring stop prometheus-dev grafana-dev loki-dev promtail-dev mysql-exporter-dev || true
+          docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring rm -f prometheus-dev grafana-dev loki-dev promtail-dev mysql-exporter-dev || true
           docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring up -d --force-recreate \
-            mysql-exporter-dev prometheus-dev grafana-dev
+            mysql-exporter-dev prometheus-dev loki-dev promtail-dev grafana-dev
           docker-compose -f docker-compose.dev.yml --env-file .env.dev ps \
-            mysql-exporter-dev prometheus-dev grafana-dev
+            mysql-exporter-dev prometheus-dev loki-dev promtail-dev grafana-dev
         shell: bash
 
       - name: Verify Monitoring Integration
@@ -203,6 +203,43 @@ jobs:
           exit 1
         shell: bash
 
+      - name: Verify Loki Log Collection
+        run: |
+          echo "Checking Loki readiness..."
+          for i in $(seq 1 12); do
+            if curl -fsS http://localhost:3101/ready | grep -q ready; then
+              echo "Loki is ready"
+              break
+            fi
+            echo "Waiting Loki ready... ($i/12)"
+            sleep 5
+          done
+
+          if ! curl -fsS http://localhost:3101/ready | grep -q ready; then
+            echo "ERROR: Loki did not become ready"
+            docker logs --tail=200 ono-loki-dev || true
+            docker logs --tail=200 ono-promtail-dev || true
+            exit 1
+          fi
+
+          echo "Checking Loki received dev logs..."
+          for i in $(seq 1 12); do
+            result=$(curl -fsG "http://localhost:3101/loki/api/v1/label/container/values" || true)
+            if echo "$result" | grep -Eq '"ono-(app|mysql|redis|rabbitmq|prometheus|grafana|loki|promtail|mysql-exporter)-dev"'; then
+              echo "Loki received dev log labels"
+              exit 0
+            fi
+            echo "Waiting Loki log labels... ($i/12)"
+            sleep 5
+          done
+
+          echo "ERROR: Loki did not receive expected dev log labels"
+          curl -fsG "http://localhost:3101/loki/api/v1/labels" || true
+          docker logs --tail=200 ono-loki-dev || true
+          docker logs --tail=200 ono-promtail-dev || true
+          exit 1
+        shell: bash
+
       - name: Clean up old Docker images
         run: |
           docker image prune -f --filter "until=24h"
diff --git a/.github/workflows/ci-prod.yml b/.github/workflows/ci-prod.yml
index 7314c9ee..77fee4a7 100644
--- a/.github/workflows/ci-prod.yml
+++ b/.github/workflows/ci-prod.yml
@@ -219,13 +219,13 @@ jobs:
       - name: Deploy Monitoring Stack
         run: |
           docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring pull \
-            mysql-exporter-prod prometheus-prod grafana-prod
-          docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring stop prometheus-prod grafana-prod mysql-exporter-prod || true
-          docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring rm -f prometheus-prod grafana-prod mysql-exporter-prod || true
+            mysql-exporter-prod prometheus-prod loki-prod promtail-prod grafana-prod
+          docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring stop prometheus-prod grafana-prod loki-prod promtail-prod mysql-exporter-prod || true
+          docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring rm -f prometheus-prod grafana-prod loki-prod promtail-prod mysql-exporter-prod || true
           docker-compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring up -d --force-recreate \
-            mysql-exporter-prod prometheus-prod grafana-prod
+            mysql-exporter-prod prometheus-prod loki-prod promtail-prod grafana-prod
           docker-compose -f docker-compose.prod.yml --env-file .env.prod ps \
-            mysql-exporter-prod prometheus-prod grafana-prod
+            mysql-exporter-prod prometheus-prod loki-prod promtail-prod grafana-prod
         shell: bash
 
       - name: Verify Monitoring Integration
@@ -248,6 +248,44 @@ jobs:
           docker logs --tail=200 ono-prometheus-prod || true
         shell: bash
 
+      - name: Verify Loki Log Collection
+        continue-on-error: true
+        run: |
+          echo "Checking Loki readiness..."
+          for i in $(seq 1 12); do
+            if curl -fsS http://localhost:3100/ready | grep -q ready; then
+              echo "Loki is ready"
+              break
+            fi
+            echo "Waiting Loki ready... ($i/12)"
+            sleep 5
+          done
+
+          if ! curl -fsS http://localhost:3100/ready | grep -q ready; then
+            echo "WARNING: Loki did not become ready"
+            docker logs --tail=200 ono-loki-prod || true
+            docker logs --tail=200 ono-promtail-prod || true
+            exit 1
+          fi
+
+          echo "Checking Loki received production logs..."
+          for i in $(seq 1 12); do
+            result=$(curl -fsG "http://localhost:3100/loki/api/v1/label/container/values" || true)
+            if echo "$result" | grep -Eq '"ono-(app-prod-blue|app-prod-green|mysql-prod|redis-prod|rabbitmq-prod|prometheus-prod|grafana-prod|loki-prod|promtail-prod|mysql-exporter-prod)"'; then
+              echo "Loki received production log labels"
+              exit 0
+            fi
+            echo "Waiting Loki production log labels... ($i/12)"
+            sleep 5
+          done
+
+          echo "WARNING: Loki did not receive expected production log labels"
+          curl -fsG "http://localhost:3100/loki/api/v1/labels" || true
+          docker logs --tail=200 ono-loki-prod || true
+          docker logs --tail=200 ono-promtail-prod || true
+          exit 1
+        shell: bash
+
       - name: Clean up old Docker images
         run: |
           docker image prune -f --filter "until=24h"
diff --git a/.github/workflows/restart-monitoring.yml b/.github/workflows/restart-monitoring.yml
index 90a7550c..3ee6a7aa 100644
--- a/.github/workflows/restart-monitoring.yml
+++ b/.github/workflows/restart-monitoring.yml
@@ -56,16 +56,16 @@ jobs:
         if: ${{ github.event.inputs.target == 'dev' }}
         run: |
           docker compose -f docker-compose.dev.yml --env-file .env.dev --profile monitoring up -d --force-recreate \
-            mysql-exporter-dev prometheus-dev grafana-dev
+            mysql-exporter-dev prometheus-dev loki-dev promtail-dev grafana-dev
           docker compose -f docker-compose.dev.yml --env-file .env.dev ps \
-            mysql-exporter-dev prometheus-dev grafana-dev
+            mysql-exporter-dev prometheus-dev loki-dev promtail-dev grafana-dev
         shell: bash
 
       - name: Restart monitoring stack (prod)
         if: ${{ github.event.inputs.target == 'prod' }}
         run: |
           docker compose -f docker-compose.prod.yml --env-file .env.prod --profile monitoring up -d --force-recreate \
-            mysql-exporter-prod prometheus-prod grafana-prod
+            mysql-exporter-prod prometheus-prod loki-prod promtail-prod grafana-prod
           docker compose -f docker-compose.prod.yml --env-file .env.prod ps \
-            mysql-exporter-prod prometheus-prod grafana-prod
+            mysql-exporter-prod prometheus-prod loki-prod promtail-prod grafana-prod
         shell: bash

From 140257dfe0af5c6b276b658e1b4b806ae5ddb748 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:31:00 +0900
Subject: [PATCH 18/43] =?UTF-8?q?[fix]=20Promtail=20Docker=20API=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EA=B3=A0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.dev.yml  | 2 ++
 docker-compose.prod.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d339ba1e..ebc04f2f 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -169,6 +169,8 @@ services:
     image: grafana/promtail:2.9.8
     container_name: ono-promtail-dev
     restart: unless-stopped
+    environment:
+      DOCKER_API_VERSION: "1.44"
     command:
       - -config.file=/etc/promtail/promtail.yml
     volumes:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 7554eca3..03f1ddf7 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -223,6 +223,8 @@ services:
     image: grafana/promtail:2.9.8
     container_name: ono-promtail-prod
     restart: unless-stopped
+    environment:
+      DOCKER_API_VERSION: "1.44"
     command:
       - -config.file=/etc/promtail/promtail.yml
     volumes:

From 5cddf6515e8a4f4e292137bdd62121a4d7d610a6 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 27 Apr 2026 23:42:25 +0900
Subject: [PATCH 19/43] =?UTF-8?q?[fix]=20Promtail=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EB=B2=84=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.dev.yml  | 2 +-
 docker-compose.prod.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ebc04f2f..c19aba8b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -166,7 +166,7 @@ services:
 
   # Promtail - DEVELOPMENT (Profile: monitoring)
   promtail-dev:
-    image: grafana/promtail:2.9.8
+    image: grafana/promtail:3.6.10
     container_name: ono-promtail-dev
     restart: unless-stopped
     environment:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 03f1ddf7..edab90d4 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -220,7 +220,7 @@ services:
 
   # Promtail - PRODUCTION (Profile: monitoring)
   promtail-prod:
-    image: grafana/promtail:2.9.8
+    image: grafana/promtail:3.6.10
     container_name: ono-promtail-prod
     restart: unless-stopped
     environment:

From 47e6817c4b601d7c64d103a36231179bdc9e243e Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Thu, 30 Apr 2026 22:37:20 +0900
Subject: [PATCH 20/43] =?UTF-8?q?[feat]=20=ED=94=84=EB=A1=9C=ED=95=84?=
 =?UTF-8?q?=EB=B3=84=20=EA=B5=AC=EC=A1=B0=ED=99=94=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  1 +
 monitoring/promtail.prod.yml                  | 15 ++-
 .../OnO/backend/common/aop/LoggingAspect.java |  4 +-
 .../backend/common/auth/JwtTokenFilter.java   |  2 +
 .../config/RequestLoggingMdcFilter.java       | 92 +++++++++++++++++++
 .../exception/GlobalExceptionHandler.java     | 32 ++++++-
 src/main/resources/logback-spring.xml         | 74 +++++++++++++++
 7 files changed, 215 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
 create mode 100644 src/main/resources/logback-spring.xml

diff --git a/build.gradle b/build.gradle
index ca9d0793..89f7b36e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,7 @@ jar {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa:3.1.0'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
 	implementation 'com.google.api-client:google-api-client:2.4.0'
diff --git a/monitoring/promtail.prod.yml b/monitoring/promtail.prod.yml
index 2d6bd3ec..1083fcfa 100644
--- a/monitoring/promtail.prod.yml
+++ b/monitoring/promtail.prod.yml
@@ -47,7 +47,18 @@ scrape_configs:
       - docker: {}
       - drop:
           older_than: 720h
-      - regex:
-          expression: '(^|[[:space:]])(?P<level>TRACE|DEBUG|INFO|WARN|ERROR|FATAL)([[:space:]]|$)'
+      - json:
+          expressions:
+            level: level
+            service: service
+            traceId: traceId
+            userId: userId
+            method: method
+            uri: uri
+            status: status
+            latencyMs: latencyMs
+            errorCode: errorCode
+            exceptionType: exceptionType
       - labels:
           level:
+          service:
diff --git a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
index 1010757b..6379a98b 100644
--- a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
+++ b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
@@ -23,7 +23,7 @@ public void logAfterThrowing(JoinPoint joinPoint, Throwable ex) {
         String methodName = joinPoint.getSignature().getName();
         String className = joinPoint.getSignature().getDeclaringTypeName();
         String layer = getLayerName(className);
-        logger.error("[{}] [Exception] {}.{}(): {}", layer, className, methodName, ex.getMessage());
+        logger.error("[{}] [Exception] {}.{}(): {}", layer, className, methodName, ex.getMessage(), ex);
     }
 
     // 메서드 실행 이전 로깅
@@ -51,4 +51,4 @@ private String getLayerName(String className) {
         }
         return "Unknown";
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java b/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
index fe5c874a..d722df65 100644
--- a/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
+++ b/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
@@ -10,6 +10,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.MDC;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -84,6 +85,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                         new UsernamePasswordAuthenticationToken(userId, null, authorities);
 
                 SecurityContextHolder.getContext().setAuthentication(authentication);
+                MDC.put("userId", String.valueOf(userId));
             } catch (ExpiredJwtException e) {
                 request.setAttribute("errorMessage", "토큰이 만료되었습니다.");
             } catch (Exception e) {
diff --git a/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java b/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
new file mode 100644
index 00000000..880917f6
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
@@ -0,0 +1,92 @@
+package com.aisip.OnO.backend.common.config;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class RequestLoggingMdcFilter extends OncePerRequestFilter {
+
+    private static final String REQUEST_ID_HEADER = "X-Request-Id";
+
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) {
+        String path = request.getRequestURI();
+        return path.contains("/actuator/")
+                || path.equals("/robots.txt")
+                || path.startsWith("/images/")
+                || path.startsWith("/css/")
+                || path.startsWith("/js/")
+                || path.startsWith("/swagger-ui/")
+                || path.startsWith("/v3/api-docs/");
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        long startedAt = System.currentTimeMillis();
+        String traceId = resolveTraceId(request);
+
+        MDC.put("traceId", traceId);
+        MDC.put("method", request.getMethod());
+        MDC.put("uri", request.getRequestURI());
+
+        Exception failure = null;
+        try {
+            filterChain.doFilter(request, response);
+        } catch (ServletException | IOException | RuntimeException ex) {
+            failure = ex;
+            MDC.put("exceptionType", ex.getClass().getSimpleName());
+            throw ex;
+        } finally {
+            long latencyMs = System.currentTimeMillis() - startedAt;
+            int status = failure == null ? response.getStatus() : resolveFailureStatus(response);
+
+            MDC.put("status", String.valueOf(status));
+            MDC.put("latencyMs", String.valueOf(latencyMs));
+
+            log.info("HTTP request completed");
+            clearMdc();
+        }
+    }
+
+    private String resolveTraceId(HttpServletRequest request) {
+        String requestId = request.getHeader(REQUEST_ID_HEADER);
+        if (requestId == null || requestId.isBlank()) {
+            return UUID.randomUUID().toString();
+        }
+        return requestId;
+    }
+
+    private int resolveFailureStatus(HttpServletResponse response) {
+        int status = response.getStatus();
+        if (status < HttpServletResponse.SC_BAD_REQUEST) {
+            return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+        }
+        return status;
+    }
+
+    private void clearMdc() {
+        MDC.remove("traceId");
+        MDC.remove("userId");
+        MDC.remove("method");
+        MDC.remove("uri");
+        MDC.remove("status");
+        MDC.remove("latencyMs");
+        MDC.remove("errorCode");
+        MDC.remove("exceptionType");
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
index 21a02196..1d64578b 100644
--- a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
 import org.springframework.http.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -26,6 +27,8 @@ public ResponseEntity<CommonResponse> handleApplicationException(ApplicationExce
         CommonResponse commonResponse = CommonResponse.error(e.getErrorCase());
 
         HttpStatus status = HttpStatus.valueOf(e.getErrorCase().getHttpStatusCode());
+        putErrorMdc(e.getErrorCase().getErrorCode(), e);
+        logByStatus(status, "Application exception handled: {}", e.getMessage(), e);
         sendToDiscord(e, request, status);
 
         return ResponseEntity
@@ -40,6 +43,8 @@ public ResponseEntity<CommonResponse> handleValidException(BindingResult binding
         String message = bindingResult.getAllErrors().get(0).getDefaultMessage();
         CommonResponse commonResponse = CommonResponse.error(400, message);
 
+        putErrorMdc(400, ex);
+        log.warn("Validation exception handled: {}", message);
         sendToDiscord(ex, request, HttpStatus.BAD_REQUEST);
 
         return ResponseEntity
@@ -47,6 +52,19 @@ public ResponseEntity<CommonResponse> handleValidException(BindingResult binding
                 .body(commonResponse);
     }
 
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<CommonResponse> handleException(Exception ex, WebRequest request) {
+        CommonResponse commonResponse = CommonResponse.error(500, "서버 내부 오류가 발생했습니다.");
+
+        putErrorMdc(500, ex);
+        log.error("Unhandled exception occurred", ex);
+        sendToDiscord(ex, request, HttpStatus.INTERNAL_SERVER_ERROR);
+
+        return ResponseEntity
+                .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                .body(commonResponse);
+    }
+
     private void sendToDiscord(Exception ex, WebRequest request, HttpStatus status) {
         String path = ((ServletWebRequest) request).getRequest().getRequestURI();
         String errorMessage = ex.getMessage();
@@ -59,5 +77,17 @@ private void sendToDiscord(Exception ex, WebRequest request, HttpStatus status)
                 exceptionType
         );
     }
-}
 
+    private void putErrorMdc(Integer errorCode, Exception ex) {
+        MDC.put("errorCode", String.valueOf(errorCode));
+        MDC.put("exceptionType", ex.getClass().getSimpleName());
+    }
+
+    private void logByStatus(HttpStatus status, String message, String detail, Exception ex) {
+        if (status.is5xxServerError()) {
+            log.error(message, detail, ex);
+            return;
+        }
+        log.warn(message, detail);
+    }
+}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000..57a0ce1c
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="ono-backend"/>
+    <springProperty scope="context" name="activeProfile" source="spring.profiles.active" defaultValue="local"/>
+
+    <property name="CONSOLE_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS,Asia/Seoul} %highlight(%-5level) [%thread] [%X{traceId:-no-trace}] [%X{userId:-anonymous}] %cyan(%logger{36}) - %msg%n%xEx"/>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="JSON_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"service":"${appName}","environment":"${activeProfile}"}</customFields>
+            <fieldNames>
+                <timestamp>timestamp</timestamp>
+                <version>[ignore]</version>
+                <level>level</level>
+                <logger>logger</logger>
+                <thread>thread</thread>
+                <message>message</message>
+                <stackTrace>stacktrace</stackTrace>
+            </fieldNames>
+            <includeMdcKeyName>traceId</includeMdcKeyName>
+            <includeMdcKeyName>userId</includeMdcKeyName>
+            <includeMdcKeyName>method</includeMdcKeyName>
+            <includeMdcKeyName>uri</includeMdcKeyName>
+            <includeMdcKeyName>status</includeMdcKeyName>
+            <includeMdcKeyName>latencyMs</includeMdcKeyName>
+            <includeMdcKeyName>errorCode</includeMdcKeyName>
+            <includeMdcKeyName>exceptionType</includeMdcKeyName>
+        </encoder>
+    </appender>
+
+    <springProfile name="local">
+        <logger name="p6spy" level="INFO"/>
+        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="dev">
+        <logger name="p6spy" level="INFO"/>
+        <logger name="org.hibernate.SQL" level="INFO"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="INFO"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="prod">
+        <logger name="p6spy" level="WARN"/>
+        <logger name="org.hibernate.SQL" level="WARN"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="WARN"/>
+        <logger name="org.springframework" level="INFO"/>
+        <logger name="org.springframework.amqp" level="WARN"/>
+        <logger name="com.zaxxer.hikari" level="WARN"/>
+        <root level="INFO">
+            <appender-ref ref="JSON_CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="!local &amp; !dev &amp; !prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+</configuration>

From 69296c0013207dfdd485f48ca6545db1a86e80e5 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Thu, 30 Apr 2026 22:50:38 +0900
Subject: [PATCH 21/43] =?UTF-8?q?[fix]=20Spring=20MVC=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EC=BD=94=EB=93=9C=20=EB=B3=B4=EC=A1=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/GlobalExceptionHandler.java     | 86 +++++++++++++++++--
 .../DiscordWebhookNotificationService.java    |  4 +-
 2 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
index 1d64578b..842cd4cb 100644
--- a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
@@ -2,34 +2,41 @@
 
 import com.aisip.OnO.backend.common.response.CommonResponse;
 import com.aisip.OnO.backend.util.webhook.DiscordWebhookNotificationService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import jakarta.validation.ConstraintViolationException;
 import org.slf4j.MDC;
 import org.springframework.http.*;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.ErrorResponse;
+import org.springframework.web.ErrorResponseException;
+import org.springframework.web.bind.MissingRequestHeaderException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 @Slf4j
 @ControllerAdvice
 @RequiredArgsConstructor
 public class GlobalExceptionHandler {
 
-    private final ObjectMapper objectMapper;
     private final DiscordWebhookNotificationService discordWebhookNotificationService;
 
     @ExceptionHandler(ApplicationException.class)
     public ResponseEntity<CommonResponse> handleApplicationException(ApplicationException e, WebRequest request) {
         CommonResponse commonResponse = CommonResponse.error(e.getErrorCase());
 
-        HttpStatus status = HttpStatus.valueOf(e.getErrorCase().getHttpStatusCode());
+        HttpStatusCode status = HttpStatusCode.valueOf(e.getErrorCase().getHttpStatusCode());
         putErrorMdc(e.getErrorCase().getErrorCode(), e);
         logByStatus(status, "Application exception handled: {}", e.getMessage(), e);
-        sendToDiscord(e, request, status);
+        notifyIfServerError(e, request, status);
 
         return ResponseEntity
                 .status(e.getErrorCase().getHttpStatusCode())
@@ -45,27 +52,74 @@ public ResponseEntity<CommonResponse> handleValidException(BindingResult binding
 
         putErrorMdc(400, ex);
         log.warn("Validation exception handled: {}", message);
-        sendToDiscord(ex, request, HttpStatus.BAD_REQUEST);
 
         return ResponseEntity
                 .status(HttpStatus.BAD_REQUEST)
                 .body(commonResponse);
     }
 
+    @ExceptionHandler(ErrorResponseException.class)
+    public ResponseEntity<CommonResponse> handleErrorResponseException(ErrorResponseException ex, WebRequest request) {
+        return handleSpringStatusException(ex, request, ex.getStatusCode(), resolveErrorMessage(ex));
+    }
+
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ResponseEntity<CommonResponse> handleNoResourceFoundException(NoResourceFoundException ex, WebRequest request) {
+        return handleSpringStatusException(ex, request, ex.getStatusCode(), "요청한 리소스를 찾을 수 없습니다.");
+    }
+
+    @ExceptionHandler({
+            HttpMessageNotReadableException.class,
+            MethodArgumentTypeMismatchException.class,
+            MissingServletRequestParameterException.class,
+            MissingRequestHeaderException.class,
+            BindException.class,
+            ConstraintViolationException.class
+    })
+    public ResponseEntity<CommonResponse> handleBadRequestException(Exception ex, WebRequest request) {
+        return handleSpringStatusException(ex, request, HttpStatus.BAD_REQUEST, "잘못된 요청입니다.");
+    }
+
     @ExceptionHandler(Exception.class)
     public ResponseEntity<CommonResponse> handleException(Exception ex, WebRequest request) {
+        if (ex instanceof ErrorResponse errorResponse) {
+            return handleSpringStatusException(ex, request, errorResponse.getStatusCode(), resolveErrorMessage(errorResponse));
+        }
+
         CommonResponse commonResponse = CommonResponse.error(500, "서버 내부 오류가 발생했습니다.");
 
         putErrorMdc(500, ex);
         log.error("Unhandled exception occurred", ex);
-        sendToDiscord(ex, request, HttpStatus.INTERNAL_SERVER_ERROR);
+        notifyIfServerError(ex, request, HttpStatus.INTERNAL_SERVER_ERROR);
 
         return ResponseEntity
                 .status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body(commonResponse);
     }
 
-    private void sendToDiscord(Exception ex, WebRequest request, HttpStatus status) {
+    private ResponseEntity<CommonResponse> handleSpringStatusException(Exception ex,
+                                                                      WebRequest request,
+                                                                      HttpStatusCode status,
+                                                                      String message) {
+        CommonResponse commonResponse = CommonResponse.error(status.value(), message);
+
+        putErrorMdc(status.value(), ex);
+        logByStatus(status, "Spring MVC exception handled: {}", ex.getMessage(), ex);
+        notifyIfServerError(ex, request, status);
+
+        return ResponseEntity
+                .status(status)
+                .body(commonResponse);
+    }
+
+    private void notifyIfServerError(Exception ex, WebRequest request, HttpStatusCode status) {
+        if (!status.is5xxServerError()) {
+            return;
+        }
+        sendToDiscord(ex, request, status);
+    }
+
+    private void sendToDiscord(Exception ex, WebRequest request, HttpStatusCode status) {
         String path = ((ServletWebRequest) request).getRequest().getRequestURI();
         String errorMessage = ex.getMessage();
         String exceptionType = ex.getClass().getSimpleName();
@@ -83,11 +137,27 @@ private void putErrorMdc(Integer errorCode, Exception ex) {
         MDC.put("exceptionType", ex.getClass().getSimpleName());
     }
 
-    private void logByStatus(HttpStatus status, String message, String detail, Exception ex) {
+    private void logByStatus(HttpStatusCode status, String message, String detail, Exception ex) {
         if (status.is5xxServerError()) {
             log.error(message, detail, ex);
             return;
         }
         log.warn(message, detail);
     }
+
+    private String resolveErrorMessage(ErrorResponseException ex) {
+        return resolveErrorMessage((ErrorResponse) ex);
+    }
+
+    private String resolveErrorMessage(ErrorResponse errorResponse) {
+        if (errorResponse.getBody() == null) {
+            return "잘못된 요청입니다.";
+        }
+
+        String detail = errorResponse.getBody().getDetail();
+        if (detail == null || detail.isBlank()) {
+            return "잘못된 요청입니다.";
+        }
+        return detail;
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java b/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
index 0fc51932..cc7b918a 100644
--- a/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
+++ b/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
@@ -90,7 +90,7 @@ private void sendToDiscord(DiscordWebhookPayload payload) {
             );
             log.info("Discord webhook 전송 완료: {}", payload.embeds().get(0).title());
         } catch (Exception e) {
-            log.error("Discord webhook 전송 실패: {}", e.getMessage());
+            log.error("Discord webhook 전송 실패: {}", e.getMessage(), e);
         }
     }
-}
\ No newline at end of file
+}

From f14d07e534bee68b2d523bcb7a4048f6a4dbb7b2 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 10:49:26 +0900
Subject: [PATCH 22/43] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=20=EB=AF=BC?=
 =?UTF-8?q?=EA=B0=90=EC=A0=95=EB=B3=B4=20=EB=85=B8=EC=B6=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/auth/service/JwtTokenizer.java    |  4 +-
 .../consumer/FcmNotificationConsumer.java     |  4 +-
 .../rabbitmq/consumer/S3DeleteConsumer.java   | 43 +++++++++++++------
 .../rabbitmq/producer/S3DeleteProducer.java   |  8 ++--
 .../service/ProblemAnalysisService.java       |  4 +-
 .../problem/service/ProblemService.java       |  6 +--
 .../service/ProblemSolveService.java          | 10 ++---
 .../OnO/backend/util/ai/OpenAIClient.java     |  2 +-
 .../util/fcm/controller/FcmController.java    |  3 +-
 .../backend/util/fcm/service/FcmService.java  |  2 +-
 .../fileupload/service/FileUploadService.java |  4 +-
 11 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/auth/service/JwtTokenizer.java b/src/main/java/com/aisip/OnO/backend/auth/service/JwtTokenizer.java
index f29b12d1..0b1a61fa 100644
--- a/src/main/java/com/aisip/OnO/backend/auth/service/JwtTokenizer.java
+++ b/src/main/java/com/aisip/OnO/backend/auth/service/JwtTokenizer.java
@@ -77,7 +77,7 @@ public void validateAccessToken(String token) {
         try{
             Jwts.parserBuilder().setSigningKey(accessKey).build().parseClaimsJws(token);
         } catch (Exception e) {
-            log.error("엑세스 토큰 검증 실패: {} / token={}", e.getMessage(), token);
+            log.warn("엑세스 토큰 검증 실패: {}", e.getMessage());
             throw new ApplicationException(AuthErrorCase.ACCESS_TOKEN_EXPIRED);
         }
     }
@@ -89,7 +89,7 @@ public void validateRefreshToken(String token) {
             log.warn("리프레시 토큰 만료: {}", e.getMessage());
             throw new ApplicationException(AuthErrorCase.REFRESH_TOKEN_EXPIRED);
         } catch (Exception e) {
-            log.error("리프레시 토큰 검증 실패: {} / token={}", e.getMessage(), token);
+            log.warn("리프레시 토큰 검증 실패: {}", e.getMessage());
             throw new ApplicationException(AuthErrorCase.INVALID_REFRESH_TOKEN);
         }
     }
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
index 16d7b18e..441ac9d2 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
@@ -61,8 +61,8 @@ public void handleNotificationMessage(FcmNotificationMessage message) {
                     sendToDevice(fcmToken.getToken(), message);
                     successCount++;
                 } catch (Exception e) {
-                    log.warn("[FCM Notification Consumer] 디바이스 전송 실패 - userId: {}, token: {}, error: {}",
-                            message.getUserId(), fcmToken.getToken(), e.getMessage());
+                    log.warn("[FCM Notification Consumer] 디바이스 전송 실패 - userId: {}, error: {}",
+                            message.getUserId(), e.getMessage());
                     failCount++;
                 }
             }
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
index b274d149..7d93ce5f 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
@@ -29,22 +29,21 @@ public class S3DeleteConsumer {
      */
     @RabbitListener(queues = RabbitMQConfig.S3_DELETE_QUEUE, concurrency = "3-10")
     public void handleS3DeleteMessage(S3DeleteMessage message) {
-        log.info("[S3 Delete Consumer] 메시지 수신 - imageUrl: {}, problemId: {}, retryCount: {}",
-                message.getImageUrl(), message.getProblemId(), message.getRetryCount());
+        log.info("[S3 Delete Consumer] 메시지 수신 - problemId: {}, retryCount: {}",
+                message.getProblemId(), message.getRetryCount());
 
         try {
             // S3 파일 삭제 실행
             fileUploadService.deleteImageFileFromS3(message.getImageUrl());
 
-            log.info("[S3 Delete Consumer] 삭제 성공 - imageUrl: {}, problemId: {}",
-                    message.getImageUrl(), message.getProblemId());
+            log.info("[S3 Delete Consumer] 삭제 성공 - problemId: {}", message.getProblemId());
 
         } catch (Exception e) {
-            log.error("[S3 Delete Consumer] 삭제 실패 - imageUrl: {}, problemId: {}, retryCount: {}, error: {}",
-                    message.getImageUrl(), message.getProblemId(), message.getRetryCount(), e.getMessage());
+            log.error("[S3 Delete Consumer] 삭제 실패 - problemId: {}, retryCount: {}, error: {}",
+                    message.getProblemId(), message.getRetryCount(), e.getMessage());
 
             // 예외를 던지면 RabbitMQ가 자동으로 재시도 or DLQ로 전송
-            throw new RuntimeException("S3 파일 삭제 실패: " + message.getImageUrl(), e);
+            throw new RuntimeException("S3 파일 삭제 실패 - problemId: " + message.getProblemId(), e);
         }
     }
 
@@ -55,16 +54,18 @@ public void handleS3DeleteMessage(S3DeleteMessage message) {
      */
     @RabbitListener(queues = RabbitMQConfig.S3_DELETE_DLQ)
     public void handleS3DeleteDLQ(S3DeleteMessage message) {
-        log.error("[S3 Delete DLQ] 최종 실패 메시지 - imageUrl: {}, problemId: {}, retryCount: {}",
-                message.getImageUrl(), message.getProblemId(), message.getRetryCount());
+        String maskedObjectKey = maskS3ObjectKey(message.getImageUrl());
+
+        log.error("[S3 Delete DLQ] 최종 실패 메시지 - problemId: {}, objectKey: {}, retryCount: {}",
+                message.getProblemId(), maskedObjectKey, message.getRetryCount());
 
         // Discord 알림 전송
         String errorTitle = String.format("🚨 S3 파일 삭제 최종 실패 (DLQ)");
         String errorDetails = String.format(
-                "**Problem ID:** %d\n**Image URL:** %s\n**Retry Count:** %d\n\n" +
+                "**Problem ID:** %d\n**Object Key:** %s\n**Retry Count:** %d\n\n" +
                 "모든 재시도가 실패했습니다. 수동으로 S3에서 파일을 삭제하거나 메시지를 재처리해주세요.",
                 message.getProblemId(),
-                message.getImageUrl(),
+                maskedObjectKey,
                 message.getRetryCount()
         );
 
@@ -80,4 +81,22 @@ public void handleS3DeleteDLQ(S3DeleteMessage message) {
             log.error("[S3 Delete DLQ] Discord 알림 전송 실패: {}", e.getMessage());
         }
     }
-}
\ No newline at end of file
+
+    private String maskS3ObjectKey(String imageUrl) {
+        if (imageUrl == null || imageUrl.isBlank()) {
+            return "unknown";
+        }
+
+        String splitStr = ".com/";
+        int keyStartIndex = imageUrl.lastIndexOf(splitStr);
+        String objectKey = keyStartIndex >= 0
+                ? imageUrl.substring(keyStartIndex + splitStr.length())
+                : imageUrl;
+
+        if (objectKey.length() <= 16) {
+            return "***";
+        }
+
+        return objectKey.substring(0, 8) + "***" + objectKey.substring(objectKey.length() - 8);
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
index 446e30ce..9f4993a7 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
@@ -33,10 +33,10 @@ public void sendDeleteMessage(String imageUrl, Long problemId) {
                     message
             );
 
-            log.info("[S3 Delete Producer] 메시지 전송 성공 - imageUrl: {}, problemId: {}", imageUrl, problemId);
+            log.info("[S3 Delete Producer] 메시지 전송 성공 - problemId: {}", problemId);
         } catch (Exception e) {
-            log.error("[S3 Delete Producer] 메시지 전송 실패 - imageUrl: {}, problemId: {}, error: {}",
-                    imageUrl, problemId, e.getMessage(), e);
+            log.error("[S3 Delete Producer] 메시지 전송 실패 - problemId: {}, error: {}",
+                    problemId, e.getMessage(), e);
             // 메시지 전송 실패해도 DB 삭제는 완료되므로 예외를 던지지 않음
         }
     }
@@ -49,4 +49,4 @@ public void sendDeleteMessage(String imageUrl, Long problemId) {
     public void sendBulkDeleteMessages(Iterable<String> imageUrls, Long problemId) {
         imageUrls.forEach(imageUrl -> sendDeleteMessage(imageUrl, problemId));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemAnalysisService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemAnalysisService.java
index b0eaa288..2be67908 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemAnalysisService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemAnalysisService.java
@@ -190,7 +190,7 @@ public void analyzeProblemSync(Long problemId) {
     @Deprecated
     @Async
     public void analyzeProblemAsync(Long problemId) {
-        log.info("Starting async analysis for problemId: {}, imageUrls: {}", problemId);
+        log.info("Starting async analysis for problemId: {}", problemId);
 
         try {
             // Problem 조회
@@ -252,7 +252,7 @@ public void analyzeProblemAsync(Long problemId) {
      */
     public ProblemAnalysisResponseDto testAnalyzeImage(String imageUrl) {
         try {
-            log.info("Testing image analysis for URL: {}", imageUrl);
+            log.info("Testing image analysis");
 
             // AI 분석 실행
             ProblemAnalysisResult result = openAIClient.analyzeImage(imageUrl);
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index 0eceac62..b0820441 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -291,7 +291,7 @@ public void uploadProblemImages(Long problemId, Long userId, List<MultipartFile>
                 missionLogService.registerProblemPracticeMission(userId, problemId);
             }
 
-            log.info("Uploaded image to S3: {} for problemId: {}", imageUrl, problemId);
+            log.info("Uploaded image to S3 for problemId: {}, imageType: {}", problemId, imageType);
         }
     }
 
@@ -488,8 +488,8 @@ public void deleteProblem(Long problemId) {
             try {
                 s3DeleteProducer.sendDeleteMessage(imageData.getImageUrl(), problemId);
             } catch (Exception e) {
-                log.error("S3 삭제 메시지 전송 실패 - problemId: {}, imageUrl: {}, error: {}",
-                        problemId, imageData.getImageUrl(), e.getMessage());
+                log.error("S3 삭제 메시지 전송 실패 - problemId: {}, error: {}",
+                        problemId, e.getMessage());
             }
         });
 
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
index 8c047180..ae2290a5 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
@@ -139,7 +139,7 @@ public void uploadProblemSolveImages(Long problemSolveId, Long userId, List<Mult
             problemSolve.addImage(problemSolveImageData);
             problemSolveImageDataRepository.save(problemSolveImageData);
 
-            log.info("Uploaded problem solve image to S3: {} for problemSolveId: {}", imageUrl, problemSolveId);
+            log.info("Uploaded problem solve image to S3 for problemSolveId: {}, imageOrder: {}", problemSolveId, i);
         }
     }
 
@@ -191,8 +191,8 @@ public void deleteProblemSolve(Long problemSolveId, Long userId) {
             try {
                 s3DeleteProducer.sendDeleteMessage(image.getImageUrl(), problemSolveId);
             } catch (Exception e) {
-                log.error("S3 삭제 메시지 전송 실패 - problemSolveId: {}, imageUrl: {}, error: {}",
-                        problemSolveId, image.getImageUrl(), e.getMessage());
+                log.error("S3 삭제 메시지 전송 실패 - problemSolveId: {}, error: {}",
+                        problemSolveId, e.getMessage());
             }
         });
 
@@ -210,8 +210,8 @@ public void deleteAllProblemSolvesByProblemId(Long problemId) {
                 try {
                     s3DeleteProducer.sendDeleteMessage(image.getImageUrl(), record.getId());
                 } catch (Exception e) {
-                    log.error("S3 삭제 메시지 전송 실패 - problemSolveId: {}, imageUrl: {}, error: {}",
-                            record.getId(), image.getImageUrl(), e.getMessage());
+                    log.error("S3 삭제 메시지 전송 실패 - problemSolveId: {}, error: {}",
+                            record.getId(), e.getMessage());
                 }
             });
         });
diff --git a/src/main/java/com/aisip/OnO/backend/util/ai/OpenAIClient.java b/src/main/java/com/aisip/OnO/backend/util/ai/OpenAIClient.java
index d485bcbc..1b07fe53 100644
--- a/src/main/java/com/aisip/OnO/backend/util/ai/OpenAIClient.java
+++ b/src/main/java/com/aisip/OnO/backend/util/ai/OpenAIClient.java
@@ -88,7 +88,7 @@ public ProblemAnalysisResult analyzeImages(List<String> imageUrls) {
                     .getMessage()
                     .getContent();
 
-            log.info("Received response from OpenAI: {}", content);
+            log.debug("Received response from OpenAI - contentLength: {}", content == null ? 0 : content.length());
 
             // 6. JSON 응답 파싱
             recordExternalCall("openai", "analyze_images", "success", sample);
diff --git a/src/main/java/com/aisip/OnO/backend/util/fcm/controller/FcmController.java b/src/main/java/com/aisip/OnO/backend/util/fcm/controller/FcmController.java
index ba98c37c..dcfe5d4e 100644
--- a/src/main/java/com/aisip/OnO/backend/util/fcm/controller/FcmController.java
+++ b/src/main/java/com/aisip/OnO/backend/util/fcm/controller/FcmController.java
@@ -25,7 +25,8 @@ public class FcmController {
     @PostMapping("/token")
     public CommonResponse<String> registerFcmToken(@RequestBody FcmTokenRequestDto fcmTokenRequestDto) {
         Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        log.info("fcm token: {}", fcmTokenRequestDto.token());
+        log.info("FCM token registration requested - userId: {}, tokenLength: {}",
+                userId, fcmTokenRequestDto.token() == null ? 0 : fcmTokenRequestDto.token().length());
 
         fcmService.registerToken(fcmTokenRequestDto, userId);
         return CommonResponse.success("문제가 등록되었습니다.");
diff --git a/src/main/java/com/aisip/OnO/backend/util/fcm/service/FcmService.java b/src/main/java/com/aisip/OnO/backend/util/fcm/service/FcmService.java
index 1d0f2901..7220f1ea 100644
--- a/src/main/java/com/aisip/OnO/backend/util/fcm/service/FcmService.java
+++ b/src/main/java/com/aisip/OnO/backend/util/fcm/service/FcmService.java
@@ -122,7 +122,7 @@ public void sendNotificationToAllUserDeviceSync(Long userId, NotificationRequest
                         notificationRequestDto.data()
                 ));
             } catch (ApplicationException e) {
-                log.warn("FCM 전송 실패 (userId: {}, token: {}): {}", userId, fcmToken.getToken(), e.getMessage());
+                log.warn("FCM 전송 실패 (userId: {}): {}", userId, e.getMessage());
             }
         });
     }
diff --git a/src/main/java/com/aisip/OnO/backend/util/fileupload/service/FileUploadService.java b/src/main/java/com/aisip/OnO/backend/util/fileupload/service/FileUploadService.java
index ce766964..2f944213 100644
--- a/src/main/java/com/aisip/OnO/backend/util/fileupload/service/FileUploadService.java
+++ b/src/main/java/com/aisip/OnO/backend/util/fileupload/service/FileUploadService.java
@@ -45,7 +45,7 @@ public String uploadFileToS3(MultipartFile file) {
         }
 
         recordExternalCall("s3", "upload", "success", sample);
-        log.info("file url : " + fileUrl + " has upload to S3");
+        log.info("S3 upload completed - fileSize: {}, contentType: {}", file.getSize(), file.getContentType());
         return fileUrl;
     }
 
@@ -54,7 +54,7 @@ public void deleteImageFileFromS3(String imageUrl) {
         String splitStr = ".com/";
         String fileName = imageUrl.substring(imageUrl.lastIndexOf(splitStr) + splitStr.length());
 
-        log.info("file url : " + imageUrl + " has removed from S3");
+        log.info("S3 delete requested");
 
         try {
             amazonS3Client.deleteObject(new DeleteObjectRequest(bucket, fileName));

From 80f325d09ad1977481581d96da3ff4f744521700 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 11:29:21 +0900
Subject: [PATCH 23/43] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=20=EB=85=B8?=
 =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EA=B0=90=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnO/backend/common/aop/LoggingAspect.java | 40 +++----------------
 .../common/config/LoggingFilterConfig.java    |  3 +-
 src/main/resources/logback-spring.xml         |  6 +--
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
index 6379a98b..d3c83376 100644
--- a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
+++ b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
@@ -1,54 +1,24 @@
 package com.aisip.OnO.backend.common.aop;
 
+import com.aisip.OnO.backend.common.exception.ApplicationException;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Aspect
 @Component
 @Slf4j
 class LoggingAspect {
-    private static final Logger logger = LoggerFactory.getLogger(LoggingAspect.class);
 
-    // 예외 발생 시 로깅
     @AfterThrowing(pointcut = "execution(* com.aisip..service..*(..))",
             throwing = "ex")
     public void logAfterThrowing(JoinPoint joinPoint, Throwable ex) {
-        String methodName = joinPoint.getSignature().getName();
-        String className = joinPoint.getSignature().getDeclaringTypeName();
-        String layer = getLayerName(className);
-        logger.error("[{}] [Exception] {}.{}(): {}", layer, className, methodName, ex.getMessage(), ex);
-    }
-
-    // 메서드 실행 이전 로깅
-    @Before("execution(* com.aisip..service..*(..))")
-    public void logBefore(JoinPoint joinPoint) {
-        String methodName = joinPoint.getSignature().getName();
-        String className = joinPoint.getSignature().getDeclaringTypeName();
-        String layer = getLayerName(className);
-        logger.info("[{}] [Executing] {}.{}()", layer, className, methodName);
-    }
-
-    // 메서드 실행 이후 로깅
-    @After("execution(* com.aisip..service..*(..))")
-    public void logAfter(JoinPoint joinPoint) {
-        String methodName = joinPoint.getSignature().getName();
-        String className = joinPoint.getSignature().getDeclaringTypeName();
-        String layer = getLayerName(className);
-        logger.info("[{}] [Completed] {}.{}()", layer, className, methodName);
-    }
-
-    // 클래스 이름으로부터 계층(layer) 이름 추출
-    private String getLayerName(String className) {
-        if (className.contains("service")) {
-            return "Service";
+        if (ex instanceof ApplicationException) {
+            return;
         }
-        return "Unknown";
+
+        log.error("Unhandled service exception - method: {}", joinPoint.getSignature().toShortString(), ex);
     }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/common/config/LoggingFilterConfig.java b/src/main/java/com/aisip/OnO/backend/common/config/LoggingFilterConfig.java
index 38c87540..3c0e3d91 100644
--- a/src/main/java/com/aisip/OnO/backend/common/config/LoggingFilterConfig.java
+++ b/src/main/java/com/aisip/OnO/backend/common/config/LoggingFilterConfig.java
@@ -12,9 +12,8 @@ public CommonsRequestLoggingFilter requestLoggingFilter() {
         CommonsRequestLoggingFilter filter = new CommonsRequestLoggingFilter();
         filter.setIncludeClientInfo(true);
         filter.setIncludeQueryString(true);
-        filter.setIncludePayload(true);
+        filter.setIncludePayload(false);
         filter.setIncludeHeaders(false);
-        filter.setMaxPayloadLength(10000);
         return filter;
     }
 }
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 57a0ce1c..49c8e617 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -39,7 +39,7 @@
     <springProfile name="local">
         <logger name="p6spy" level="INFO"/>
         <logger name="org.hibernate.SQL" level="DEBUG"/>
-        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="DEBUG"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="OFF"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
         </root>
@@ -48,7 +48,7 @@
     <springProfile name="dev">
         <logger name="p6spy" level="INFO"/>
         <logger name="org.hibernate.SQL" level="INFO"/>
-        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="INFO"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="OFF"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
         </root>
@@ -57,7 +57,7 @@
     <springProfile name="prod">
         <logger name="p6spy" level="WARN"/>
         <logger name="org.hibernate.SQL" level="WARN"/>
-        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="WARN"/>
+        <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="OFF"/>
         <logger name="org.springframework" level="INFO"/>
         <logger name="org.springframework.amqp" level="WARN"/>
         <logger name="com.zaxxer.hikari" level="WARN"/>

From de4902b80e90813780b46ce9d62c52c76c66e134 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 12:05:38 +0900
Subject: [PATCH 24/43] =?UTF-8?q?[fix]=20DB=20=EB=A1=9C=EA=B7=B8=EB=A5=BC?=
 =?UTF-8?q?=20=EC=8A=AC=EB=A1=9C=EC=9A=B0=20=EC=BF=BC=EB=A6=AC=20=EC=A4=91?=
 =?UTF-8?q?=EC=8B=AC=EC=9C=BC=EB=A1=9C=20=EC=A0=9C=ED=95=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/config/P6SpyExplainAppender.java  | 20 ++++++++-----------
 src/main/resources/logback-spring.xml         |  2 +-
 src/main/resources/spy.properties             |  6 +++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/config/P6SpyExplainAppender.java b/src/main/java/com/aisip/OnO/backend/config/P6SpyExplainAppender.java
index 70424c70..40ed9e82 100644
--- a/src/main/java/com/aisip/OnO/backend/config/P6SpyExplainAppender.java
+++ b/src/main/java/com/aisip/OnO/backend/config/P6SpyExplainAppender.java
@@ -3,8 +3,6 @@
 import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.engine.jdbc.internal.FormatStyle;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -28,10 +26,6 @@ private static boolean isExplainEnabled() {
         return Boolean.parseBoolean(System.getProperty("p6spy.enable.explain", "false"));
     }
 
-    // EXPLAIN을 실행할 쿼리의 최소 실행 시간 (ms)
-    // 0으로 설정하면 모든 SELECT 쿼리에 대해 EXPLAIN 실행
-    private static final long SLOW_QUERY_THRESHOLD_MS = 0;
-
     @Override
     public String formatMessage(int connectionId, String now, long elapsed,
                                  String category, String prepared, String sql, String url) {
@@ -45,17 +39,14 @@ public String formatMessage(int connectionId, String now, long elapsed,
 
         // 기본 로그 출력
         String formattedSql = formatSql(category, sql);
-        result.append(String.format("[P6Spy] | %s | took %dms | %s | connection %d\n%s\n",
+        result.append(String.format("[P6Spy][SLOW_QUERY] | %s | took %dms | %s | connection %d\n%s\n",
                 now, elapsed, category, connectionId, formattedSql));
 
         // EXPLAIN 실행 조건 체크
         boolean explainEnabled = isExplainEnabled();
         boolean isSelect = sql.trim().toLowerCase(Locale.ROOT).startsWith("select");
-        boolean isSlowQuery = elapsed >= SLOW_QUERY_THRESHOLD_MS;
 
-        // ⭐ category 필터 제거: statement, commit 모두 EXPLAIN 실행
-        // PreparedStatement도 분석하기 위해 category 조건을 완화
-        boolean shouldExplain = explainEnabled && isSelect && isSlowQuery;
+        boolean shouldExplain = explainEnabled && isSelect;
 
         if (shouldExplain) {
             try {
@@ -64,7 +55,7 @@ public String formatMessage(int connectionId, String now, long elapsed,
                 result.append("╔════════════════════════════════════════════════════════════════════════════════╗\n");
                 result.append("║                         EXPLAIN RESULT (took " + elapsed + "ms)                          ║\n");
                 result.append("╠════════════════════════════════════════════════════════════════════════════════╣\n");
-                result.append("║ Query: ").append(String.format("%-70s", sql.replaceAll("\\s+", " ").trim().substring(0, Math.min(70, sql.length())))).append(" ║\n");
+                result.append("║ Query: ").append(String.format("%-70s", summarizeSql(sql))).append(" ║\n");
                 result.append("╠════════════════════════════════════════════════════════════════════════════════╣\n");
                 result.append(explainResult);
                 result.append("╚════════════════════════════════════════════════════════════════════════════════╝\n");
@@ -88,6 +79,11 @@ private String formatSql(String category, String sql) {
         return sql;
     }
 
+    private String summarizeSql(String sql) {
+        String normalizedSql = sql.replaceAll("\\s+", " ").trim();
+        return normalizedSql.substring(0, Math.min(70, normalizedSql.length()));
+    }
+
     private String executeExplain(String sql, String jdbcUrl) throws Exception {
         if (dataSource == null) {
             return "DataSource not available";
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 49c8e617..4f00306b 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -38,7 +38,7 @@
 
     <springProfile name="local">
         <logger name="p6spy" level="INFO"/>
-        <logger name="org.hibernate.SQL" level="DEBUG"/>
+        <logger name="org.hibernate.SQL" level="WARN"/>
         <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="OFF"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
diff --git a/src/main/resources/spy.properties b/src/main/resources/spy.properties
index ab5454bf..64f9318f 100644
--- a/src/main/resources/spy.properties
+++ b/src/main/resources/spy.properties
@@ -7,6 +7,6 @@ excludecategories=info,debug,result,resultset,batch
 # Quartz 관련 테이블 제외 (스케줄러 쿼리)
 exclude=QRTZ_TRIGGERS,QRTZ_FIRED_TRIGGERS,QRTZ_JOB_DETAILS,QRTZ_CRON_TRIGGERS,QRTZ_SIMPLE_TRIGGERS,QRTZ_LOCKS,QRTZ_SCHEDULER_STATE
 
-# 실행 시간 필터링 (0으로 설정하면 모든 쿼리 출력)
-# 0 = 모든 쿼리, 1 = 1ms 이상, 100 = 100ms 이상
-executionThreshold=0
+# 실행 시간 필터링
+# 300 = 300ms 이상 걸린 쿼리만 출력
+executionThreshold=300

From 6e276e5f5685be98f302c2cd1690054cb3bf4f15 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 12:13:49 +0900
Subject: [PATCH 25/43] =?UTF-8?q?[refactor]=20RabbitMQ=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=ED=95=84=EB=93=9C=20=ED=91=9C=EC=A4=80=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/FcmNotificationConsumer.java     | 44 ++++++++++++-------
 .../consumer/ProblemAnalysisConsumer.java     | 36 +++++++++------
 .../rabbitmq/consumer/S3DeleteConsumer.java   | 23 ++++++----
 .../producer/FcmNotificationProducer.java     | 11 +++--
 .../producer/ProblemAnalysisProducer.java     |  9 ++--
 .../rabbitmq/producer/S3DeleteProducer.java   |  9 ++--
 6 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
index 441ac9d2..596a233f 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
@@ -40,15 +40,18 @@ public class FcmNotificationConsumer {
      */
     @RabbitListener(queues = RabbitMQConfig.FCM_NOTIFICATION_QUEUE, concurrency = "5-15")
     public void handleNotificationMessage(FcmNotificationMessage message) {
-        log.info("[FCM Notification Consumer] 메시지 수신 - userId: {}, title: {}, retryCount: {}",
-                message.getUserId(), message.getTitle(), message.getRetryCount());
+        log.info("RabbitMQ message received - queue: {}, operation: {}, userId: {}, messageRetryCount: {}",
+                RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification",
+                message.getUserId(), message.getRetryCount());
 
         try {
             // 사용자의 모든 FCM 토큰 조회
             List<FcmToken> userFcmTokenList = fcmTokenRepository.findAllByUserId(message.getUserId());
 
             if (userFcmTokenList.isEmpty()) {
-                log.warn("[FCM Notification Consumer] FCM 토큰 없음 - userId: {}", message.getUserId());
+                log.warn("RabbitMQ message skipped - queue: {}, operation: {}, outcome: {}, userId: {}, messageRetryCount: {}",
+                        RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", "token_not_found",
+                        message.getUserId(), message.getRetryCount());
                 return; // 토큰 없으면 스킵 (정상 처리)
             }
 
@@ -61,22 +64,25 @@ public void handleNotificationMessage(FcmNotificationMessage message) {
                     sendToDevice(fcmToken.getToken(), message);
                     successCount++;
                 } catch (Exception e) {
-                    log.warn("[FCM Notification Consumer] 디바이스 전송 실패 - userId: {}, error: {}",
-                            message.getUserId(), e.getMessage());
+                    log.warn("RabbitMQ device delivery failed - queue: {}, operation: {}, userId: {}, error: {}",
+                            RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", message.getUserId(), e.getMessage());
                     failCount++;
                 }
             }
 
-            log.info("[FCM Notification Consumer] 전송 완료 - userId: {}, 성공: {}, 실패: {}",
-                    message.getUserId(), successCount, failCount);
-
             // 모든 디바이스 전송 실패 시 예외 발생 (재시도)
             if (successCount == 0 && failCount > 0) {
                 throw new RuntimeException("모든 디바이스 FCM 전송 실패 - userId: " + message.getUserId());
             }
 
+            String outcome = failCount > 0 ? "partial_success" : "success";
+            log.info("RabbitMQ message processed - queue: {}, operation: {}, outcome: {}, userId: {}, successCount: {}, failCount: {}",
+                    RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", outcome,
+                    message.getUserId(), successCount, failCount);
+
         } catch (Exception e) {
-            log.error("[FCM Notification Consumer] 알림 전송 실패 - userId: {}, retryCount: {}, error: {}",
+            log.error("RabbitMQ message failed - queue: {}, operation: {}, outcome: {}, userId: {}, messageRetryCount: {}, error: {}",
+                    RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", "failure",
                     message.getUserId(), message.getRetryCount(), e.getMessage());
 
             // 예외를 던지면 RabbitMQ가 자동으로 재시도 or DLQ로 전송
@@ -101,7 +107,8 @@ private void sendToDevice(String token, FcmNotificationMessage message) throws F
         try {
             String messageId = firebaseMessaging.send(fcmMessage);
             recordExternalCall("firebase", "send_notification_async", "success", sample);
-            log.debug("[FCM Notification Consumer] FCM 전송 성공 - messageId: {}", messageId);
+            log.debug("External delivery succeeded - dependency: {}, operation: {}, messageId: {}",
+                    "firebase", "send_notification_async", messageId);
         } catch (FirebaseMessagingException e) {
             recordExternalCall("firebase", "send_notification_async", "failure", sample);
             throw e;
@@ -115,17 +122,18 @@ private void sendToDevice(String token, FcmNotificationMessage message) throws F
      */
     @RabbitListener(queues = RabbitMQConfig.FCM_NOTIFICATION_DLQ)
     public void handleNotificationDLQ(FcmNotificationMessage message) {
-        log.error("[FCM Notification DLQ] 최종 실패 메시지 - userId: {}, title: {}, retryCount: {}",
-                message.getUserId(), message.getTitle(), message.getRetryCount());
+        log.error("RabbitMQ message moved to DLQ - queue: {}, operation: {}, outcome: {}, userId: {}, messageRetryCount: {}",
+                RabbitMQConfig.FCM_NOTIFICATION_DLQ, "fcm_notification", "dlq",
+                message.getUserId(), message.getRetryCount());
 
         // Discord 알림 전송
         String errorTitle = String.format("🚨 FCM 푸시 알림 최종 실패 (DLQ)");
         String errorDetails = String.format(
-                "**User ID:** %d\n**Title:** %s\n**Body:** %s\n**Retry Count:** %d\n\n" +
+                "**Queue:** %s\n**Operation:** %s\n**User ID:** %d\n**Message Retry Count:** %d\n\n" +
                 "모든 재시도가 실패했습니다. FCM 토큰을 확인하거나 수동으로 알림을 재전송해주세요.",
+                RabbitMQConfig.FCM_NOTIFICATION_DLQ,
+                "fcm_notification",
                 message.getUserId(),
-                message.getTitle(),
-                message.getBody(),
                 message.getRetryCount()
         );
 
@@ -136,9 +144,11 @@ public void handleNotificationDLQ(FcmNotificationMessage message) {
                     "ERROR",
                     errorTitle
             );
-            log.info("[FCM Notification DLQ] Discord 알림 전송 완료");
+            log.info("RabbitMQ DLQ notification sent - queue: {}, operation: {}, userId: {}",
+                    RabbitMQConfig.FCM_NOTIFICATION_DLQ, "fcm_notification", message.getUserId());
         } catch (Exception e) {
-            log.error("[FCM Notification DLQ] Discord 알림 전송 실패: {}", e.getMessage());
+            log.error("RabbitMQ DLQ notification failed - queue: {}, operation: {}, userId: {}, error: {}",
+                    RabbitMQConfig.FCM_NOTIFICATION_DLQ, "fcm_notification", message.getUserId(), e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/ProblemAnalysisConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/ProblemAnalysisConsumer.java
index 8212ed13..969b120e 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/ProblemAnalysisConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/ProblemAnalysisConsumer.java
@@ -32,34 +32,39 @@ public class ProblemAnalysisConsumer {
      */
     @RabbitListener(queues = RabbitMQConfig.GPT_ANALYSIS_QUEUE, concurrency = "1-3")
     public void handleAnalysisMessage(ProblemAnalysisMessage message) {
-        log.info("[GPT Analysis Consumer] 메시지 수신 - problemId: {}, retryCount: {}",
-                message.getProblemId(), message.getRetryCount());
+        log.info("RabbitMQ message received - queue: {}, operation: {}, problemId: {}, messageRetryCount: {}",
+                RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", message.getProblemId(), message.getRetryCount());
 
         try {
             // 실제 GPT 분석 수행
             analysisService.analyzeProblemSync(message.getProblemId());
 
-            log.info("[GPT Analysis Consumer] 분석 성공 - problemId: {}", message.getProblemId());
+            log.info("RabbitMQ message processed - queue: {}, operation: {}, outcome: {}, problemId: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", "success", message.getProblemId());
 
         } catch (NonRetryableAnalysisException e) {
-            log.warn("[GPT Analysis Consumer] 비재시도 분석 실패 처리 - problemId: {}, error: {}",
-                    message.getProblemId(), e.getMessage());
+            log.warn("RabbitMQ message skipped - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}, reason: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", "non_retryable_failure",
+                    message.getProblemId(), message.getRetryCount(), e.getMessage());
             // 상태는 Service에서 FAILED로 업데이트됨. 재큐잉 없이 종료(ACK)
             return;
         } catch (ApplicationException e) {
             if (e.getErrorCase() == ProblemErrorCase.PROBLEM_NOT_FOUND) {
-                log.warn("[GPT Analysis Consumer] 문제가 이미 삭제/미존재하여 분석 스킵 - problemId: {}",
-                        message.getProblemId());
+                log.warn("RabbitMQ message skipped - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}",
+                        RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", "resource_not_found",
+                        message.getProblemId(), message.getRetryCount());
                 return;
             }
 
-            log.error("[GPT Analysis Consumer] 분석 실패 - problemId: {}, retryCount: {}, error: {}",
+            log.error("RabbitMQ message failed - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}, error: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", "failure",
                     message.getProblemId(), message.getRetryCount(), e.getMessage());
 
             // 예외를 던지면 RabbitMQ가 자동으로 재시도 or DLQ로 전송
             throw new RuntimeException("GPT 문제 분석 실패: " + message.getProblemId(), e);
         } catch (Exception e) {
-            log.error("[GPT Analysis Consumer] 분석 실패 - problemId: {}, retryCount: {}, error: {}",
+            log.error("RabbitMQ message failed - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}, error: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_QUEUE, "problem_analysis", "failure",
                     message.getProblemId(), message.getRetryCount(), e.getMessage());
 
             // 예외를 던지면 RabbitMQ가 자동으로 재시도 or DLQ로 전송
@@ -74,14 +79,17 @@ public void handleAnalysisMessage(ProblemAnalysisMessage message) {
      */
     @RabbitListener(queues = RabbitMQConfig.GPT_ANALYSIS_DLQ)
     public void handleAnalysisDLQ(ProblemAnalysisMessage message) {
-        log.error("[GPT Analysis DLQ] 최종 실패 메시지 - problemId: {}, retryCount: {}",
+        log.error("RabbitMQ message moved to DLQ - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}",
+                RabbitMQConfig.GPT_ANALYSIS_DLQ, "problem_analysis", "dlq",
                 message.getProblemId(), message.getRetryCount());
 
         // Discord 알림 전송
         String errorTitle = String.format("🚨 GPT 문제 분석 최종 실패 (DLQ)");
         String errorDetails = String.format(
-                "**Problem ID:** %d\n**Retry Count:** %d\n\n" +
+                "**Queue:** %s\n**Operation:** %s\n**Problem ID:** %d\n**Message Retry Count:** %d\n\n" +
                 "모든 재시도가 실패했습니다. 문제를 확인하고 수동으로 재분석을 요청해주세요.",
+                RabbitMQConfig.GPT_ANALYSIS_DLQ,
+                "problem_analysis",
                 message.getProblemId(),
                 message.getRetryCount()
         );
@@ -93,9 +101,11 @@ public void handleAnalysisDLQ(ProblemAnalysisMessage message) {
                     "ERROR",
                     errorTitle
             );
-            log.info("[GPT Analysis DLQ] Discord 알림 전송 완료");
+            log.info("RabbitMQ DLQ notification sent - queue: {}, operation: {}, problemId: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_DLQ, "problem_analysis", message.getProblemId());
         } catch (Exception e) {
-            log.error("[GPT Analysis DLQ] Discord 알림 전송 실패: {}", e.getMessage());
+            log.error("RabbitMQ DLQ notification failed - queue: {}, operation: {}, problemId: {}, error: {}",
+                    RabbitMQConfig.GPT_ANALYSIS_DLQ, "problem_analysis", message.getProblemId(), e.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
index 7d93ce5f..7bf921fb 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/S3DeleteConsumer.java
@@ -29,17 +29,19 @@ public class S3DeleteConsumer {
      */
     @RabbitListener(queues = RabbitMQConfig.S3_DELETE_QUEUE, concurrency = "3-10")
     public void handleS3DeleteMessage(S3DeleteMessage message) {
-        log.info("[S3 Delete Consumer] 메시지 수신 - problemId: {}, retryCount: {}",
-                message.getProblemId(), message.getRetryCount());
+        log.info("RabbitMQ message received - queue: {}, operation: {}, problemId: {}, messageRetryCount: {}",
+                RabbitMQConfig.S3_DELETE_QUEUE, "s3_delete", message.getProblemId(), message.getRetryCount());
 
         try {
             // S3 파일 삭제 실행
             fileUploadService.deleteImageFileFromS3(message.getImageUrl());
 
-            log.info("[S3 Delete Consumer] 삭제 성공 - problemId: {}", message.getProblemId());
+            log.info("RabbitMQ message processed - queue: {}, operation: {}, outcome: {}, problemId: {}",
+                    RabbitMQConfig.S3_DELETE_QUEUE, "s3_delete", "success", message.getProblemId());
 
         } catch (Exception e) {
-            log.error("[S3 Delete Consumer] 삭제 실패 - problemId: {}, retryCount: {}, error: {}",
+            log.error("RabbitMQ message failed - queue: {}, operation: {}, outcome: {}, problemId: {}, messageRetryCount: {}, error: {}",
+                    RabbitMQConfig.S3_DELETE_QUEUE, "s3_delete", "failure",
                     message.getProblemId(), message.getRetryCount(), e.getMessage());
 
             // 예외를 던지면 RabbitMQ가 자동으로 재시도 or DLQ로 전송
@@ -56,14 +58,17 @@ public void handleS3DeleteMessage(S3DeleteMessage message) {
     public void handleS3DeleteDLQ(S3DeleteMessage message) {
         String maskedObjectKey = maskS3ObjectKey(message.getImageUrl());
 
-        log.error("[S3 Delete DLQ] 최종 실패 메시지 - problemId: {}, objectKey: {}, retryCount: {}",
+        log.error("RabbitMQ message moved to DLQ - queue: {}, operation: {}, outcome: {}, problemId: {}, objectKey: {}, messageRetryCount: {}",
+                RabbitMQConfig.S3_DELETE_DLQ, "s3_delete", "dlq",
                 message.getProblemId(), maskedObjectKey, message.getRetryCount());
 
         // Discord 알림 전송
         String errorTitle = String.format("🚨 S3 파일 삭제 최종 실패 (DLQ)");
         String errorDetails = String.format(
-                "**Problem ID:** %d\n**Object Key:** %s\n**Retry Count:** %d\n\n" +
+                "**Queue:** %s\n**Operation:** %s\n**Problem ID:** %d\n**Object Key:** %s\n**Message Retry Count:** %d\n\n" +
                 "모든 재시도가 실패했습니다. 수동으로 S3에서 파일을 삭제하거나 메시지를 재처리해주세요.",
+                RabbitMQConfig.S3_DELETE_DLQ,
+                "s3_delete",
                 message.getProblemId(),
                 maskedObjectKey,
                 message.getRetryCount()
@@ -76,9 +81,11 @@ public void handleS3DeleteDLQ(S3DeleteMessage message) {
                     "ERROR",
                     errorTitle
             );
-            log.info("[S3 Delete DLQ] Discord 알림 전송 완료");
+            log.info("RabbitMQ DLQ notification sent - queue: {}, operation: {}, problemId: {}",
+                    RabbitMQConfig.S3_DELETE_DLQ, "s3_delete", message.getProblemId());
         } catch (Exception e) {
-            log.error("[S3 Delete DLQ] Discord 알림 전송 실패: {}", e.getMessage());
+            log.error("RabbitMQ DLQ notification failed - queue: {}, operation: {}, problemId: {}, error: {}",
+                    RabbitMQConfig.S3_DELETE_DLQ, "s3_delete", message.getProblemId(), e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/FcmNotificationProducer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/FcmNotificationProducer.java
index f73d57ac..e64ba568 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/FcmNotificationProducer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/FcmNotificationProducer.java
@@ -37,11 +37,14 @@ public void sendNotificationMessage(Long userId, String title, String body, Map<
                     message
             );
 
-            log.info("[FCM Notification Producer] 메시지 전송 성공 - userId: {}, title: {}", userId, title);
+            log.info("RabbitMQ message sent - exchange: {}, routingKey: {}, operation: {}, userId: {}",
+                    RabbitMQConfig.NOTIFICATION_EXCHANGE, RabbitMQConfig.FCM_NOTIFICATION_ROUTING_KEY,
+                    "fcm_notification", userId);
         } catch (Exception e) {
-            log.error("[FCM Notification Producer] 메시지 전송 실패 - userId: {}, error: {}",
-                    userId, e.getMessage(), e);
+            log.error("RabbitMQ message send failed - exchange: {}, routingKey: {}, operation: {}, userId: {}, error: {}",
+                    RabbitMQConfig.NOTIFICATION_EXCHANGE, RabbitMQConfig.FCM_NOTIFICATION_ROUTING_KEY,
+                    "fcm_notification", userId, e.getMessage(), e);
             // 알림 전송 실패해도 예외를 던지지 않음 (알림은 선택적 기능)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/ProblemAnalysisProducer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/ProblemAnalysisProducer.java
index bb43f8ad..1fb40db8 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/ProblemAnalysisProducer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/ProblemAnalysisProducer.java
@@ -32,10 +32,13 @@ public void sendAnalysisMessage(Long problemId) {
                     message
             );
 
-            log.info("[GPT Analysis Producer] 메시지 전송 성공 - problemId: {}", problemId);
+            log.info("RabbitMQ message sent - exchange: {}, routingKey: {}, operation: {}, problemId: {}",
+                    RabbitMQConfig.ANALYSIS_EXCHANGE, RabbitMQConfig.GPT_ANALYSIS_ROUTING_KEY,
+                    "problem_analysis", problemId);
         } catch (Exception e) {
-            log.error("[GPT Analysis Producer] 메시지 전송 실패 - problemId: {}, error: {}",
-                    problemId, e.getMessage(), e);
+            log.error("RabbitMQ message send failed - exchange: {}, routingKey: {}, operation: {}, problemId: {}, error: {}",
+                    RabbitMQConfig.ANALYSIS_EXCHANGE, RabbitMQConfig.GPT_ANALYSIS_ROUTING_KEY,
+                    "problem_analysis", problemId, e.getMessage(), e);
             // 메시지 전송 실패해도 예외를 던지지 않음 (분석은 선택적 기능)
         }
     }
diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
index 9f4993a7..da094a89 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/producer/S3DeleteProducer.java
@@ -33,10 +33,13 @@ public void sendDeleteMessage(String imageUrl, Long problemId) {
                     message
             );
 
-            log.info("[S3 Delete Producer] 메시지 전송 성공 - problemId: {}", problemId);
+            log.info("RabbitMQ message sent - exchange: {}, routingKey: {}, operation: {}, problemId: {}",
+                    RabbitMQConfig.FILE_EXCHANGE, RabbitMQConfig.S3_DELETE_ROUTING_KEY,
+                    "s3_delete", problemId);
         } catch (Exception e) {
-            log.error("[S3 Delete Producer] 메시지 전송 실패 - problemId: {}, error: {}",
-                    problemId, e.getMessage(), e);
+            log.error("RabbitMQ message send failed - exchange: {}, routingKey: {}, operation: {}, problemId: {}, error: {}",
+                    RabbitMQConfig.FILE_EXCHANGE, RabbitMQConfig.S3_DELETE_ROUTING_KEY,
+                    "s3_delete", problemId, e.getMessage(), e);
             // 메시지 전송 실패해도 DB 삭제는 완료되므로 예외를 던지지 않음
         }
     }

From eb05e4b52d7c1a3501b4a2a06880285d48fdd471 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 23:12:43 +0900
Subject: [PATCH 26/43] =?UTF-8?q?[refactor]=20=EB=94=94=EC=8A=A4=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=97=90=EB=9F=AC=20=EC=A0=84=EC=86=A1=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DiscordWebhookNotificationService.java    | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java b/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
index cc7b918a..e74eb14a 100644
--- a/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
+++ b/src/main/java/com/aisip/OnO/backend/util/webhook/DiscordWebhookNotificationService.java
@@ -9,8 +9,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
 @Service
@@ -18,6 +21,8 @@
 public class DiscordWebhookNotificationService {
 
     private final RestTemplate restTemplate = new RestTemplate();
+    private final Map<String, Instant> lastSentAtByDedupKey = new ConcurrentHashMap<>();
+    private static final Duration ERROR_NOTIFICATION_DEDUP_WINDOW = Duration.ofMinutes(5);
 
     @Value("${discord.webhook-url}")
     private String webhookUrl;
@@ -27,6 +32,12 @@ public class DiscordWebhookNotificationService {
      */
     public void sendErrorNotification(String path, String errorMessage, String status, String exceptionType) {
         String timestamp = Instant.now().toString();
+        String dedupKey = createDedupKey(path, status, exceptionType);
+
+        if (shouldSuppress(dedupKey)) {
+            log.debug("Discord error notification suppressed - key: {}", dedupKey);
+            return;
+        }
 
         DiscordWebhookPayload.Embed embed = new DiscordWebhookPayload.Embed(
                 "🚨 서버 에러 발생",
@@ -40,7 +51,7 @@ public void sendErrorNotification(String path, String errorMessage, String statu
                 )
         );
 
-        sendToDiscord(new DiscordWebhookPayload(null, List.of(embed)));
+        sendToDiscord(new DiscordWebhookPayload(null, List.of(embed)), dedupKey);
     }
 
     /**
@@ -64,6 +75,12 @@ public void sendMessage(String title, String message) {
      */
     public void sendCustomEmbed(String title, String description, List<DiscordWebhookPayload.Embed.Field> fields) {
         String timestamp = Instant.now().toString();
+        String dedupKey = createDedupKey(title, description);
+
+        if (shouldSuppress(dedupKey)) {
+            log.debug("Discord custom notification suppressed - key: {}", dedupKey);
+            return;
+        }
 
         DiscordWebhookPayload.Embed embed = new DiscordWebhookPayload.Embed(
                 title,
@@ -72,13 +89,17 @@ public void sendCustomEmbed(String title, String description, List<DiscordWebhoo
                 fields
         );
 
-        sendToDiscord(new DiscordWebhookPayload(null, List.of(embed)));
+        sendToDiscord(new DiscordWebhookPayload(null, List.of(embed)), dedupKey);
     }
 
     /**
      * Discord Webhook으로 메시지 전송 (내부 메서드)
      */
     private void sendToDiscord(DiscordWebhookPayload payload) {
+        sendToDiscord(payload, null);
+    }
+
+    private void sendToDiscord(DiscordWebhookPayload payload, String dedupKey) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
@@ -88,9 +109,40 @@ private void sendToDiscord(DiscordWebhookPayload payload) {
                     new HttpEntity<>(payload, headers),
                     String.class
             );
+            if (dedupKey != null) {
+                lastSentAtByDedupKey.put(dedupKey, Instant.now());
+            }
             log.info("Discord webhook 전송 완료: {}", payload.embeds().get(0).title());
         } catch (Exception e) {
             log.error("Discord webhook 전송 실패: {}", e.getMessage(), e);
         }
     }
+
+    private boolean shouldSuppress(String dedupKey) {
+        Instant lastSentAt = lastSentAtByDedupKey.get(dedupKey);
+        return lastSentAt != null
+                && Instant.now().isBefore(lastSentAt.plus(ERROR_NOTIFICATION_DEDUP_WINDOW));
+    }
+
+    private String createDedupKey(String path, String status, String exceptionType) {
+        return String.join("|",
+                normalize(path),
+                normalize(status),
+                normalize(exceptionType)
+        );
+    }
+
+    private String createDedupKey(String title, String description) {
+        return String.join("|",
+                normalize(title),
+                normalize(description)
+        );
+    }
+
+    private String normalize(String value) {
+        if (value == null || value.isBlank()) {
+            return "unknown";
+        }
+        return value.replaceAll("\\s+", " ").trim();
+    }
 }

From 3aedbb7869c18f454af2f552e9d4f79a11e09e1f Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 23:23:56 +0900
Subject: [PATCH 27/43] =?UTF-8?q?[feat]=20=EC=9A=94=EC=B2=AD=20ID=EC=99=80?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=EB=B3=84=20HTTP=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EB=A0=88=EB=B2=A8=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/RequestLoggingMdcFilter.java       | 54 ++++++++++++++++++-
 src/main/resources/logback-spring.xml         |  1 +
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java b/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
index 880917f6..912ea357 100644
--- a/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
+++ b/src/main/java/com/aisip/OnO/backend/common/config/RequestLoggingMdcFilter.java
@@ -6,9 +6,11 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import java.io.IOException;
@@ -20,6 +22,11 @@
 public class RequestLoggingMdcFilter extends OncePerRequestFilter {
 
     private static final String REQUEST_ID_HEADER = "X-Request-Id";
+    private static final String FORWARDED_FOR_HEADER = "X-Forwarded-For";
+    private static final String REAL_IP_HEADER = "X-Real-IP";
+
+    @Value("${logging.http.slow-request-threshold-ms:1000}")
+    private long slowRequestThresholdMs;
 
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) {
@@ -43,6 +50,8 @@ protected void doFilterInternal(HttpServletRequest request,
         MDC.put("traceId", traceId);
         MDC.put("method", request.getMethod());
         MDC.put("uri", request.getRequestURI());
+        MDC.put("clientIp", resolveClientIp(request));
+        response.setHeader(REQUEST_ID_HEADER, traceId);
 
         Exception failure = null;
         try {
@@ -57,8 +66,9 @@ protected void doFilterInternal(HttpServletRequest request,
 
             MDC.put("status", String.valueOf(status));
             MDC.put("latencyMs", String.valueOf(latencyMs));
+            MDC.put("uri", resolveUriPattern(request));
 
-            log.info("HTTP request completed");
+            logRequestCompleted(status, latencyMs);
             clearMdc();
         }
     }
@@ -79,11 +89,53 @@ private int resolveFailureStatus(HttpServletResponse response) {
         return status;
     }
 
+    private String resolveUriPattern(HttpServletRequest request) {
+        Object pattern = request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+        if (pattern instanceof String matchedPattern && !matchedPattern.isBlank()) {
+            return matchedPattern;
+        }
+        return request.getRequestURI();
+    }
+
+    private String resolveClientIp(HttpServletRequest request) {
+        String forwardedFor = request.getHeader(FORWARDED_FOR_HEADER);
+        if (forwardedFor != null && !forwardedFor.isBlank()) {
+            return forwardedFor.split(",", 2)[0].trim();
+        }
+
+        String realIp = request.getHeader(REAL_IP_HEADER);
+        if (realIp != null && !realIp.isBlank()) {
+            return realIp;
+        }
+
+        return request.getRemoteAddr();
+    }
+
+    private void logRequestCompleted(int status, long latencyMs) {
+        if (status >= HttpServletResponse.SC_INTERNAL_SERVER_ERROR) {
+            log.error("HTTP request completed");
+            return;
+        }
+
+        if (status >= HttpServletResponse.SC_BAD_REQUEST) {
+            log.warn("HTTP request completed");
+            return;
+        }
+
+        if (latencyMs >= slowRequestThresholdMs) {
+            log.info("HTTP slow request completed");
+            return;
+        }
+
+        log.debug("HTTP request completed");
+    }
+
     private void clearMdc() {
         MDC.remove("traceId");
         MDC.remove("userId");
         MDC.remove("method");
         MDC.remove("uri");
+        MDC.remove("clientIp");
         MDC.remove("status");
         MDC.remove("latencyMs");
         MDC.remove("errorCode");
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 4f00306b..c2b5764c 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -29,6 +29,7 @@
             <includeMdcKeyName>userId</includeMdcKeyName>
             <includeMdcKeyName>method</includeMdcKeyName>
             <includeMdcKeyName>uri</includeMdcKeyName>
+            <includeMdcKeyName>clientIp</includeMdcKeyName>
             <includeMdcKeyName>status</includeMdcKeyName>
             <includeMdcKeyName>latencyMs</includeMdcKeyName>
             <includeMdcKeyName>errorCode</includeMdcKeyName>

From 801d143f1ccb229e56380d50c2af65597d39cade Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 23:27:41 +0900
Subject: [PATCH 28/43] =?UTF-8?q?[feat]=20=EC=98=88=EC=99=B8=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=ED=8F=AC=EB=A7=B7=20=ED=86=B5=EC=9D=BC=20=EB=B0=8F?=
 =?UTF-8?q?=20=EC=A4=91=EB=B3=B5=20stacktrace=20=EC=96=B5=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnO/backend/common/aop/LoggingAspect.java |  8 +++++++
 .../exception/GlobalExceptionHandler.java     | 24 +++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
index d3c83376..bd638103 100644
--- a/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
+++ b/src/main/java/com/aisip/OnO/backend/common/aop/LoggingAspect.java
@@ -5,6 +5,7 @@
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
 @Aspect
@@ -19,6 +20,13 @@ public void logAfterThrowing(JoinPoint joinPoint, Throwable ex) {
             return;
         }
 
+        if (MDC.get("traceId") != null) {
+            log.debug("Service exception propagated to request handler - method: {}, exceptionType: {}",
+                    joinPoint.getSignature().toShortString(),
+                    ex.getClass().getSimpleName());
+            return;
+        }
+
         log.error("Unhandled service exception - method: {}", joinPoint.getSignature().toShortString(), ex);
     }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
index 842cd4cb..b03db3f8 100644
--- a/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/aisip/OnO/backend/common/exception/GlobalExceptionHandler.java
@@ -35,7 +35,7 @@ public ResponseEntity<CommonResponse> handleApplicationException(ApplicationExce
 
         HttpStatusCode status = HttpStatusCode.valueOf(e.getErrorCase().getHttpStatusCode());
         putErrorMdc(e.getErrorCase().getErrorCode(), e);
-        logByStatus(status, "Application exception handled: {}", e.getMessage(), e);
+        logByStatus(status, "Application exception handled", e.getMessage(), e);
         notifyIfServerError(e, request, status);
 
         return ResponseEntity
@@ -51,7 +51,7 @@ public ResponseEntity<CommonResponse> handleValidException(BindingResult binding
         CommonResponse commonResponse = CommonResponse.error(400, message);
 
         putErrorMdc(400, ex);
-        log.warn("Validation exception handled: {}", message);
+        logByStatus(HttpStatus.BAD_REQUEST, "Validation exception handled", message, ex);
 
         return ResponseEntity
                 .status(HttpStatus.BAD_REQUEST)
@@ -89,7 +89,7 @@ public ResponseEntity<CommonResponse> handleException(Exception ex, WebRequest r
         CommonResponse commonResponse = CommonResponse.error(500, "서버 내부 오류가 발생했습니다.");
 
         putErrorMdc(500, ex);
-        log.error("Unhandled exception occurred", ex);
+        logByStatus(HttpStatus.INTERNAL_SERVER_ERROR, "Unhandled exception handled", ex.getMessage(), ex);
         notifyIfServerError(ex, request, HttpStatus.INTERNAL_SERVER_ERROR);
 
         return ResponseEntity
@@ -104,7 +104,7 @@ private ResponseEntity<CommonResponse> handleSpringStatusException(Exception ex,
         CommonResponse commonResponse = CommonResponse.error(status.value(), message);
 
         putErrorMdc(status.value(), ex);
-        logByStatus(status, "Spring MVC exception handled: {}", ex.getMessage(), ex);
+        logByStatus(status, "Spring MVC exception handled", ex.getMessage(), ex);
         notifyIfServerError(ex, request, status);
 
         return ResponseEntity
@@ -137,12 +137,22 @@ private void putErrorMdc(Integer errorCode, Exception ex) {
         MDC.put("exceptionType", ex.getClass().getSimpleName());
     }
 
-    private void logByStatus(HttpStatusCode status, String message, String detail, Exception ex) {
+    private void logByStatus(HttpStatusCode status, String event, String detail, Exception ex) {
+        String exceptionType = ex.getClass().getSimpleName();
         if (status.is5xxServerError()) {
-            log.error(message, detail, ex);
+            log.error("{} - status: {}, exceptionType: {}, detail: {}",
+                    event,
+                    status.value(),
+                    exceptionType,
+                    detail,
+                    ex);
             return;
         }
-        log.warn(message, detail);
+        log.warn("{} - status: {}, exceptionType: {}, detail: {}",
+                event,
+                status.value(),
+                exceptionType,
+                detail);
     }
 
     private String resolveErrorMessage(ErrorResponseException ex) {

From b13cf0dd8b52d74b23102a3c1e47b5bd21bfd6c7 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Fri, 1 May 2026 23:45:16 +0900
Subject: [PATCH 29/43] =?UTF-8?q?[refactor]=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=9E=AC=EC=A0=95=EC=9D=98=20=EB=B0=8F=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/auth/exception/AuthErrorCase.java | 10 ++++++--
 .../auth/CustomAccessDeniedHandler.java       | 12 +++++++---
 .../auth/CustomAuthenticationEntryPoint.java  | 24 ++++++++++++++-----
 .../backend/common/auth/JwtTokenFilter.java   |  8 ++++---
 .../folder/exception/FolderErrorCase.java     |  6 ++---
 .../mission/exception/MissionErrorCase.java   |  2 +-
 .../exception/PracticeNoteErrorCase.java      |  2 +-
 .../problem/exception/ProblemErrorCase.java   |  4 ++--
 .../exception/ProblemSolveErrorCase.java      |  6 ++---
 .../backend/user/exception/UserErrorCase.java |  2 +-
 .../util/fcm/exception/FcmErrorCase.java      |  4 ++--
 11 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/aisip/OnO/backend/auth/exception/AuthErrorCase.java b/src/main/java/com/aisip/OnO/backend/auth/exception/AuthErrorCase.java
index 808e5645..f5e508d1 100644
--- a/src/main/java/com/aisip/OnO/backend/auth/exception/AuthErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/auth/exception/AuthErrorCase.java
@@ -16,9 +16,15 @@ public enum AuthErrorCase implements ErrorCase {
 
     REFRESH_TOKEN_NOT_EQUAL(400, 1004, "리프레시 토큰이 일치하지 않습니다."),
 
-    ACCESS_TOKEN_EXPIRED(400, 1005, "엑세스 토큰이 만료되었습니다."),
+    ACCESS_TOKEN_EXPIRED(401, 1005, "엑세스 토큰이 만료되었습니다."),
 
-    REFRESH_TOKEN_EXPIRED(401, 1006, "리프레시 토큰이 만료되었습니다.");
+    REFRESH_TOKEN_EXPIRED(401, 1006, "리프레시 토큰이 만료되었습니다."),
+
+    AUTHENTICATION_FAILED(401, 1007, "인증이 실패했습니다."),
+
+    ACCESS_DENIED(403, 1008, "접근 권한이 없습니다."),
+
+    INVALID_ACCESS_TOKEN(401, 1009, "유효하지 않은 엑세스 토큰입니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;
diff --git a/src/main/java/com/aisip/OnO/backend/common/auth/CustomAccessDeniedHandler.java b/src/main/java/com/aisip/OnO/backend/common/auth/CustomAccessDeniedHandler.java
index 9c6325a1..0f0b70b2 100644
--- a/src/main/java/com/aisip/OnO/backend/common/auth/CustomAccessDeniedHandler.java
+++ b/src/main/java/com/aisip/OnO/backend/common/auth/CustomAccessDeniedHandler.java
@@ -1,7 +1,11 @@
 package com.aisip.OnO.backend.common.auth;
 
+import com.aisip.OnO.backend.auth.exception.AuthErrorCase;
+import com.aisip.OnO.backend.common.response.CommonResponse;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
@@ -9,13 +13,15 @@
 import java.io.IOException;
 
 @Component
+@RequiredArgsConstructor
 public class CustomAccessDeniedHandler implements AccessDeniedHandler {
 
+    private final ObjectMapper objectMapper;
+
     @Override
     public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
-        response.setStatus(HttpServletResponse.SC_FORBIDDEN);  // 403 Forbidden 상태 코드
+        response.setStatus(AuthErrorCase.ACCESS_DENIED.getHttpStatusCode());
         response.setContentType("application/json;charset=UTF-8");
-        response.getWriter().write("{\"errorCode\":\"403\",\n\"message\":\"접근 권한이 없습니다.\"}");  // 사용자 정의 메시지
+        objectMapper.writeValue(response.getWriter(), CommonResponse.error(AuthErrorCase.ACCESS_DENIED));
     }
 }
-
diff --git a/src/main/java/com/aisip/OnO/backend/common/auth/CustomAuthenticationEntryPoint.java b/src/main/java/com/aisip/OnO/backend/common/auth/CustomAuthenticationEntryPoint.java
index 57b009c7..0832e53e 100644
--- a/src/main/java/com/aisip/OnO/backend/common/auth/CustomAuthenticationEntryPoint.java
+++ b/src/main/java/com/aisip/OnO/backend/common/auth/CustomAuthenticationEntryPoint.java
@@ -1,7 +1,12 @@
 package com.aisip.OnO.backend.common.auth;
 
+import com.aisip.OnO.backend.auth.exception.AuthErrorCase;
+import com.aisip.OnO.backend.common.exception.ErrorCase;
+import com.aisip.OnO.backend.common.response.CommonResponse;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
@@ -9,8 +14,11 @@
 import java.io.IOException;
 
 @Component
+@RequiredArgsConstructor
 public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
+    private final ObjectMapper objectMapper;
+
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
 
@@ -30,14 +38,18 @@ public void commence(HttpServletRequest request, HttpServletResponse response, A
         ) {
             return;
         }
-        String errorMessage = (String) request.getAttribute("errorMessage");
-
-        if(errorMessage == null)
-            errorMessage = "인증이 실패했습니다.";
+        ErrorCase errorCase = resolveErrorCase(request);
 
         response.setContentType("application/json;charset=UTF-8");
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); // 401 UNAUTHORIZED 상태 코드
-        response.getWriter().write("{\"errorCode\":\"401\",\n\"message\":\"" + errorMessage + "\"}");
+        response.setStatus(errorCase.getHttpStatusCode());
+        objectMapper.writeValue(response.getWriter(), CommonResponse.error(errorCase));
     }
 
+    private ErrorCase resolveErrorCase(HttpServletRequest request) {
+        Object errorCase = request.getAttribute(JwtTokenFilter.AUTH_ERROR_CASE_ATTRIBUTE);
+        if (errorCase instanceof ErrorCase resolvedErrorCase) {
+            return resolvedErrorCase;
+        }
+        return AuthErrorCase.AUTHENTICATION_FAILED;
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java b/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
index d722df65..87f1a053 100644
--- a/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
+++ b/src/main/java/com/aisip/OnO/backend/common/auth/JwtTokenFilter.java
@@ -1,6 +1,7 @@
 package com.aisip.OnO.backend.common.auth;
 
 import com.aisip.OnO.backend.auth.entity.Authority;
+import com.aisip.OnO.backend.auth.exception.AuthErrorCase;
 import com.aisip.OnO.backend.auth.service.JwtTokenizer;
 import com.aisip.OnO.backend.util.redis.RedisTokenService;
 import io.jsonwebtoken.Claims;
@@ -28,6 +29,7 @@
 public class JwtTokenFilter extends OncePerRequestFilter {
 
     public static final String AUTHORIZATION_HEADER = "Authorization";
+    public static final String AUTH_ERROR_CASE_ATTRIBUTE = "authErrorCase";
 
     private final JwtTokenizer jwtTokenizer;
     private final RedisTokenService redisTokenService;
@@ -69,7 +71,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
                 // 2. 블랙리스트 체크 (로그아웃된 토큰인지 확인)
                 if (redisTokenService.isBlacklisted(accessToken)) {
-                    request.setAttribute("errorMessage", "로그아웃된 토큰입니다.");
+                    request.setAttribute(AUTH_ERROR_CASE_ATTRIBUTE, AuthErrorCase.INVALID_ACCESS_TOKEN);
                     filterChain.doFilter(request, response);
                     return;
                 }
@@ -87,9 +89,9 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 MDC.put("userId", String.valueOf(userId));
             } catch (ExpiredJwtException e) {
-                request.setAttribute("errorMessage", "토큰이 만료되었습니다.");
+                request.setAttribute(AUTH_ERROR_CASE_ATTRIBUTE, AuthErrorCase.ACCESS_TOKEN_EXPIRED);
             } catch (Exception e) {
-                request.setAttribute("errorMessage", "인증이 실패했습니다.");
+                request.setAttribute(AUTH_ERROR_CASE_ATTRIBUTE, AuthErrorCase.AUTHENTICATION_FAILED);
             }
         }
 
diff --git a/src/main/java/com/aisip/OnO/backend/folder/exception/FolderErrorCase.java b/src/main/java/com/aisip/OnO/backend/folder/exception/FolderErrorCase.java
index ca212c7e..3e5680d4 100644
--- a/src/main/java/com/aisip/OnO/backend/folder/exception/FolderErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/folder/exception/FolderErrorCase.java
@@ -8,11 +8,11 @@
 @RequiredArgsConstructor
 public enum FolderErrorCase implements ErrorCase {
 
-    FOLDER_NOT_FOUND(400, 5001, "폴더를 찾을 수 없습니다."),
+    FOLDER_NOT_FOUND(404, 5001, "폴더를 찾을 수 없습니다."),
 
-    FOLDER_USER_UNMATCHED(400, 5002, "폴더를 소유한 유저가 아닙니다."),
+    FOLDER_USER_UNMATCHED(403, 5002, "폴더를 소유한 유저가 아닙니다."),
 
-    ROOT_FOLDER_NOT_EXIST(400, 5003, "루트 폴더가 존재하지 않습니다."),
+    ROOT_FOLDER_NOT_EXIST(404, 5003, "루트 폴더가 존재하지 않습니다."),
 
     ROOT_FOLDER_CANNOT_REMOVE(400, 5004, "루트 폴더는 삭제할 수 없습니다.");
 
diff --git a/src/main/java/com/aisip/OnO/backend/mission/exception/MissionErrorCase.java b/src/main/java/com/aisip/OnO/backend/mission/exception/MissionErrorCase.java
index 08bc9260..060f0a5e 100644
--- a/src/main/java/com/aisip/OnO/backend/mission/exception/MissionErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/mission/exception/MissionErrorCase.java
@@ -10,7 +10,7 @@ public enum MissionErrorCase implements ErrorCase {
 
     MISSION_TYPE_NOT_FOUND(400, 7001, "잘못된 미션 종류입니다."),
 
-    USER_NOT_FOUND(400, 7002, "해당하는 유저가 존재하지 않습니다.");
+    USER_NOT_FOUND(404, 7002, "해당하는 유저가 존재하지 않습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;
diff --git a/src/main/java/com/aisip/OnO/backend/practicenote/exception/PracticeNoteErrorCase.java b/src/main/java/com/aisip/OnO/backend/practicenote/exception/PracticeNoteErrorCase.java
index 47c6f7cf..46a8a65b 100644
--- a/src/main/java/com/aisip/OnO/backend/practicenote/exception/PracticeNoteErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/practicenote/exception/PracticeNoteErrorCase.java
@@ -8,7 +8,7 @@
 @RequiredArgsConstructor
 public enum PracticeNoteErrorCase implements ErrorCase {
 
-    PRACTICE_NOTE_NOT_FOUND(400, 6001, "복습 노트를 찾을 수 없습니다.");
+    PRACTICE_NOTE_NOT_FOUND(404, 6001, "복습 노트를 찾을 수 없습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;
diff --git a/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java b/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
index 860b75aa..55f536a3 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
@@ -8,9 +8,9 @@
 @RequiredArgsConstructor
 public enum ProblemErrorCase implements ErrorCase {
 
-    PROBLEM_NOT_FOUND(400, 4001, "문제를 찾을 수 없습니다."),
+    PROBLEM_NOT_FOUND(404, 4001, "문제를 찾을 수 없습니다."),
 
-    PROBLEM_USER_UNMATCHED(400, 4002, "문제 작성자가 아닙니다."),
+    PROBLEM_USER_UNMATCHED(403, 4002, "문제 작성자가 아닙니다."),
 
     PROBLEM_SOLVE_IMAGE_ALREADY_REGISTERED(400, 4003, "이미 오늘의 복습을 완료한 문제입니다."),
 
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/exception/ProblemSolveErrorCase.java b/src/main/java/com/aisip/OnO/backend/problemsolve/exception/ProblemSolveErrorCase.java
index 9446eff3..1f941ca3 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/exception/ProblemSolveErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/exception/ProblemSolveErrorCase.java
@@ -8,10 +8,10 @@
 @RequiredArgsConstructor
 public enum ProblemSolveErrorCase implements ErrorCase {
 
-    PROBLEM_SOLVE_NOT_FOUND(400, 4021, "복습 기록을 찾을 수 없습니다."),
-    PROBLEM_SOLVE_USER_UNMATCHED(400, 4022, "해당 복습 기록에 대한 권한이 없습니다.");
+    PROBLEM_SOLVE_NOT_FOUND(404, 4021, "복습 기록을 찾을 수 없습니다."),
+    PROBLEM_SOLVE_USER_UNMATCHED(403, 4022, "해당 복습 기록에 대한 권한이 없습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;
     private final String message;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/aisip/OnO/backend/user/exception/UserErrorCase.java b/src/main/java/com/aisip/OnO/backend/user/exception/UserErrorCase.java
index a0909502..7e11eba3 100644
--- a/src/main/java/com/aisip/OnO/backend/user/exception/UserErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/user/exception/UserErrorCase.java
@@ -8,7 +8,7 @@
 @RequiredArgsConstructor
 public enum UserErrorCase implements ErrorCase {
 
-    USER_NOT_FOUND(400, 3001, "사용자를 찾을 수 없습니다.");
+    USER_NOT_FOUND(404, 3001, "사용자를 찾을 수 없습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;
diff --git a/src/main/java/com/aisip/OnO/backend/util/fcm/exception/FcmErrorCase.java b/src/main/java/com/aisip/OnO/backend/util/fcm/exception/FcmErrorCase.java
index b000114c..e38ec9b6 100644
--- a/src/main/java/com/aisip/OnO/backend/util/fcm/exception/FcmErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/util/fcm/exception/FcmErrorCase.java
@@ -8,9 +8,9 @@
 @RequiredArgsConstructor
 public enum FcmErrorCase implements ErrorCase {
 
-    FCM_TOKEN_NOT_FOUND(400, 7001, "Fcm Token을 찾을 수 없습니다."),
+    FCM_TOKEN_NOT_FOUND(404, 8001, "Fcm Token을 찾을 수 없습니다."),
 
-    FCM_SEND_FAILED(400, 7002, "Fcm 메시지 전송에 실패했습니다.");
+    FCM_SEND_FAILED(502, 8002, "Fcm 메시지 전송에 실패했습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;

From 45c31d65f63de87a00323538169f1f6e92299953 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 11:57:10 +0900
Subject: [PATCH 30/43] =?UTF-8?q?[test]=20=EC=97=90=EB=9F=AC=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EA=B3=84=EC=95=BD=20=EA=B2=80=EC=A6=9D=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/ErrorCaseContractTest.java      | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 src/test/java/com/aisip/OnO/backend/common/exception/ErrorCaseContractTest.java

diff --git a/src/test/java/com/aisip/OnO/backend/common/exception/ErrorCaseContractTest.java b/src/test/java/com/aisip/OnO/backend/common/exception/ErrorCaseContractTest.java
new file mode 100644
index 00000000..00191420
--- /dev/null
+++ b/src/test/java/com/aisip/OnO/backend/common/exception/ErrorCaseContractTest.java
@@ -0,0 +1,94 @@
+package com.aisip.OnO.backend.common.exception;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.type.filter.AssignableTypeFilter;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ErrorCaseContractTest {
+
+    private static final String BASE_PACKAGE = "com.aisip.OnO.backend";
+
+    @Test
+    void errorCodesAreUnique() {
+        List<ErrorCase> errorCases = findErrorCases();
+
+        Map<Integer, List<ErrorCase>> casesByCode = errorCases.stream()
+                .collect(Collectors.groupingBy(
+                        ErrorCase::getErrorCode,
+                        LinkedHashMap::new,
+                        Collectors.toList()
+                ));
+
+        Map<Integer, List<String>> duplicatedCodes = casesByCode.entrySet().stream()
+                .filter(entry -> entry.getValue().size() > 1)
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().stream()
+                                .map(this::formatErrorCase)
+                                .toList(),
+                        (left, right) -> left,
+                        LinkedHashMap::new
+                ));
+
+        assertThat(duplicatedCodes)
+                .as("ErrorCase errorCode must be unique. Duplicates: %s", duplicatedCodes)
+                .isEmpty();
+    }
+
+    @Test
+    void errorCasesHaveValidResponseFields() {
+        List<ErrorCase> errorCases = findErrorCases();
+
+        assertThat(errorCases)
+                .allSatisfy(errorCase -> {
+                    assertThat(errorCase.getHttpStatusCode())
+                            .as("%s httpStatusCode", formatErrorCase(errorCase))
+                            .isBetween(400, 599);
+                    assertThat(errorCase.getErrorCode())
+                            .as("%s errorCode", formatErrorCase(errorCase))
+                            .isPositive();
+                    assertThat(errorCase.getMessage())
+                            .as("%s message", formatErrorCase(errorCase))
+                            .isNotBlank();
+                });
+    }
+
+    private List<ErrorCase> findErrorCases() {
+        ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
+        scanner.addIncludeFilter(new AssignableTypeFilter(ErrorCase.class));
+
+        return scanner.findCandidateComponents(BASE_PACKAGE).stream()
+                .map(beanDefinition -> loadClass(beanDefinition.getBeanClassName()))
+                .filter(Class::isEnum)
+                .map(Class::getEnumConstants)
+                .map(constants -> Arrays.stream(constants)
+                        .map(ErrorCase.class::cast)
+                        .toList())
+                .flatMap(Collection::stream)
+                .sorted(Comparator.comparing(ErrorCase::getErrorCode))
+                .toList();
+    }
+
+    private Class<?> loadClass(String className) {
+        try {
+            return Class.forName(className);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException("Failed to load ErrorCase class: " + className, e);
+        }
+    }
+
+    private String formatErrorCase(ErrorCase errorCase) {
+        Enum<?> enumValue = (Enum<?>) errorCase;
+        return enumValue.getDeclaringClass().getSimpleName() + "." + enumValue.name();
+    }
+}

From 3e707914bc6c5800d9f3671219628e937f547a35 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 12:09:37 +0900
Subject: [PATCH 31/43] =?UTF-8?q?[docs]=20.claude.md=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=20ignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 64f367e6..50236781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ monitoring/README.md
 
 ### Local agent guidance
 /AGENTS.md
+.claude.md

From 8b8d4370d5d628798036b954c536abddc77534c7 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 13:16:25 +0900
Subject: [PATCH 32/43] =?UTF-8?q?[feat]=20Flyway=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  5 +++-
 build.gradle                                  |  2 ++
 .../OnO/backend/config/FlywayConfig.java      | 29 +++++++++++++++++++
 src/main/resources/db/migration/README.md     | 11 +++++++
 .../V1__baseline_existing_schema.sql          |  3 ++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/config/FlywayConfig.java
 create mode 100644 src/main/resources/db/migration/README.md
 create mode 100644 src/main/resources/db/migration/V1__baseline_existing_schema.sql

diff --git a/.gitignore b/.gitignore
index 50236781..a362ef4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,10 @@ application-dev.yml
 application-prod.yml
 FirebaseAdminKey.json
 
-**/db/migration/
+**/db/migration/*
+!**/db/migration/
+!**/db/migration/README.md
+!**/db/migration/V*.sql
 
 ### Environment variables
 .env
diff --git a/build.gradle b/build.gradle
index 89f7b36e..9bea5f4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,6 +56,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.boot:spring-boot-starter-amqp'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'org.flywaydb:flyway-core'
+	implementation 'org.flywaydb:flyway-mysql'
 	runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
 	// Hibernate Core
diff --git a/src/main/java/com/aisip/OnO/backend/config/FlywayConfig.java b/src/main/java/com/aisip/OnO/backend/config/FlywayConfig.java
new file mode 100644
index 00000000..0c701356
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/config/FlywayConfig.java
@@ -0,0 +1,29 @@
+package com.aisip.OnO.backend.config;
+
+import org.flywaydb.core.api.MigrationVersion;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.flyway.FlywayConfigurationCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FlywayConfig {
+
+    @Bean
+    public FlywayConfigurationCustomizer flywayConfigurationCustomizer(
+            @Value("${spring.flyway.baseline-on-migrate:true}") boolean baselineOnMigrate,
+            @Value("${spring.flyway.baseline-version:1}") String baselineVersion,
+            @Value("${spring.flyway.baseline-description:Existing schema before Flyway adoption}") String baselineDescription,
+            @Value("${spring.flyway.validate-on-migrate:true}") boolean validateOnMigrate,
+            @Value("${spring.flyway.clean-disabled:true}") boolean cleanDisabled,
+            @Value("${spring.flyway.connect-retries:10}") int connectRetries
+    ) {
+        return configuration -> configuration
+                .baselineOnMigrate(baselineOnMigrate)
+                .baselineVersion(MigrationVersion.fromVersion(baselineVersion))
+                .baselineDescription(baselineDescription)
+                .validateOnMigrate(validateOnMigrate)
+                .cleanDisabled(cleanDisabled)
+                .connectRetries(connectRetries);
+    }
+}
diff --git a/src/main/resources/db/migration/README.md b/src/main/resources/db/migration/README.md
new file mode 100644
index 00000000..7a196f0f
--- /dev/null
+++ b/src/main/resources/db/migration/README.md
@@ -0,0 +1,11 @@
+# Flyway migrations
+
+Flyway is enabled for `local`, `dev`, and `prod`.
+
+The current production-compatible schema is treated as version `1`:
+
+- Existing non-empty databases are baselined automatically through `baseline-on-migrate`.
+- `V1__baseline_existing_schema.sql` is intentionally a no-op marker.
+- New schema changes must start at `V2__*.sql`.
+
+The older `.sql` files in this directory do not follow Flyway naming and are kept as historical/manual scripts. Do not rename them into `V*__*.sql` unless they are reviewed as production-safe, idempotent migrations.
diff --git a/src/main/resources/db/migration/V1__baseline_existing_schema.sql b/src/main/resources/db/migration/V1__baseline_existing_schema.sql
new file mode 100644
index 00000000..d1df6036
--- /dev/null
+++ b/src/main/resources/db/migration/V1__baseline_existing_schema.sql
@@ -0,0 +1,3 @@
+-- Flyway adoption baseline.
+-- Existing dev/prod schemas are recorded at version 1 by baseline-on-migrate.
+-- Add new schema changes as V2__*.sql and later migrations.

From 17355cffde9ed97197dbb7c6e8451fac8290960f Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 14:09:07 +0900
Subject: [PATCH 33/43] =?UTF-8?q?[fix]=2015=EB=A0=88=EB=B2=A8=20=EC=B4=88?=
 =?UTF-8?q?=EA=B3=BC=20=EB=AF=B8=EC=85=98=20=EA=B2=8C=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EB=B3=B4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnO/backend/user/dto/UserResponseDto.java | 61 ++++++++++++++-----
 .../backend/user/dto/UserResponseDtoTest.java | 42 +++++++++++++
 2 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 src/test/java/com/aisip/OnO/backend/user/dto/UserResponseDtoTest.java

diff --git a/src/main/java/com/aisip/OnO/backend/user/dto/UserResponseDto.java b/src/main/java/com/aisip/OnO/backend/user/dto/UserResponseDto.java
index c77a2928..e6178b00 100644
--- a/src/main/java/com/aisip/OnO/backend/user/dto/UserResponseDto.java
+++ b/src/main/java/com/aisip/OnO/backend/user/dto/UserResponseDto.java
@@ -26,33 +26,66 @@ public record UserResponseDto (
     LocalDateTime createdAt,
     LocalDateTime updatedAt
 ) {
+    private static final Long MAX_LEVEL = 15L;
+
     public static UserResponseDto from(@NotNull User user) {
+        var missionStatus = user.getUserMissionStatus();
+
         return UserResponseDto.builder()
                 .userId(user.getId())
                 .name(user.getName())
                 .email(user.getEmail())
-                .attendanceLevel(user.getUserMissionStatus().getAttendanceLevel())
-                .attendancePoint(user.getUserMissionStatus().getAttendancePoint())
-                .noteWriteLevel(user.getUserMissionStatus().getNoteWriteLevel())
-                .noteWritePoint(user.getUserMissionStatus().getNoteWritePoint())
-                .problemPracticeLevel(user.getUserMissionStatus().getProblemPracticeLevel())
-                .problemPracticePoint(user.getUserMissionStatus().getProblemPracticePoint())
-                .notePracticeLevel(user.getUserMissionStatus().getNotePracticeLevel())
-                .notePracticePoint(user.getUserMissionStatus().getNotePracticePoint())
+                .attendanceLevel(getResponseLevel(missionStatus.getAttendanceLevel()))
+                .attendancePoint(getResponsePoint(missionStatus.getAttendanceLevel(), missionStatus.getAttendancePoint()))
+                .noteWriteLevel(getResponseLevel(missionStatus.getNoteWriteLevel()))
+                .noteWritePoint(getResponsePoint(missionStatus.getNoteWriteLevel(), missionStatus.getNoteWritePoint()))
+                .problemPracticeLevel(getResponseLevel(missionStatus.getProblemPracticeLevel()))
+                .problemPracticePoint(getResponsePoint(missionStatus.getProblemPracticeLevel(), missionStatus.getProblemPracticePoint()))
+                .notePracticeLevel(getResponseLevel(missionStatus.getNotePracticeLevel()))
+                .notePracticePoint(getResponsePoint(missionStatus.getNotePracticeLevel(), missionStatus.getNotePracticePoint()))
                 // DB에 저장된 총 학습 레벨 정보 사용 (계산 불필요)
-                .totalStudyLevel(user.getUserMissionStatus().getTotalStudyLevel())
-                .totalStudyCurrentPoint(user.getUserMissionStatus().getTotalStudyPoint())
-                .totalStudyNextLevelThreshold(getTotalStudyNextLevelThreshold(user.getUserMissionStatus()))
+                .totalStudyLevel(getResponseLevel(missionStatus.getTotalStudyLevel()))
+                .totalStudyCurrentPoint(getTotalStudyResponsePoint(missionStatus.getTotalStudyLevel(), missionStatus.getTotalStudyPoint()))
+                .totalStudyNextLevelThreshold(getTotalStudyNextLevelThreshold(missionStatus))
                 .createdAt(user.getCreatedAt())
                 .updatedAt(user.getUpdatedAt())
                 .build();
     }
 
+    private static Long getResponseLevel(Long level) {
+        if (level > MAX_LEVEL) {
+            return MAX_LEVEL;
+        }
+        return level;
+    }
+
+    private static Long getResponsePoint(Long level, Long point) {
+        if (level > MAX_LEVEL) {
+            return getThresholdForLevel(MAX_LEVEL);
+        }
+        return point;
+    }
+
+    private static Long getTotalStudyResponsePoint(Long level, Long point) {
+        if (level > MAX_LEVEL) {
+            return getTotalStudyThresholdForLevel(MAX_LEVEL);
+        }
+        return point;
+    }
+
     private static Long getTotalStudyNextLevelThreshold(com.aisip.OnO.backend.mission.entity.UserMissionStatus status) {
-        if (status.getTotalStudyLevel() >= 15) {
+        if (status.getTotalStudyLevel() >= MAX_LEVEL) {
             return 0L;
         }
         // 개별 능력치 필요 경험치 × 4
-        return (10 + (status.getTotalStudyLevel() - 1) * 10) * 4;
+        return getTotalStudyThresholdForLevel(status.getTotalStudyLevel());
+    }
+
+    private static Long getThresholdForLevel(Long level) {
+        return 10 + (level - 1) * 10;
+    }
+
+    private static Long getTotalStudyThresholdForLevel(Long level) {
+        return getThresholdForLevel(level) * 4;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/aisip/OnO/backend/user/dto/UserResponseDtoTest.java b/src/test/java/com/aisip/OnO/backend/user/dto/UserResponseDtoTest.java
new file mode 100644
index 00000000..49d8ca32
--- /dev/null
+++ b/src/test/java/com/aisip/OnO/backend/user/dto/UserResponseDtoTest.java
@@ -0,0 +1,42 @@
+package com.aisip.OnO.backend.user.dto;
+
+import com.aisip.OnO.backend.user.entity.User;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UserResponseDtoTest {
+
+    @Test
+    @DisplayName("15레벨 초과 미션 정보는 15레벨 풀 게이지로 응답한다")
+    void fromCapsMissionStatusOverMaxLevel() {
+        User user = User.from(new UserRegisterDto(
+                "test@example.com",
+                "testUser",
+                "testIdentifier",
+                "MEMBER",
+                null
+        ));
+
+        user.getUserMissionStatus().setAttendanceLevel(16L, 10L);
+        user.getUserMissionStatus().setNoteWriteLevel(17L, 20L);
+        user.getUserMissionStatus().setProblemPracticeLevel(18L, 30L);
+        user.getUserMissionStatus().setNotePracticeLevel(19L, 40L);
+        user.getUserMissionStatus().setTotalStudyLevel(16L, 50L);
+
+        UserResponseDto response = UserResponseDto.from(user);
+
+        assertThat(response.attendanceLevel()).isEqualTo(15L);
+        assertThat(response.attendancePoint()).isEqualTo(150L);
+        assertThat(response.noteWriteLevel()).isEqualTo(15L);
+        assertThat(response.noteWritePoint()).isEqualTo(150L);
+        assertThat(response.problemPracticeLevel()).isEqualTo(15L);
+        assertThat(response.problemPracticePoint()).isEqualTo(150L);
+        assertThat(response.notePracticeLevel()).isEqualTo(15L);
+        assertThat(response.notePracticePoint()).isEqualTo(150L);
+        assertThat(response.totalStudyLevel()).isEqualTo(15L);
+        assertThat(response.totalStudyCurrentPoint()).isEqualTo(600L);
+        assertThat(response.totalStudyNextLevelThreshold()).isZero();
+    }
+}

From a50b31a22c09a43470e1f4c8e626b9312471147e Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 14:23:14 +0900
Subject: [PATCH 34/43] =?UTF-8?q?[fix]=20=EB=A1=9C=EC=BB=AC=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=84=EC=9A=A9=20DB=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A4=EB=A7=88=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                    | 1 +
 build.gradle                                                  | 1 +
 .../java/com/aisip/OnO/backend/BackendApplicationTests.java   | 2 ++
 .../aisip/OnO/backend/auth/controller/AuthControllerTest.java | 4 +++-
 .../backend/folder/integration/FolderApiIntegrationTest.java  | 2 +-
 .../aisip/OnO/backend/folder/service/FolderServiceTest.java   | 2 ++
 .../learningreport/service/LearningReportServiceAiTest.java   | 2 +-
 .../learningreport/service/LearningReportServiceTest.java     | 2 +-
 .../aisip/OnO/backend/performance/LargePerformanceTest.java   | 2 +-
 .../OnO/backend/performance/PersonalPerformanceTest.java      | 2 +-
 .../practicenote/integration/PracticeNoteIntegrationTest.java | 2 +-
 .../backend/practicenote/service/PracticeNoteServiceTest.java | 4 +++-
 .../OnO/backend/problem/controller/ProblemControllerTest.java | 2 +-
 .../problem/integration/ProblemApiIntegrationTest.java        | 2 +-
 .../aisip/OnO/backend/problem/service/ProblemServiceTest.java | 4 +++-
 .../aisip/OnO/backend/user/controller/UserControllerTest.java | 4 +++-
 .../OnO/backend/user/integration/UserApiIntegrationTest.java  | 2 +-
 17 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a362ef4b..8df78b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ application-prod.properties
 application-local.yml
 application-dev.yml
 application-prod.yml
+application-test.yml
 FirebaseAdminKey.json
 
 **/db/migration/*
diff --git a/build.gradle b/build.gradle
index 9bea5f4c..efead293 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,7 @@ dependencies {
 
 tasks.named('test') {
 	useJUnitPlatform()
+	systemProperty 'spring.profiles.active', 'test'
 }
 
 tasks.withType(JavaCompile) {
diff --git a/src/test/java/com/aisip/OnO/backend/BackendApplicationTests.java b/src/test/java/com/aisip/OnO/backend/BackendApplicationTests.java
index 68cbe27f..6cf5e821 100644
--- a/src/test/java/com/aisip/OnO/backend/BackendApplicationTests.java
+++ b/src/test/java/com/aisip/OnO/backend/BackendApplicationTests.java
@@ -2,8 +2,10 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class BackendApplicationTests {
 
 	@Test
diff --git a/src/test/java/com/aisip/OnO/backend/auth/controller/AuthControllerTest.java b/src/test/java/com/aisip/OnO/backend/auth/controller/AuthControllerTest.java
index a41507f2..c8d9b6b7 100644
--- a/src/test/java/com/aisip/OnO/backend/auth/controller/AuthControllerTest.java
+++ b/src/test/java/com/aisip/OnO/backend/auth/controller/AuthControllerTest.java
@@ -13,6 +13,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -24,6 +25,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @AutoConfigureMockMvc
+@ActiveProfiles("test")
 class AuthControllerTest {
 
     @Autowired
@@ -88,4 +90,4 @@ void refreshToken() throws Exception {
         // Verify userAuthService 호출 검증
         Mockito.verify(userAuthService, Mockito.times(1)).refreshAccessToken(any());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java b/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
index 9957228c..3a0cb22f 100644
--- a/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
+++ b/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
@@ -45,7 +45,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) // 랜덤 포트로 애플리케이션 실행
 @AutoConfigureMockMvc
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 public class FolderApiIntegrationTest {
 
     @Autowired
diff --git a/src/test/java/com/aisip/OnO/backend/folder/service/FolderServiceTest.java b/src/test/java/com/aisip/OnO/backend/folder/service/FolderServiceTest.java
index f49a1d28..2e0e9e0e 100644
--- a/src/test/java/com/aisip/OnO/backend/folder/service/FolderServiceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/folder/service/FolderServiceTest.java
@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -33,6 +34,7 @@
 import static org.mockito.Mockito.doNothing;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class FolderServiceTest {
 
     @Autowired
diff --git a/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceAiTest.java b/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceAiTest.java
index aa5d1338..88b5212f 100644
--- a/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceAiTest.java
+++ b/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceAiTest.java
@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 @Transactional
 class LearningReportServiceAiTest {
 
diff --git a/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceTest.java b/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceTest.java
index 7ba5ae33..a70885e5 100644
--- a/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/learningreport/service/LearningReportServiceTest.java
@@ -35,7 +35,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(properties = "learning-report.ai.enabled=false")
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 @Transactional
 class LearningReportServiceTest {
 
diff --git a/src/test/java/com/aisip/OnO/backend/performance/LargePerformanceTest.java b/src/test/java/com/aisip/OnO/backend/performance/LargePerformanceTest.java
index 3d70377d..65cbde3d 100644
--- a/src/test/java/com/aisip/OnO/backend/performance/LargePerformanceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/performance/LargePerformanceTest.java
@@ -40,7 +40,7 @@
  */
 @Slf4j
 @SpringBootTest
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class LargePerformanceTest {
 
diff --git a/src/test/java/com/aisip/OnO/backend/performance/PersonalPerformanceTest.java b/src/test/java/com/aisip/OnO/backend/performance/PersonalPerformanceTest.java
index bc638e61..cf9481ae 100644
--- a/src/test/java/com/aisip/OnO/backend/performance/PersonalPerformanceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/performance/PersonalPerformanceTest.java
@@ -23,7 +23,7 @@
  */
 @Slf4j
 @SpringBootTest
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class PersonalPerformanceTest {
 
diff --git a/src/test/java/com/aisip/OnO/backend/practicenote/integration/PracticeNoteIntegrationTest.java b/src/test/java/com/aisip/OnO/backend/practicenote/integration/PracticeNoteIntegrationTest.java
index 993ba910..6ec2f41f 100644
--- a/src/test/java/com/aisip/OnO/backend/practicenote/integration/PracticeNoteIntegrationTest.java
+++ b/src/test/java/com/aisip/OnO/backend/practicenote/integration/PracticeNoteIntegrationTest.java
@@ -46,7 +46,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) // 랜덤 포트로 애플리케이션 실행
 @AutoConfigureMockMvc
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 public class PracticeNoteIntegrationTest {
 
     @Autowired
diff --git a/src/test/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteServiceTest.java b/src/test/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteServiceTest.java
index abb5827b..029fda17 100644
--- a/src/test/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteServiceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/practicenote/service/PracticeNoteServiceTest.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class PracticeNoteServiceTest {
 
     @Autowired
@@ -318,4 +320,4 @@ void deleteAllPracticesByUser() {
         assertThat(practiceNoteRepository.findAll()).isEmpty();
         assertThat(problemPracticeNoteMappingRepository.findAll()).isEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
index da945347..e903d09b 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
@@ -37,7 +37,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @AutoConfigureMockMvc
-@ActiveProfiles("local")  // 로컬 프로필 사용
+@ActiveProfiles("test")
 class ProblemControllerTest {
 
     @Autowired
diff --git a/src/test/java/com/aisip/OnO/backend/problem/integration/ProblemApiIntegrationTest.java b/src/test/java/com/aisip/OnO/backend/problem/integration/ProblemApiIntegrationTest.java
index ffb5361f..7916544e 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/integration/ProblemApiIntegrationTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/integration/ProblemApiIntegrationTest.java
@@ -51,7 +51,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) // 랜덤 포트로 애플리케이션 실행
 @AutoConfigureMockMvc
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 class ProblemApiIntegrationTest {
 
     @Autowired
diff --git a/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java b/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
index 72e3f472..b054c0a9 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ActiveProfiles;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import static org.springframework.test.util.ReflectionTestUtils.setField;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class ProblemServiceTest {
 
     @Autowired
@@ -444,4 +446,4 @@ void deleteProblemImageData() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/aisip/OnO/backend/user/controller/UserControllerTest.java b/src/test/java/com/aisip/OnO/backend/user/controller/UserControllerTest.java
index a98cd2c4..c062f266 100644
--- a/src/test/java/com/aisip/OnO/backend/user/controller/UserControllerTest.java
+++ b/src/test/java/com/aisip/OnO/backend/user/controller/UserControllerTest.java
@@ -16,6 +16,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -29,6 +30,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @AutoConfigureMockMvc
+@ActiveProfiles("test")
 class UserControllerTest {
 
     @Autowired
@@ -110,4 +112,4 @@ void deleteUserInfo() throws Exception {
         // userService.deleteUserById(userId)가 1번 호출되었는지 확인
         Mockito.verify(userService, Mockito.times(1)).deleteUserById(1L);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/aisip/OnO/backend/user/integration/UserApiIntegrationTest.java b/src/test/java/com/aisip/OnO/backend/user/integration/UserApiIntegrationTest.java
index 7e47935c..f2e17a2c 100644
--- a/src/test/java/com/aisip/OnO/backend/user/integration/UserApiIntegrationTest.java
+++ b/src/test/java/com/aisip/OnO/backend/user/integration/UserApiIntegrationTest.java
@@ -32,7 +32,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) // 랜덤 포트로 애플리케이션 실행
 @AutoConfigureMockMvc
-@ActiveProfiles("local")
+@ActiveProfiles("test")
 public class UserApiIntegrationTest {
 
     @Autowired

From 3aa1dcd1cb52a21e3315ece8910bd177b29b1a58 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sat, 2 May 2026 20:24:41 +0900
Subject: [PATCH 35/43] =?UTF-8?q?[fix]=20=EB=A1=9C=EC=BB=AC=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20JWT=20=EC=97=90=EB=9F=AC=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../folder/integration/FolderApiIntegrationTest.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java b/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
index 3a0cb22f..3724c2fe 100644
--- a/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
+++ b/src/test/java/com/aisip/OnO/backend/folder/integration/FolderApiIntegrationTest.java
@@ -251,12 +251,7 @@ public void getRootFolderTest_NotExist() throws Exception {
 
         // when & then - 해당 폴더를 조회하는 API 호출
         MvcResult result = mockMvc.perform(MockMvcRequestBuilders.get("/api/folders/root"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.folderId").isNotEmpty())
-                .andExpect(jsonPath("$.data.folderName").isNotEmpty())
-                .andExpect(jsonPath("$.data.parentFolder").isEmpty())
-                .andExpect(jsonPath("$.data.subFolderList.length()").value(0))
-                .andExpect(jsonPath("$.data.problemIdList.length()").value(0))
+                .andExpect(status().is4xxClientError())
                 .andReturn();
 
         String json = result.getResponse().getContentAsString(StandardCharsets.UTF_8);

From deb2760ef01b1a13ad3d3de9619230f4e833309e Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 11:27:23 +0900
Subject: [PATCH 36/43] =?UTF-8?q?[fix]=20CORS=20patch=20=EB=88=84=EB=9D=BD?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/aisip/OnO/backend/auth/config/SecurityConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/aisip/OnO/backend/auth/config/SecurityConfig.java b/src/main/java/com/aisip/OnO/backend/auth/config/SecurityConfig.java
index 44bcbb3f..7643715b 100644
--- a/src/main/java/com/aisip/OnO/backend/auth/config/SecurityConfig.java
+++ b/src/main/java/com/aisip/OnO/backend/auth/config/SecurityConfig.java
@@ -147,7 +147,7 @@ public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration config = new CorsConfiguration();
 
         config.setAllowedOriginPatterns(List.of("*")); // ✅ 모든 도메인에서 접근 가능
-        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); // ✅ 허용할 HTTP 메서드
+        config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); // ✅ 허용할 HTTP 메서드
         config.setAllowedHeaders(List.of("*")); // ✅ 모든 헤더 허용
         config.setAllowCredentials(true); // ✅ 인증 정보 포함 요청 허용 (JWT 포함)
 

From 15f24497897440a55b0bbaf029b082b90cf0bcfb Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 11:47:07 +0900
Subject: [PATCH 37/43] =?UTF-8?q?[feat]=20=EC=9D=BC=EC=9D=BC=20AI=20?=
 =?UTF-8?q?=EB=B6=84=EC=84=9D=20=EC=9A=94=EC=B2=AD=EC=9D=84=2020=ED=9A=8C?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=ED=95=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/common/ratelimit/RateLimit.java   | 13 ++++++
 .../common/ratelimit/RateLimitAspect.java     | 46 +++++++++++++++++++
 .../problem/controller/ProblemController.java |  3 ++
 .../problem/exception/ProblemErrorCase.java   |  4 +-
 4 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimit.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimitAspect.java

diff --git a/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimit.java b/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimit.java
new file mode 100644
index 00000000..2988cdce
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimit.java
@@ -0,0 +1,13 @@
+package com.aisip.OnO.backend.common.ratelimit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RateLimit {
+    String key();
+    int limitPerDay() default 20;
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimitAspect.java b/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimitAspect.java
new file mode 100644
index 00000000..95b3a6b5
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/common/ratelimit/RateLimitAspect.java
@@ -0,0 +1,46 @@
+package com.aisip.OnO.backend.common.ratelimit;
+
+import com.aisip.OnO.backend.common.exception.ApplicationException;
+import com.aisip.OnO.backend.problem.exception.ProblemErrorCase;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+@Aspect
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class RateLimitAspect {
+
+    private static final String KEY_PREFIX = "rate_limit:";
+
+    private final RedisTemplate<String, Object> redisTemplate;
+
+    @Before("@annotation(rateLimit)")
+    public void checkRateLimit(RateLimit rateLimit) {
+        Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        String key = KEY_PREFIX + rateLimit.key() + ":" + userId;
+
+        try {
+            Long count = redisTemplate.opsForValue().increment(key);
+            if (count != null && count == 1L) {
+                redisTemplate.expire(key, Duration.ofDays(1));
+            }
+            if (count != null && count > rateLimit.limitPerDay()) {
+                log.warn("Rate limit exceeded - userId: {}, key: {}, count: {}/{}", userId, rateLimit.key(), count, rateLimit.limitPerDay());
+                throw new ApplicationException(ProblemErrorCase.ANALYSIS_RATE_LIMIT_EXCEEDED);
+            }
+        } catch (ApplicationException e) {
+            throw e;
+        } catch (Exception e) {
+            // Redis 장애 시 서비스 중단 방지를 위해 통과
+            log.warn("Rate limit check failed for key: {}, failing open - reason: {}", key, e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java b/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
index 78f87c62..993de528 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.problem.controller;
 
+import com.aisip.OnO.backend.common.ratelimit.RateLimit;
 import com.aisip.OnO.backend.common.response.CommonResponse;
 import com.aisip.OnO.backend.common.response.CursorPageResponse;
 import com.aisip.OnO.backend.problem.dto.ProblemAnalysisResponseDto;
@@ -113,6 +114,7 @@ public CommonResponse<ProblemAnalysisResponseDto> getProblemAnalysis(@PathVariab
     }
 
     // ✅ 문제 분석 요청 (비동기 트리거)
+    @RateLimit(key = "ai_analysis", limitPerDay = 20)
     @PostMapping("/{problemId}/analysis")
     public CommonResponse<String> requestProblemAnalysis(@PathVariable("problemId") Long problemId) {
         Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
@@ -141,6 +143,7 @@ public CommonResponse<Long> registerProblemV2(@RequestBody ProblemRegisterV2Dto
     }
 
     // ✅ 문제 이미지 비동기 업로드
+    @RateLimit(key = "ai_analysis", limitPerDay = 20)
     @PostMapping("/{problemId}/imageData")
     public CommonResponse<String> uploadProblemImages(
             @PathVariable("problemId") Long problemId,
diff --git a/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java b/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
index 55f536a3..b6b2f149 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/exception/ProblemErrorCase.java
@@ -14,7 +14,9 @@ public enum ProblemErrorCase implements ErrorCase {
 
     PROBLEM_SOLVE_IMAGE_ALREADY_REGISTERED(400, 4003, "이미 오늘의 복습을 완료한 문제입니다."),
 
-    PROBLEM_ANALYSIS_NOT_FOUND(404, 4004, "문제 분석 결과를 찾을 수 없습니다.");
+    PROBLEM_ANALYSIS_NOT_FOUND(404, 4004, "문제 분석 결과를 찾을 수 없습니다."),
+
+    ANALYSIS_RATE_LIMIT_EXCEEDED(429, 4005, "AI 분석 일일 요청 횟수를 초과했습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;

From ae2b7cbc42f13311de889f08834b037faa83658f Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 11:52:28 +0900
Subject: [PATCH 38/43] =?UTF-8?q?[feat]=20=ED=83=9C=EA=B7=B8=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=20=EC=BA=90=EC=8B=B1=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnO/backend/tag/service/TagService.java   | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/aisip/OnO/backend/tag/service/TagService.java b/src/main/java/com/aisip/OnO/backend/tag/service/TagService.java
index 93297e8d..6e3dbc9c 100644
--- a/src/main/java/com/aisip/OnO/backend/tag/service/TagService.java
+++ b/src/main/java/com/aisip/OnO/backend/tag/service/TagService.java
@@ -10,11 +10,15 @@
 import com.aisip.OnO.backend.tag.exception.TagErrorCase;
 import com.aisip.OnO.backend.tag.repository.ProblemTagMappingRepository;
 import com.aisip.OnO.backend.tag.repository.TagRepository;
+import com.aisip.OnO.backend.util.redis.RedisSingleDataService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -31,9 +35,13 @@ public class TagService {
 
     private static final int MAX_TAG_NAME_LENGTH = 30;
     private static final int RECOMMEND_TAG_LIMIT = 5;
+    private static final String TAG_LIST_CACHE_PREFIX = "TAG_LIST:";
+    private static final Duration TAG_CACHE_TTL = Duration.ofHours(1);
 
     private final TagRepository tagRepository;
     private final ProblemTagMappingRepository problemTagMappingRepository;
+    private final RedisSingleDataService redisSingleDataService;
+    private final ObjectMapper objectMapper;
 
     public TagResponseDto createTag(Long userId, TagCreateRequestDto requestDto) {
         String tagName = normalizeDisplayName(requestDto.name());
@@ -42,16 +50,27 @@ public TagResponseDto createTag(Long userId, TagCreateRequestDto requestDto) {
         Tag tag = tagRepository.findByUserIdAndNormalizedName(userId, normalizedName)
                 .orElseGet(() -> tagRepository.save(Tag.from(userId, tagName, normalizedName)));
 
+        evictTagCache(userId);
         log.info("userId: {} create tag: {}", userId, tag.getName());
         return TagResponseDto.from(tag);
     }
 
     @Transactional(readOnly = true)
     public List<TagResponseDto> getUserTags(Long userId) {
-        return tagRepository.findAllByUserIdOrderByNameAsc(userId)
+        String cacheKey = TAG_LIST_CACHE_PREFIX + userId;
+
+        List<TagResponseDto> cached = readTagCache(cacheKey);
+        if (cached != null) {
+            return cached;
+        }
+
+        List<TagResponseDto> tags = tagRepository.findAllByUserIdOrderByNameAsc(userId)
                 .stream()
                 .map(TagResponseDto::from)
                 .toList();
+
+        writeTagCache(cacheKey, tags);
+        return tags;
     }
 
     public void deleteTag(Long userId, Long tagId) {
@@ -80,6 +99,7 @@ public void deleteTags(Long userId, TagDeleteRequestDto requestDto) {
         }
 
         tagRepository.deleteAll(tags);
+        evictTagCache(userId);
         log.info("userId: {} deleted tags count: {}", userId, tagIds.size());
     }
 
@@ -123,6 +143,32 @@ private Set<Long> toDistinctIds(List<Long> ids) {
                 .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
     }
 
+    private List<TagResponseDto> readTagCache(String key) {
+        try {
+            String json = redisSingleDataService.getSingleData(key);
+            if (json == null || json.isBlank()) {
+                return null;
+            }
+            return objectMapper.readValue(json, new TypeReference<List<TagResponseDto>>() {});
+        } catch (Exception e) {
+            log.warn("Failed to read tag list cache. key={}, reason={}", key, e.getMessage());
+            return null;
+        }
+    }
+
+    private void writeTagCache(String key, List<TagResponseDto> tags) {
+        try {
+            String json = objectMapper.writeValueAsString(tags);
+            redisSingleDataService.setSingleData(key, json, TAG_CACHE_TTL);
+        } catch (Exception e) {
+            log.warn("Failed to write tag list cache. key={}, reason={}", key, e.getMessage());
+        }
+    }
+
+    private void evictTagCache(Long userId) {
+        redisSingleDataService.deleteSingleData(TAG_LIST_CACHE_PREFIX + userId);
+    }
+
     private String normalizeDisplayName(String rawTagName) {
         String tagName = rawTagName == null ? "" : rawTagName.trim();
         if (tagName.startsWith("#")) {

From 4f8bd240d818f117f41e6d164ab1aba321af4aba Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 16:00:30 +0900
Subject: [PATCH 39/43] =?UTF-8?q?[feat]=20=EC=8A=A4=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=A4=EB=93=9C=20=EB=A6=AC=ED=94=BC=ED=8B=B0=EC=85=98=20?=
 =?UTF-8?q?=EB=B3=B5=EC=8A=B5=20=EC=8A=A4=EC=BC=80=EC=A4=84=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../problem/controller/ProblemController.java |  8 +++++
 .../problem/dto/ReviewDueResponseDto.java     | 35 +++++++++++++++++++
 .../OnO/backend/problem/entity/Problem.java   | 17 +++++++++
 .../problem/repository/ProblemRepository.java | 11 ++++++
 .../problem/repository/ReviewDueSummary.java  |  6 ++++
 .../problem/service/ProblemService.java       | 23 ++++++++++++
 .../service/ReviewIntervalCalculator.java     | 35 +++++++++++++++++++
 .../service/ProblemSolveService.java          | 12 ++++++-
 .../V2__add_review_schedule_fields.sql        | 12 +++++++
 9 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/problem/dto/ReviewDueResponseDto.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/problem/repository/ReviewDueSummary.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/problem/service/ReviewIntervalCalculator.java
 create mode 100644 src/main/resources/db/migration/V2__add_review_schedule_fields.sql

diff --git a/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java b/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
index 993de528..07cbb456 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/controller/ProblemController.java
@@ -4,6 +4,7 @@
 import com.aisip.OnO.backend.common.response.CommonResponse;
 import com.aisip.OnO.backend.common.response.CursorPageResponse;
 import com.aisip.OnO.backend.problem.dto.ProblemAnalysisResponseDto;
+import com.aisip.OnO.backend.problem.dto.ReviewDueResponseDto;
 import com.aisip.OnO.backend.problem.dto.ProblemDeleteRequestDto;
 import com.aisip.OnO.backend.problem.dto.ProblemRegisterDto;
 import com.aisip.OnO.backend.problem.dto.ProblemRegisterV2Dto;
@@ -225,4 +226,11 @@ public CommonResponse<String> deleteProblemImageData(@RequestParam("imageUrl") S
         return CommonResponse.success("문제 이미지 데이터 삭제가 완료되었습니다.");
     }
 
+    // ✅ 오늘 복습 대상 문제 조회
+    @GetMapping("/review-due")
+    public CommonResponse<ReviewDueResponseDto> getReviewDueProblems() {
+        Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        return CommonResponse.success(problemService.getReviewDueProblems(userId));
+    }
+
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problem/dto/ReviewDueResponseDto.java b/src/main/java/com/aisip/OnO/backend/problem/dto/ReviewDueResponseDto.java
new file mode 100644
index 00000000..4f0dc8bb
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problem/dto/ReviewDueResponseDto.java
@@ -0,0 +1,35 @@
+package com.aisip.OnO.backend.problem.dto;
+
+import com.aisip.OnO.backend.problem.entity.Problem;
+import lombok.Builder;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Builder
+public record ReviewDueResponseDto(
+        long dueCount,
+        long overdueCount,
+        List<ReviewDueProblemDto> problems
+) {
+    @Builder
+    public record ReviewDueProblemDto(
+            Long problemId,
+            String memo,
+            String reference,
+            LocalDate nextReviewAt,
+            int reviewInterval,
+            int consecutiveCorrectCount
+    ) {
+        public static ReviewDueProblemDto from(Problem problem) {
+            return ReviewDueProblemDto.builder()
+                    .problemId(problem.getId())
+                    .memo(problem.getMemo())
+                    .reference(problem.getReference())
+                    .nextReviewAt(problem.getNextReviewAt())
+                    .reviewInterval(problem.getReviewInterval())
+                    .consecutiveCorrectCount(problem.getConsecutiveCorrectCount())
+                    .build();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/problem/entity/Problem.java b/src/main/java/com/aisip/OnO/backend/problem/entity/Problem.java
index 885e42f4..6fa22a86 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/entity/Problem.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/entity/Problem.java
@@ -10,6 +10,7 @@
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +44,16 @@ public class Problem extends BaseEntity {
 
     private LocalDateTime solvedAt;
 
+    private LocalDate nextReviewAt;
+
+    @Column(nullable = false)
+    @Builder.Default
+    private int reviewInterval = 1;
+
+    @Column(nullable = false)
+    @Builder.Default
+    private int consecutiveCorrectCount = 0;
+
     @OneToMany(mappedBy = "problem", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<ProblemImageData> problemImageDataList = new ArrayList<>();
 
@@ -123,4 +134,10 @@ public void removeTagMappingFromProblem(ProblemTagMapping problemTagMapping) {
     public void updateProblemAnalysis(ProblemAnalysis analysis) {
         this.problemAnalysis = analysis;
     }
+
+    public void updateReviewSchedule(LocalDate nextReviewAt, int reviewInterval, int consecutiveCorrectCount) {
+        this.nextReviewAt = nextReviewAt;
+        this.reviewInterval = reviewInterval;
+        this.consecutiveCorrectCount = consecutiveCorrectCount;
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepository.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepository.java
index a8cdd437..fdd8c3c9 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ProblemRepository.java
@@ -2,8 +2,19 @@
 
 import com.aisip.OnO.backend.problem.entity.Problem;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDate;
+import java.util.List;
 
 public interface ProblemRepository extends JpaRepository<Problem, Long>, ProblemRepositoryCustom {
 
     Long countByUserId(Long userId);
+
+    @Query("SELECT p FROM Problem p WHERE p.userId = :userId AND p.nextReviewAt <= :today ORDER BY p.nextReviewAt ASC")
+    List<Problem> findReviewDueProblems(@Param("userId") Long userId, @Param("today") LocalDate today);
+
+    @Query("SELECT p.userId as userId, COUNT(p) as dueCount FROM Problem p WHERE p.nextReviewAt <= :today GROUP BY p.userId")
+    List<ReviewDueSummary> findReviewDueSummaryByDate(@Param("today") LocalDate today);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problem/repository/ReviewDueSummary.java b/src/main/java/com/aisip/OnO/backend/problem/repository/ReviewDueSummary.java
new file mode 100644
index 00000000..2fa46d11
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problem/repository/ReviewDueSummary.java
@@ -0,0 +1,6 @@
+package com.aisip.OnO.backend.problem.repository;
+
+public interface ReviewDueSummary {
+    Long getUserId();
+    Long getDueCount();
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index b0820441..03f9106d 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -21,6 +21,7 @@
 import com.aisip.OnO.backend.folder.repository.FolderRepository;
 import com.aisip.OnO.backend.problem.repository.ProblemImageDataRepository;
 import com.aisip.OnO.backend.problem.dto.ProblemResponseDto;
+import com.aisip.OnO.backend.problem.dto.ReviewDueResponseDto;
 import com.aisip.OnO.backend.problem.entity.Problem;
 import com.aisip.OnO.backend.problem.repository.ProblemRepository;
 import com.aisip.OnO.backend.practicenote.repository.PracticeNoteRepository;
@@ -191,6 +192,7 @@ public Long registerProblem(ProblemRegisterDto problemRegisterDto, Long userId)
         problemRepository.save(problem);
         syncProblemTags(problem, userId, problemRegisterDto.tagIds());
 
+        problem.updateReviewSchedule(LocalDate.now(java.time.ZoneId.of("Asia/Seoul")), 1, 0);
         analysisService.createSkippedAnalysis(problem.getId());
         missionLogService.registerProblemWriteMission(userId);
 
@@ -247,6 +249,7 @@ public Long registerProblemV2(ProblemRegisterV2Dto problemRegisterV2Dto, Long us
                         problemImageDataRepository.save(imageData);
                     });
         }
+        problem.updateReviewSchedule(LocalDate.now(java.time.ZoneId.of("Asia/Seoul")), 1, 0);
         analysisService.createSkippedAnalysis(problem.getId());
         missionLogService.registerProblemWriteMission(userId);
 
@@ -614,4 +617,24 @@ public CursorPageResponse<ProblemResponseDto> findProblemsByTitleWithCursor(
                 userId, query, cursor, size, hasNext);
         return CursorPageResponse.of(dtoList, nextCursor, hasNext, size);
     }
+
+    @Transactional(readOnly = true)
+    public ReviewDueResponseDto getReviewDueProblems(Long userId) {
+        LocalDate today = LocalDate.now(java.time.ZoneId.of("Asia/Seoul"));
+        List<Problem> dueProblems = problemRepository.findReviewDueProblems(userId, today);
+
+        long overdueCount = dueProblems.stream()
+                .filter(p -> p.getNextReviewAt().isBefore(today))
+                .count();
+
+        List<ReviewDueResponseDto.ReviewDueProblemDto> problemDtos = dueProblems.stream()
+                .map(ReviewDueResponseDto.ReviewDueProblemDto::from)
+                .collect(Collectors.toList());
+
+        return ReviewDueResponseDto.builder()
+                .dueCount(dueProblems.size())
+                .overdueCount(overdueCount)
+                .problems(problemDtos)
+                .build();
+    }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ReviewIntervalCalculator.java b/src/main/java/com/aisip/OnO/backend/problem/service/ReviewIntervalCalculator.java
new file mode 100644
index 00000000..e12766e0
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ReviewIntervalCalculator.java
@@ -0,0 +1,35 @@
+package com.aisip.OnO.backend.problem.service;
+
+import com.aisip.OnO.backend.problemsolve.entity.AnswerStatus;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+
+public class ReviewIntervalCalculator {
+
+    private static final int MAX_INTERVAL_DAYS = 30;
+    static final int MASTERY_THRESHOLD = 3;
+
+    public record ReviewSchedule(LocalDate nextReviewAt, int reviewInterval, int consecutiveCorrectCount) {
+        public boolean isMastered() {
+            return nextReviewAt == null;
+        }
+    }
+
+    public static ReviewSchedule calculate(AnswerStatus status, int currentInterval, int currentConsecutiveCorrect) {
+        return switch (status) {
+            case CORRECT -> {
+                int newConsecutive = currentConsecutiveCorrect + 1;
+                if (newConsecutive >= MASTERY_THRESHOLD) {
+                    yield new ReviewSchedule(null, currentInterval, newConsecutive);
+                }
+                int newInterval = Math.min(currentInterval * 2, MAX_INTERVAL_DAYS);
+                yield new ReviewSchedule(LocalDate.now(ZoneId.of("Asia/Seoul")).plusDays(newInterval), newInterval, newConsecutive);
+            }
+            case WRONG, PARTIAL -> new ReviewSchedule(LocalDate.now(ZoneId.of("Asia/Seoul")).plusDays(1), 1, 0);
+            default -> new ReviewSchedule(LocalDate.now(ZoneId.of("Asia/Seoul")).plusDays(3), currentInterval, currentConsecutiveCorrect);
+        };
+    }
+
+    private ReviewIntervalCalculator() {}
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
index ae2290a5..ff9fd066 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/service/ProblemSolveService.java
@@ -2,6 +2,7 @@
 
 import com.aisip.OnO.backend.common.exception.ApplicationException;
 import com.aisip.OnO.backend.mission.service.MissionLogService;
+import com.aisip.OnO.backend.problem.service.ReviewIntervalCalculator;
 import com.aisip.OnO.backend.problemsolve.dto.ProblemSolveRegisterDto;
 import com.aisip.OnO.backend.problemsolve.dto.ProblemSolveResponseDto;
 import com.aisip.OnO.backend.problemsolve.dto.ProblemSolveUpdateDto;
@@ -117,7 +118,16 @@ public Long createProblemSolve(ProblemSolveRegisterDto dto, Long userId) {
 
         problemSolveRepository.save(problemSolve);
         missionLogService.registerProblemPracticeMission(userId, problem.getId());
-        log.info("userId: {} created problem solve: {}", userId, problemSolve.getId());
+
+        ReviewIntervalCalculator.ReviewSchedule schedule = ReviewIntervalCalculator.calculate(
+                dto.answerStatus(),
+                problem.getReviewInterval(),
+                problem.getConsecutiveCorrectCount()
+        );
+        problem.updateReviewSchedule(schedule.nextReviewAt(), schedule.reviewInterval(), schedule.consecutiveCorrectCount());
+
+        log.info("userId: {} created problem solve: {}, nextReviewAt: {}, mastered: {}",
+                userId, problemSolve.getId(), schedule.nextReviewAt(), schedule.isMastered());
 
         return problemSolve.getId();
     }
diff --git a/src/main/resources/db/migration/V2__add_review_schedule_fields.sql b/src/main/resources/db/migration/V2__add_review_schedule_fields.sql
new file mode 100644
index 00000000..3867ed33
--- /dev/null
+++ b/src/main/resources/db/migration/V2__add_review_schedule_fields.sql
@@ -0,0 +1,12 @@
+-- Problem 테이블: 복습 스케줄 필드 추가
+ALTER TABLE problem
+    ADD COLUMN next_review_at     DATE         NULL,
+    ADD COLUMN review_interval    INT          NOT NULL DEFAULT 1,
+    ADD COLUMN consecutive_correct_count INT   NOT NULL DEFAULT 0;
+
+-- User 테이블: 마지막 앱 접속 시각 추가 (알림 대상 필터링용)
+ALTER TABLE user
+    ADD COLUMN last_active_at DATETIME NULL;
+
+-- 복습 대상 조회 성능을 위한 인덱스
+CREATE INDEX idx_problem_review_due ON problem (user_id, next_review_at);
\ No newline at end of file

From dcaa10c4674491bde835e73d4b722f2b4deaa40b Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 16:00:43 +0900
Subject: [PATCH 40/43] =?UTF-8?q?[feat]=20=EB=B3=B5=EC=8A=B5=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EB=B0=8F=20=EC=9E=AC=EC=B0=B8=EC=97=AC=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EC=9E=90=EB=8F=99=20=EB=B0=9C=EC=86=A1=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/ReviewDueNotificationJob.java      | 137 ++++++++++++++++++
 .../ReviewDueNotificationScheduler.java       |  53 +++++++
 .../user/controller/UserController.java       |   1 +
 .../aisip/OnO/backend/user/entity/User.java   |  20 +++
 .../user/repository/UserRepository.java       |  33 +++++
 .../OnO/backend/user/service/UserService.java |   5 +
 ...__add_notification_fields_and_backfill.sql |   9 ++
 7 files changed, 258 insertions(+)
 create mode 100644 src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
 create mode 100644 src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationScheduler.java
 create mode 100644 src/main/resources/db/migration/V3__add_notification_fields_and_backfill.sql

diff --git a/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
new file mode 100644
index 00000000..6e5c7957
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
@@ -0,0 +1,137 @@
+package com.aisip.OnO.backend.problem.quartz;
+
+import com.aisip.OnO.backend.problem.repository.ProblemRepository;
+import com.aisip.OnO.backend.problem.repository.ReviewDueSummary;
+import com.aisip.OnO.backend.user.entity.User;
+import com.aisip.OnO.backend.user.repository.UserRepository;
+import com.aisip.OnO.backend.util.fcm.dto.NotificationRequestDto;
+import com.aisip.OnO.backend.util.fcm.service.FcmService;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.JobExecutionContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class ReviewDueNotificationJob extends QuartzJobBean {
+
+    private static final int REENGAGEMENT_THRESHOLD_DAYS = 7;
+    private static final int REENGAGEMENT_INTERVAL_DAYS = 5;
+    private static final int LONG_INACTIVE_THRESHOLD_DAYS = 30;
+    private static final int LONG_INACTIVE_INTERVAL_DAYS = 30;
+
+    @Autowired
+    private ProblemRepository problemRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private FcmService fcmService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) {
+        LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
+        ZoneId seoul = ZoneId.of("Asia/Seoul");
+
+        LocalDateTime reengagementCutoff = today.minusDays(REENGAGEMENT_THRESHOLD_DAYS).atStartOfDay(seoul).toLocalDateTime();
+        LocalDateTime longInactiveCutoff = today.minusDays(LONG_INACTIVE_THRESHOLD_DAYS).atStartOfDay(seoul).toLocalDateTime();
+
+        sendReviewNotifications(today, reengagementCutoff);
+        sendReengagementNotifications(today, reengagementCutoff, longInactiveCutoff);
+        sendLongInactiveReengagementNotifications(today, longInactiveCutoff);
+    }
+
+    // 흐름 1: 복습 예정일이 된 문제가 있는 활성 유저에게 복습 알림
+    private void sendReviewNotifications(LocalDate today, LocalDateTime reengagementCutoff) {
+        List<ReviewDueSummary> summaries = problemRepository.findReviewDueSummaryByDate(today);
+        if (summaries.isEmpty()) return;
+
+        Map<Long, Long> dueCountByUserId = summaries.stream()
+                .collect(Collectors.toMap(ReviewDueSummary::getUserId, ReviewDueSummary::getDueCount));
+
+        List<User> users = userRepository.findAllById(new ArrayList<>(dueCountByUserId.keySet()));
+        List<Long> notifiedUserIds = new ArrayList<>();
+
+        for (User user : users) {
+            // 3일 이상 미접속 유저는 재참여 흐름으로 처리
+            if (user.getLastActiveAt() == null || user.getLastActiveAt().isBefore(reengagementCutoff)) {
+                continue;
+            }
+            // 오늘 이미 알림 받은 경우 스킵
+            if (today.equals(user.getLastNotifiedAt())) {
+                continue;
+            }
+
+            long dueCount = dueCountByUserId.get(user.getId());
+            fcmService.sendNotificationToAllUserDevice(user.getId(),
+                    new NotificationRequestDto("", "오늘의 복습 알림",
+                            "오늘 복습할 문제가 " + dueCount + "개 있어요!",
+                            Map.of("type", "review_due")));
+            notifiedUserIds.add(user.getId());
+        }
+
+        if (!notifiedUserIds.isEmpty()) {
+            userRepository.bulkUpdateLastNotifiedAt(notifiedUserIds, today);
+        }
+        log.info("[ReviewDue] 복습 알림 발송: {}명", notifiedUserIds.size());
+    }
+
+    // 흐름 2: 일정 기간 미접속 유저에게 재참여 알림 (due 문제 여부 무관)
+    private void sendReengagementNotifications(LocalDate today, LocalDateTime reengagementCutoff, LocalDateTime inactiveCutoff) {
+        LocalDate notificationCutoff = today.minusDays(REENGAGEMENT_INTERVAL_DAYS);
+
+        List<User> inactiveUsers = userRepository.findUsersForReengagement(
+                reengagementCutoff, inactiveCutoff, notificationCutoff);
+
+        if (inactiveUsers.isEmpty()) return;
+
+        List<Long> notifiedUserIds = new ArrayList<>();
+
+        for (User user : inactiveUsers) {
+            fcmService.sendNotificationToAllUserDevice(user.getId(),
+                    new NotificationRequestDto("", "오랜만이에요!",
+                            "오답노트를 펼칠 시간이에요. 복습하러 돌아와보세요!",
+                            Map.of("type", "reengagement")));
+            notifiedUserIds.add(user.getId());
+        }
+
+        if (!notifiedUserIds.isEmpty()) {
+            userRepository.bulkUpdateLastNotifiedAt(notifiedUserIds, today);
+        }
+        log.info("[ReviewDue] 재참여 알림 발송: {}명", notifiedUserIds.size());
+    }
+
+    // 흐름 3: 30일 초과 미접속 유저에게 월 1회 알림
+    private void sendLongInactiveReengagementNotifications(LocalDate today, LocalDateTime longInactiveCutoff) {
+        LocalDate notificationCutoff = today.minusDays(LONG_INACTIVE_INTERVAL_DAYS);
+
+        List<User> longInactiveUsers = userRepository.findUsersForLongInactiveReengagement(
+                longInactiveCutoff, notificationCutoff);
+
+        if (longInactiveUsers.isEmpty()) return;
+
+        List<Long> notifiedUserIds = new ArrayList<>();
+
+        for (User user : longInactiveUsers) {
+            fcmService.sendNotificationToAllUserDevice(user.getId(),
+                    new NotificationRequestDto("", "오답노트가 기다리고 있어요",
+                            "한동안 자리를 비우셨네요. 다시 시작하기 딱 좋은 날이에요!",
+                            Map.of("type", "reengagement_monthly")));
+            notifiedUserIds.add(user.getId());
+        }
+
+        if (!notifiedUserIds.isEmpty()) {
+            userRepository.bulkUpdateLastNotifiedAt(notifiedUserIds, today);
+        }
+        log.info("[ReviewDue] 장기 미접속 알림 발송: {}명", notifiedUserIds.size());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationScheduler.java b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationScheduler.java
new file mode 100644
index 00000000..4034ff9a
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationScheduler.java
@@ -0,0 +1,53 @@
+package com.aisip.OnO.backend.problem.quartz;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.*;
+import org.springframework.stereotype.Component;
+
+import java.util.TimeZone;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ReviewDueNotificationScheduler {
+
+    private static final String JOB_NAME = "review-due-notification";
+    private static final String JOB_GROUP = "review";
+    private static final String TRIGGER_NAME = "review-due-trigger";
+    private static final String CRON = "0 0 9 ? * *";
+
+    private final Scheduler scheduler;
+
+    @PostConstruct
+    public void schedule() {
+        try {
+            JobDetail jobDetail = JobBuilder.newJob(ReviewDueNotificationJob.class)
+                    .withIdentity(JOB_NAME, JOB_GROUP)
+                    .storeDurably(true)
+                    .build();
+
+            Trigger trigger = TriggerBuilder.newTrigger()
+                    .withIdentity(TRIGGER_NAME, JOB_GROUP)
+                    .withSchedule(
+                            CronScheduleBuilder.cronSchedule(CRON)
+                                    .inTimeZone(TimeZone.getTimeZone("Asia/Seoul"))
+                    )
+                    .forJob(jobDetail)
+                    .build();
+
+            scheduler.addJob(jobDetail, true);
+
+            if (scheduler.checkExists(trigger.getKey())) {
+                scheduler.rescheduleJob(trigger.getKey(), trigger);
+            } else {
+                scheduler.scheduleJob(trigger);
+            }
+
+            log.info("[ReviewDue] 복습 알림 스케줄 등록 완료 - cron: {} (Asia/Seoul)", CRON);
+        } catch (SchedulerException e) {
+            log.error("[ReviewDue] 복습 알림 스케줄 등록 실패", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java b/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
index d7c28656..dc3739e8 100644
--- a/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
+++ b/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
@@ -22,6 +22,7 @@ public class UserController {
     public CommonResponse<UserResponseDto> getUserInfo() {
         Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         missionLogService.registerLoginMission(userId);
+        userService.touchLastActiveAt(userId);
 
         return CommonResponse.success(userService.findUser(userId));
     }
diff --git a/src/main/java/com/aisip/OnO/backend/user/entity/User.java b/src/main/java/com/aisip/OnO/backend/user/entity/User.java
index 75e5520a..375b2367 100644
--- a/src/main/java/com/aisip/OnO/backend/user/entity/User.java
+++ b/src/main/java/com/aisip/OnO/backend/user/entity/User.java
@@ -10,6 +10,9 @@
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,6 +43,10 @@ public class User extends BaseEntity {
 
     private String platform;
 
+    private LocalDateTime lastActiveAt;
+
+    private LocalDate lastNotifiedAt;
+
     @Embedded
     private UserMissionStatus userMissionStatus;
 
@@ -63,6 +70,19 @@ public static User from(UserRegisterDto userRegisterDto) {
                 .build();
     }
 
+    public void touchLastActiveAt() {
+        LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
+        // 오늘 이미 갱신한 경우 DB write 생략
+        if (this.lastActiveAt != null && !this.lastActiveAt.toLocalDate().isBefore(today)) {
+            return;
+        }
+        this.lastActiveAt = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+    }
+
+    public void updateLastNotifiedAt(LocalDate date) {
+        this.lastNotifiedAt = date;
+    }
+
     public void updateUser(UserRegisterDto userRegisterDto) {
         if (userRegisterDto.email() != null && !userRegisterDto.email().isBlank()) {
             this.email = userRegisterDto.email();
diff --git a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
index 9401fdbc..8ac86f0f 100644
--- a/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/user/repository/UserRepository.java
@@ -7,6 +7,10 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -32,4 +36,33 @@ List<Object[]> countDailyNewUsers(
             @Param("startDateTime") LocalDateTime startDateTime,
             @Param("endDateTime") LocalDateTime endDateTime
     );
+
+    @Transactional
+    @Modifying
+    @Query("UPDATE User u SET u.lastNotifiedAt = :date WHERE u.id IN :userIds")
+    void bulkUpdateLastNotifiedAt(@Param("userIds") List<Long> userIds, @Param("date") LocalDate date);
+
+    // 7일 ~ 30일 미접속 유저 (5일 간격)
+    @Query("""
+            SELECT u FROM User u
+            WHERE u.lastActiveAt < :reengagementCutoff
+              AND u.lastActiveAt >= :inactiveCutoff
+              AND (u.lastNotifiedAt IS NULL OR u.lastNotifiedAt < :notificationCutoff)
+            """)
+    List<User> findUsersForReengagement(
+            @Param("reengagementCutoff") LocalDateTime reengagementCutoff,
+            @Param("inactiveCutoff") LocalDateTime inactiveCutoff,
+            @Param("notificationCutoff") LocalDate notificationCutoff
+    );
+
+    // 30일 초과 미접속 유저 (30일 간격)
+    @Query("""
+            SELECT u FROM User u
+            WHERE u.lastActiveAt < :inactiveCutoff
+              AND (u.lastNotifiedAt IS NULL OR u.lastNotifiedAt < :notificationCutoff)
+            """)
+    List<User> findUsersForLongInactiveReengagement(
+            @Param("inactiveCutoff") LocalDateTime inactiveCutoff,
+            @Param("notificationCutoff") LocalDate notificationCutoff
+    );
 }
diff --git a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
index fce6363d..69b23d47 100644
--- a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
+++ b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
@@ -120,6 +120,11 @@ public long countAllUsers() {
         return userRepository.count();
     }
 
+    @Transactional
+    public void touchLastActiveAt(Long userId) {
+        findUserEntity(userId).touchLastActiveAt();
+    }
+
     @Transactional
     public void updateUser(Long userId, UserRegisterDto userRegisterDto) {
 
diff --git a/src/main/resources/db/migration/V3__add_notification_fields_and_backfill.sql b/src/main/resources/db/migration/V3__add_notification_fields_and_backfill.sql
new file mode 100644
index 00000000..78d2da70
--- /dev/null
+++ b/src/main/resources/db/migration/V3__add_notification_fields_and_backfill.sql
@@ -0,0 +1,9 @@
+-- User: 알림 스팸 방지용 마지막 알림 발송일
+ALTER TABLE user
+    ADD COLUMN last_notified_at DATE NULL;
+
+-- 기존 유저 last_active_at 백필 (updated_at 기준)
+UPDATE user SET last_active_at = updated_at WHERE last_active_at IS NULL AND deleted_at IS NULL;
+
+-- 스케줄러 전체 날짜 범위 스캔용 인덱스 (next_review_at 선두)
+CREATE INDEX idx_problem_next_review_date ON problem (next_review_at, user_id);
\ No newline at end of file

From 9214d3f31b9170bc629b13f7bc167955d8006190 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Sun, 3 May 2026 16:08:43 +0900
Subject: [PATCH 41/43] =?UTF-8?q?[fix]=20FCM=20=ED=86=A0=ED=81=B0=20?=
 =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EC=8B=9C=20DB=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/FcmNotificationConsumer.java        | 16 ++++++++++++++++
 .../util/fcm/repository/FcmTokenRepository.java  |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
index 596a233f..db887b34 100644
--- a/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
+++ b/src/main/java/com/aisip/OnO/backend/config/rabbitmq/consumer/FcmNotificationConsumer.java
@@ -8,6 +8,7 @@
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
+import com.google.firebase.messaging.MessagingErrorCode;
 import com.google.firebase.messaging.Notification;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
@@ -63,6 +64,15 @@ public void handleNotificationMessage(FcmNotificationMessage message) {
                 try {
                     sendToDevice(fcmToken.getToken(), message);
                     successCount++;
+                } catch (FirebaseMessagingException e) {
+                    if (isInvalidToken(e)) {
+                        fcmTokenRepository.deleteByToken(fcmToken.getToken());
+                        log.info("만료된 FCM 토큰 삭제 - userId: {}, errorCode: {}", message.getUserId(), e.getMessagingErrorCode());
+                    } else {
+                        log.warn("RabbitMQ device delivery failed - queue: {}, operation: {}, userId: {}, error: {}",
+                                RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", message.getUserId(), e.getMessage());
+                        failCount++;
+                    }
                 } catch (Exception e) {
                     log.warn("RabbitMQ device delivery failed - queue: {}, operation: {}, userId: {}, error: {}",
                             RabbitMQConfig.FCM_NOTIFICATION_QUEUE, "fcm_notification", message.getUserId(), e.getMessage());
@@ -152,6 +162,12 @@ public void handleNotificationDLQ(FcmNotificationMessage message) {
         }
     }
 
+    private boolean isInvalidToken(FirebaseMessagingException e) {
+        MessagingErrorCode code = e.getMessagingErrorCode();
+        return code == MessagingErrorCode.UNREGISTERED
+                || code == MessagingErrorCode.INVALID_ARGUMENT;
+    }
+
     private void recordExternalCall(String dependency, String operation, String outcome, Timer.Sample sample) {
         sample.stop(
                 Timer.builder("ono.external.requests")
diff --git a/src/main/java/com/aisip/OnO/backend/util/fcm/repository/FcmTokenRepository.java b/src/main/java/com/aisip/OnO/backend/util/fcm/repository/FcmTokenRepository.java
index d584cca8..31e7007e 100644
--- a/src/main/java/com/aisip/OnO/backend/util/fcm/repository/FcmTokenRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/util/fcm/repository/FcmTokenRepository.java
@@ -2,6 +2,7 @@
 
 import com.aisip.OnO.backend.util.fcm.entity.FcmToken;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,4 +16,7 @@ public interface FcmTokenRepository extends JpaRepository<FcmToken, Long> {
     Optional<FcmToken> findByToken(String token);
 
     List<FcmToken> findAllByUserId(Long userId);
+
+    @Transactional
+    void deleteByToken(String token);
 }

From 1e6f8da2172a95082516744ec7a49efe44d776c7 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 4 May 2026 17:26:09 +0900
Subject: [PATCH 42/43] =?UTF-8?q?[feat]=20=EC=9C=A0=EC=A0=80=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EC=88=98=EC=8B=A0=20=EC=84=A4=EC=A0=95=20API=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../problem/quartz/ReviewDueNotificationJob.java      |  7 ++++++-
 .../OnO/backend/user/controller/UserController.java   | 11 +++++++++++
 .../user/dto/NotificationSettingsUpdateDto.java       |  3 +++
 .../java/com/aisip/OnO/backend/user/entity/User.java  |  8 ++++++++
 .../aisip/OnO/backend/user/service/UserService.java   |  5 +++++
 .../db/migration/V4__add_notification_enabled.sql     |  2 ++
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/user/dto/NotificationSettingsUpdateDto.java
 create mode 100644 src/main/resources/db/migration/V4__add_notification_enabled.sql

diff --git a/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
index 6e5c7957..bfc471aa 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/quartz/ReviewDueNotificationJob.java
@@ -62,7 +62,10 @@ private void sendReviewNotifications(LocalDate today, LocalDateTime reengagement
         List<Long> notifiedUserIds = new ArrayList<>();
 
         for (User user : users) {
-            // 3일 이상 미접속 유저는 재참여 흐름으로 처리
+            // 알림 수신 거부한 유저 스킵
+            if (!user.isNotificationEnabled()) continue;
+
+            // 7일 이상 미접속 유저는 재참여 흐름으로 처리
             if (user.getLastActiveAt() == null || user.getLastActiveAt().isBefore(reengagementCutoff)) {
                 continue;
             }
@@ -97,6 +100,7 @@ private void sendReengagementNotifications(LocalDate today, LocalDateTime reenga
         List<Long> notifiedUserIds = new ArrayList<>();
 
         for (User user : inactiveUsers) {
+            if (!user.isNotificationEnabled()) continue;
             fcmService.sendNotificationToAllUserDevice(user.getId(),
                     new NotificationRequestDto("", "오랜만이에요!",
                             "오답노트를 펼칠 시간이에요. 복습하러 돌아와보세요!",
@@ -122,6 +126,7 @@ private void sendLongInactiveReengagementNotifications(LocalDate today, LocalDat
         List<Long> notifiedUserIds = new ArrayList<>();
 
         for (User user : longInactiveUsers) {
+            if (!user.isNotificationEnabled()) continue;
             fcmService.sendNotificationToAllUserDevice(user.getId(),
                     new NotificationRequestDto("", "오답노트가 기다리고 있어요",
                             "한동안 자리를 비우셨네요. 다시 시작하기 딱 좋은 날이에요!",
diff --git a/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java b/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
index dc3739e8..316a80f5 100644
--- a/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
+++ b/src/main/java/com/aisip/OnO/backend/user/controller/UserController.java
@@ -2,6 +2,7 @@
 
 import com.aisip.OnO.backend.common.response.CommonResponse;
 import com.aisip.OnO.backend.mission.service.MissionLogService;
+import com.aisip.OnO.backend.user.dto.NotificationSettingsUpdateDto;
 import com.aisip.OnO.backend.user.dto.UserRegisterDto;
 import com.aisip.OnO.backend.user.dto.UserResponseDto;
 import com.aisip.OnO.backend.user.service.UserService;
@@ -36,6 +37,16 @@ public CommonResponse<String> updateUserInfo(@RequestBody UserRegisterDto userRe
         return CommonResponse.success("사용자 정보 수정이 완료되었습니다.");
     }
 
+    // ✅ 알림 수신 설정
+    @PatchMapping("/notification-settings")
+    public CommonResponse<String> updateNotificationSettings(
+            @RequestBody NotificationSettingsUpdateDto dto) {
+        Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        userService.updateNotificationSettings(userId, dto.notificationEnabled());
+
+        return CommonResponse.success("알림 설정이 변경되었습니다.");
+    }
+
     // ✅ 사용자 계정 삭제
     @DeleteMapping("")
     public void deleteUserInfo() {
diff --git a/src/main/java/com/aisip/OnO/backend/user/dto/NotificationSettingsUpdateDto.java b/src/main/java/com/aisip/OnO/backend/user/dto/NotificationSettingsUpdateDto.java
new file mode 100644
index 00000000..b4997930
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/user/dto/NotificationSettingsUpdateDto.java
@@ -0,0 +1,3 @@
+package com.aisip.OnO.backend.user.dto;
+
+public record NotificationSettingsUpdateDto(boolean notificationEnabled) {}
\ No newline at end of file
diff --git a/src/main/java/com/aisip/OnO/backend/user/entity/User.java b/src/main/java/com/aisip/OnO/backend/user/entity/User.java
index 375b2367..8a60d524 100644
--- a/src/main/java/com/aisip/OnO/backend/user/entity/User.java
+++ b/src/main/java/com/aisip/OnO/backend/user/entity/User.java
@@ -47,6 +47,10 @@ public class User extends BaseEntity {
 
     private LocalDate lastNotifiedAt;
 
+    @Column(nullable = false)
+    @Builder.Default
+    private boolean notificationEnabled = true;
+
     @Embedded
     private UserMissionStatus userMissionStatus;
 
@@ -83,6 +87,10 @@ public void updateLastNotifiedAt(LocalDate date) {
         this.lastNotifiedAt = date;
     }
 
+    public void updateNotificationEnabled(boolean enabled) {
+        this.notificationEnabled = enabled;
+    }
+
     public void updateUser(UserRegisterDto userRegisterDto) {
         if (userRegisterDto.email() != null && !userRegisterDto.email().isBlank()) {
             this.email = userRegisterDto.email();
diff --git a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
index 69b23d47..7789ccd1 100644
--- a/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
+++ b/src/main/java/com/aisip/OnO/backend/user/service/UserService.java
@@ -125,6 +125,11 @@ public void touchLastActiveAt(Long userId) {
         findUserEntity(userId).touchLastActiveAt();
     }
 
+    @Transactional
+    public void updateNotificationSettings(Long userId, boolean notificationEnabled) {
+        findUserEntity(userId).updateNotificationEnabled(notificationEnabled);
+    }
+
     @Transactional
     public void updateUser(Long userId, UserRegisterDto userRegisterDto) {
 
diff --git a/src/main/resources/db/migration/V4__add_notification_enabled.sql b/src/main/resources/db/migration/V4__add_notification_enabled.sql
new file mode 100644
index 00000000..6a2eeab4
--- /dev/null
+++ b/src/main/resources/db/migration/V4__add_notification_enabled.sql
@@ -0,0 +1,2 @@
+ALTER TABLE user
+    ADD COLUMN notification_enabled BOOLEAN NOT NULL DEFAULT TRUE;
\ No newline at end of file

From 80205e156e047aee0866dc82733b78ecddc3c3d9 Mon Sep 17 00:00:00 2001
From: KiSeungMin <ksm011212@gmail.com>
Date: Mon, 4 May 2026 19:28:18 +0900
Subject: [PATCH 43/43] =?UTF-8?q?[feat]=20=EC=98=A4=EB=8B=B5=EB=85=B8?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 복습 횟수
- 마지막 복습 일시
---
 .../problem/dto/ProblemResponseDto.java       | 10 +++
 .../problem/service/ProblemService.java       | 72 +++++++++++++------
 .../repository/ProblemSolveRepository.java    | 11 +++
 .../repository/ProblemSolveSummary.java       | 11 +++
 .../controller/ProblemControllerTest.java     |  6 ++
 .../problem/service/ProblemServiceTest.java   | 20 ++++++
 6 files changed, 109 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveSummary.java

diff --git a/src/main/java/com/aisip/OnO/backend/problem/dto/ProblemResponseDto.java b/src/main/java/com/aisip/OnO/backend/problem/dto/ProblemResponseDto.java
index 2dd167c2..81bd6e6c 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/dto/ProblemResponseDto.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/dto/ProblemResponseDto.java
@@ -30,6 +30,10 @@ public record ProblemResponseDto (
 
     List<ProblemImageDataResponseDto> imageUrlList,
 
+    Long solveCount,
+
+    LocalDateTime lastSolvedAt,
+
     ProblemAnalysisResponseDto analysis,
 
     List<Long> tagIdList,
@@ -37,6 +41,10 @@ public record ProblemResponseDto (
     List<TagResponseDto> tags
 ) {
     public static ProblemResponseDto from(@NotNull Problem problem) {
+        return from(problem, 0L, null);
+    }
+
+    public static ProblemResponseDto from(@NotNull Problem problem, Long solveCount, LocalDateTime lastSolvedAt) {
 
         List<ProblemImageDataResponseDto> problemImageDataList = Optional.ofNullable(problem.getProblemImageDataList())
                 .orElse(List.of())
@@ -69,6 +77,8 @@ public static ProblemResponseDto from(@NotNull Problem problem) {
                 .createdAt(problem.getCreatedAt())
                 .updatedAt(problem.getUpdatedAt())
                 .imageUrlList(problemImageDataList)
+                .solveCount(solveCount)
+                .lastSolvedAt(lastSolvedAt)
                 .analysis(analysisDto)
                 .tagIdList(tagIds)
                 .tags(tags)
diff --git a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
index 03f9106d..3cc8af4a 100644
--- a/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
+++ b/src/main/java/com/aisip/OnO/backend/problem/service/ProblemService.java
@@ -25,6 +25,8 @@
 import com.aisip.OnO.backend.problem.entity.Problem;
 import com.aisip.OnO.backend.problem.repository.ProblemRepository;
 import com.aisip.OnO.backend.practicenote.repository.PracticeNoteRepository;
+import com.aisip.OnO.backend.problemsolve.repository.ProblemSolveRepository;
+import com.aisip.OnO.backend.problemsolve.repository.ProblemSolveSummary;
 import com.aisip.OnO.backend.tag.entity.ProblemTagMapping;
 import com.aisip.OnO.backend.tag.entity.Tag;
 import com.aisip.OnO.backend.tag.exception.TagErrorCase;
@@ -70,6 +72,8 @@ public class ProblemService {
 
     private final PracticeNoteRepository practiceNoteRepository;
 
+    private final ProblemSolveRepository problemSolveRepository;
+
     private final S3DeleteProducer s3DeleteProducer;
 
     private final ProblemAnalysisProducer analysisProducer;
@@ -81,7 +85,7 @@ public ProblemResponseDto findProblem(Long problemId) {
         Problem problem = problemRepository.findProblemWithImageData(problemId)
                 .orElseThrow(() -> new ApplicationException(ProblemErrorCase.PROBLEM_NOT_FOUND));
 
-        return ProblemResponseDto.from(problem);
+        return toProblemResponseDto(problem);
     }
 
     @Transactional(readOnly = true)
@@ -112,27 +116,22 @@ public Problem findProblemEntityWithImageData(Long problemId, Long userId) {
     public List<ProblemResponseDto> findUserProblems(Long userId) {
         log.info("userId: {} find all user problems", userId);
 
-        return problemRepository.findAllByUserId(userId)
-                .stream()
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+        return toProblemResponseDtos(problemRepository.findAllByUserId(userId));
     }
 
     @Transactional(readOnly = true)
     public List<ProblemResponseDto> findFolderProblemList(Long folderId) {
-        return problemRepository.findAllByFolderId(folderId)
-                .stream()
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+        return toProblemResponseDtos(problemRepository.findAllByFolderId(folderId));
     }
 
     @Transactional(readOnly = true)
     public List<ProblemResponseDto> findAllProblems() {
-        return problemRepository.findAll()
+        List<Problem> problems = problemRepository.findAll()
                 .stream()
                 .sorted((p1, p2) -> p2.getCreatedAt().compareTo(p1.getCreatedAt())) // 최신순 정렬
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+                .toList();
+
+        return toProblemResponseDtos(problems);
     }
 
     @Transactional(readOnly = true)
@@ -550,9 +549,7 @@ public CursorPageResponse<ProblemResponseDto> findProblemsByFolderWithCursor(Lon
         List<Problem> content = hasNext ? problems.subList(0, size) : problems;
         Long nextCursor = hasNext ? content.get(content.size() - 1).getId() : null;
 
-        List<ProblemResponseDto> dtoList = content.stream()
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+        List<ProblemResponseDto> dtoList = toProblemResponseDtos(content);
 
         log.info("folderId: {} find problems with cursor: {}, size: {}, hasNext: {}", folderId, cursor, size, hasNext);
         return CursorPageResponse.of(dtoList, nextCursor, hasNext, size);
@@ -581,9 +578,7 @@ public CursorPageResponse<ProblemResponseDto> findProblemsByTagWithCursor(Long t
         List<Problem> content = hasNext ? problems.subList(0, size) : problems;
         Long nextCursor = hasNext ? content.get(content.size() - 1).getId() : null;
 
-        List<ProblemResponseDto> dtoList = content.stream()
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+        List<ProblemResponseDto> dtoList = toProblemResponseDtos(content);
 
         log.info("userId: {} find problems by tagId: {} with cursor: {}, size: {}, hasNext: {}",
                 userId, tagId, cursor, size, hasNext);
@@ -609,15 +604,50 @@ public CursorPageResponse<ProblemResponseDto> findProblemsByTitleWithCursor(
         List<Problem> content = hasNext ? problems.subList(0, size) : problems;
         Long nextCursor = hasNext ? content.get(content.size() - 1).getId() : null;
 
-        List<ProblemResponseDto> dtoList = content.stream()
-                .map(ProblemResponseDto::from)
-                .collect(Collectors.toList());
+        List<ProblemResponseDto> dtoList = toProblemResponseDtos(content);
 
         log.info("userId: {} find problems by title query: '{}' with cursor: {}, size: {}, hasNext: {}",
                 userId, query, cursor, size, hasNext);
         return CursorPageResponse.of(dtoList, nextCursor, hasNext, size);
     }
 
+    private ProblemResponseDto toProblemResponseDto(Problem problem) {
+        Long solveCount = problemSolveRepository.countByProblemId(problem.getId());
+        return ProblemResponseDto.from(
+                problem,
+                solveCount != null ? solveCount : 0L,
+                problemSolveRepository.findLastSolvedAtByProblemId(problem.getId())
+        );
+    }
+
+    private List<ProblemResponseDto> toProblemResponseDtos(List<Problem> problems) {
+        if (problems.isEmpty()) {
+            return List.of();
+        }
+
+        List<Long> problemIds = problems.stream()
+                .map(Problem::getId)
+                .toList();
+
+        Map<Long, ProblemSolveSummary> solveSummariesByProblemId = problemSolveRepository.findSolveSummariesByProblemIds(problemIds)
+                .stream()
+                .collect(Collectors.toMap(
+                        ProblemSolveSummary::getProblemId,
+                        solveSummary -> solveSummary
+                ));
+
+        return problems.stream()
+                .map(problem -> {
+                    ProblemSolveSummary solveSummary = solveSummariesByProblemId.get(problem.getId());
+                    return ProblemResponseDto.from(
+                            problem,
+                            solveSummary != null ? solveSummary.getSolveCount() : 0L,
+                            solveSummary != null ? solveSummary.getLastSolvedAt() : null
+                    );
+                })
+                .collect(Collectors.toList());
+    }
+
     @Transactional(readOnly = true)
     public ReviewDueResponseDto getReviewDueProblems(Long userId) {
         LocalDate today = LocalDate.now(java.time.ZoneId.of("Asia/Seoul"));
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
index bc1abe64..17cf086a 100644
--- a/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveRepository.java
@@ -5,6 +5,8 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
@@ -39,5 +41,14 @@ public interface ProblemSolveRepository extends JpaRepository<ProblemSolve, Long
             "WHERE pr.problem.id = :problemId")
     Long countByProblemId(@Param("problemId") Long problemId);
 
+    @Query("SELECT MAX(pr.practicedAt) FROM ProblemSolve pr " +
+            "WHERE pr.problem.id = :problemId")
+    LocalDateTime findLastSolvedAtByProblemId(@Param("problemId") Long problemId);
+
+    @Query("SELECT pr.problem.id as problemId, COUNT(pr) as solveCount, MAX(pr.practicedAt) as lastSolvedAt FROM ProblemSolve pr " +
+            "WHERE pr.problem.id IN :problemIds " +
+            "GROUP BY pr.problem.id")
+    List<ProblemSolveSummary> findSolveSummariesByProblemIds(@Param("problemIds") Collection<Long> problemIds);
+
     void deleteAllByProblemId(Long problemId);
 }
diff --git a/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveSummary.java b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveSummary.java
new file mode 100644
index 00000000..0c831bd4
--- /dev/null
+++ b/src/main/java/com/aisip/OnO/backend/problemsolve/repository/ProblemSolveSummary.java
@@ -0,0 +1,11 @@
+package com.aisip.OnO.backend.problemsolve.repository;
+
+import java.time.LocalDateTime;
+
+public interface ProblemSolveSummary {
+    Long getProblemId();
+
+    Long getSolveCount();
+
+    LocalDateTime getLastSolvedAt();
+}
diff --git a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
index e903d09b..0a7c521e 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/controller/ProblemControllerTest.java
@@ -76,6 +76,8 @@ void setUp() {
                     LocalDateTime.now(),
                     LocalDateTime.now(),
                     imageUrlList,
+                    (long) i,
+                    LocalDateTime.now(),
                     null,
                     List.of(),
                     List.of()
@@ -102,6 +104,8 @@ void getProblem() throws Exception {
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.data.problemId").value(1L))
+                .andExpect(jsonPath("$.data.solveCount").value(1L))
+                .andExpect(jsonPath("$.data.lastSolvedAt").exists())
                 .andExpect(jsonPath("$.data.memo").value("memo1"))
                 .andExpect(jsonPath("$.data.reference").value("reference1"))
                 .andExpect(jsonPath("$.data.imageUrlList.size()").value(3))
@@ -120,6 +124,8 @@ void getProblemsByUserId() throws Exception {
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.data.size()").value(5))
+                .andExpect(jsonPath("$.data[0].solveCount").value(1L))
+                .andExpect(jsonPath("$.data[0].lastSolvedAt").exists())
                 .andExpect(jsonPath("$.data[0].memo").value("memo1"))
                 .andExpect(jsonPath("$.data[0].reference").value("reference1"))
                 .andExpect(jsonPath("$.data[0].imageUrlList.size()").value(3))
diff --git a/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java b/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
index b054c0a9..73414c04 100644
--- a/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
+++ b/src/test/java/com/aisip/OnO/backend/problem/service/ProblemServiceTest.java
@@ -14,6 +14,9 @@
 import com.aisip.OnO.backend.problem.entity.ProblemImageType;
 import com.aisip.OnO.backend.problem.repository.ProblemImageDataRepository;
 import com.aisip.OnO.backend.problem.repository.ProblemRepository;
+import com.aisip.OnO.backend.problemsolve.entity.AnswerStatus;
+import com.aisip.OnO.backend.problemsolve.entity.ProblemSolve;
+import com.aisip.OnO.backend.problemsolve.repository.ProblemSolveRepository;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -50,6 +53,9 @@ class ProblemServiceTest {
     @Autowired
     private FolderRepository folderRepository;
 
+    @Autowired
+    private ProblemSolveRepository problemSolveRepository;
+
     @MockBean
     private FileUploadService fileUploadService;
 
@@ -109,6 +115,7 @@ void tearDown() {
         problemList.clear();
         folderList.clear();
 
+        problemSolveRepository.deleteAll();
         problemImageDataRepository.deleteAll();
         problemRepository.deleteAll();
         folderRepository.deleteAll();
@@ -120,6 +127,10 @@ void findProblem() {
         // given
         Problem problem = problemList.get(0);
         Long problemId = problem.getId();
+        LocalDateTime firstSolvedAt = LocalDateTime.now().minusDays(1);
+        LocalDateTime lastSolvedAt = LocalDateTime.now();
+        problemSolveRepository.save(ProblemSolve.create(problem, userId, firstSolvedAt, AnswerStatus.CORRECT, null, null, null));
+        problemSolveRepository.save(ProblemSolve.create(problem, userId, lastSolvedAt, AnswerStatus.WRONG, null, null, null));
 
         // when
         ProblemResponseDto problemResponseDto = problemService.findProblem(problemId);
@@ -129,6 +140,8 @@ void findProblem() {
         assertThat(problemResponseDto.reference()).isEqualTo(problem.getReference());
         assertThat(problemResponseDto.imageUrlList().size()).isEqualTo(problemImageDataRepository.findAllByProblemId(problemId).size());
         assertThat(problemResponseDto.imageUrlList().size()).isEqualTo(2);
+        assertThat(problemResponseDto.solveCount()).isEqualTo(2L);
+        assertThat(problemResponseDto.lastSolvedAt()).isEqualTo(lastSolvedAt);
     }
 
     @Test
@@ -137,6 +150,9 @@ void findUserProblems() {
         //given
 
         //when
+        Problem firstProblem = problemList.get(0);
+        LocalDateTime lastSolvedAt = LocalDateTime.now();
+        problemSolveRepository.save(ProblemSolve.create(firstProblem, userId, lastSolvedAt, AnswerStatus.CORRECT, null, null, null));
         List<ProblemResponseDto> problemResponseDtoList = problemService.findUserProblems(userId);
 
         //then
@@ -149,6 +165,10 @@ void findUserProblems() {
             assertThat(problemResponseDtoList.get(i).memo()).isEqualTo(problem.getMemo());
             assertThat(problemResponseDtoList.get(i).reference()).isEqualTo(problem.getReference());
         }
+        assertThat(problemResponseDtoList.get(0).solveCount()).isEqualTo(1L);
+        assertThat(problemResponseDtoList.get(0).lastSolvedAt()).isEqualTo(lastSolvedAt);
+        assertThat(problemResponseDtoList.get(1).solveCount()).isEqualTo(0L);
+        assertThat(problemResponseDtoList.get(1).lastSolvedAt()).isNull();
     }
 
     @Test