From aacf1847a8b7b3168a3013eb84020791beb169fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=ED=9D=AC=EC=B0=AC?=
 <138795506+chanrhan@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:07:09 +0900
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EC=A3=BC=EA=B0=84=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20=EC=A0=95=EC=82=B0=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(#8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: ERROR 로그를 파일로 저장하도록 수정

* test: 테스트 코드 및 예외 처리 추가

* fix: getStreak 쿼리 올바르게 수정

* feat: 주말(토,일) 주간 패스 방지 추가

* feat: DateUtil에서 주의 시작을 월요일로 설정

* fix: updateStreak() 쿼리 기준값 변경 (toDate -> fromDate)

* fix: 쿼리 오류 수정

* test: 수정 내역에 맞게 테스트 코드 수정

---------

Co-authored-by: chanrhan <km1104rs@naver.com>
---
 .github/workflows/ci.yml                      |   2 +-
 build.gradle                                  |  12 +-
 gradle/libs.versions.toml                     |   3 +
 .../src/js/components/UserProgress.jsx        |  10 +-
 .../com/baektracker/common/util/DateUtil.java |   7 +-
 .../domain/problem/model/BaekjoonProblem.java |   2 +
 .../domain/problem/model/SolvedProblem.java   |   2 +
 .../SolvedProblemQueryRepository.java         |   2 +-
 .../test/controller/TestController.java       |  26 ++
 .../baektracker/domain/user/model/User.java   |   3 +
 .../weekly_result/model/WeeklyResult.java     |  15 +-
 .../service/WeeklyResultService.java          |  21 +-
 .../global/code/ApiResponseCode.java          |   2 +-
 src/main/resources/application.yml            |   3 +
 .../db/procedure/init_user_streak.sql         |   2 +
 src/main/resources/logback-spring.xml         |  22 +-
 .../resources/mapper/WeeklyResultMapper.xml   |  27 +-
 .../BaektrackerApplicationTests.java          |   7 +-
 .../baektracker/common/util/DateUtilTest.java |  18 ++
 .../service/WeeklyResultServiceTest.java      | 245 ++++++++++++++++++
 20 files changed, 381 insertions(+), 50 deletions(-)
 create mode 100644 src/main/java/com/baektracker/domain/test/controller/TestController.java
 rename src/test/java/com/baektracker/{hanco => }/BaektrackerApplicationTests.java (52%)
 create mode 100644 src/test/java/com/baektracker/common/util/DateUtilTest.java
 create mode 100644 src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee79c335..027089f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,4 +39,4 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build (includes React build)
-        run: ./gradlew clean bootJar --no-daemon
+        run: ./gradlew clean build --no-daemon
diff --git a/build.gradle b/build.gradle
index ab95fdfd..02d8e48e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,12 @@ dependencies {
     implementation libs.org.mybatis.spring.boot.mybatis.spring.boot.starter
     runtimeOnly libs.org.springframework.boot.spring.boot.devtools
 
+    // Test
+    testImplementation libs.org.junit.jupiter.junit.jupiter
+    testImplementation libs.org.mockito.mockito.junit.jupiter
+    testImplementation libs.org.assertj.assertj.core
+
+
     // JPA
     implementation libs.org.springframework.boot.spring.boot.starter.data.jpa
 
@@ -77,6 +83,10 @@ tasks.withType(Javadoc) {
     options.encoding = 'UTF-8'
 }
 
+tasks.test {
+    useJUnitPlatform()
+}
+
 def frontendDir = "$projectDir/src/main/frontend"
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
 def reactBuildDir = layout.buildDirectory.dir("frontend").get().asFile
@@ -138,4 +148,4 @@ tasks.register('copyReactBuildFiles', Copy) {
     dependsOn "buildReact"
     from "$frontendDir/build"
     into reactBuildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1853abaa..5a6b9b7f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,3 +42,6 @@ org-springframework-boot-spring-boot-starter-tomcat = { module = "org.springfram
 org-springframework-boot-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "org-springframework-boot-spring-boot-starter-web" }
 org-springframework-security-spring-security-test = { module = "org.springframework.security:spring-security-test", version.ref = "org-springframework-security-spring-security-test" }
 org-webjars-jquery = { module = "org.webjars:jquery", version.ref = "org-webjars-jquery" }
+org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
+org-assertj-assertj-core = { module = "org.assertj:assertj-core" }
diff --git a/src/main/frontend/src/js/components/UserProgress.jsx b/src/main/frontend/src/js/components/UserProgress.jsx
index abfa326f..e3135aea 100644
--- a/src/main/frontend/src/js/components/UserProgress.jsx
+++ b/src/main/frontend/src/js/components/UserProgress.jsx
@@ -223,11 +223,11 @@ export function UserProgress({fromDate, toDate}) {
                                         <span className={styles.userProgressName}>
                                             {user.nickname} {isWeekPass ?
                                             <span className={styles.pass_text}>이번주 패스</span> : ''}
-                                            {user.weekPassCount > 0 && (
-                                                <span className={styles.pass_text}>
-                                                    🛡️{user.weekPassCount}
-                                                </span>
-                                            )}
+                                            {/*{user.weekPassCount > 0 && (*/}
+                                            {/*    <span className={styles.pass_text}>*/}
+                                            {/*        🛡️{user.weekPassCount}*/}
+                                            {/*    </span>*/}
+                                            {/*)}*/}
                                         </span>
                                         <div className={styles.userProgressMenuContainer} data-dropdown={user.id}>
                                             <button
diff --git a/src/main/java/com/baektracker/common/util/DateUtil.java b/src/main/java/com/baektracker/common/util/DateUtil.java
index 36b0f59b..26ed098e 100644
--- a/src/main/java/com/baektracker/common/util/DateUtil.java
+++ b/src/main/java/com/baektracker/common/util/DateUtil.java
@@ -2,13 +2,14 @@
 
 import java.time.LocalDate;
 import java.time.temporal.WeekFields;
-import java.util.Locale;
 
 public class DateUtil {
-    private final static WeekFields isoWeekFields = WeekFields.of(Locale.KOREA);
+    private final static WeekFields isoWeekFields = WeekFields.ISO;
 
     public static String toYearWeek(LocalDate date) {
-        return String.format("%s-%s", date.getYear(), date.get(isoWeekFields.weekOfWeekBasedYear()));
+        int year = date.getYear();
+        int week = date.get(isoWeekFields.weekOfYear());
+        return String.format("%04d-%02d", year, week);
     }
 
     public static int toWeekOfMonth(LocalDate date) {
diff --git a/src/main/java/com/baektracker/domain/problem/model/BaekjoonProblem.java b/src/main/java/com/baektracker/domain/problem/model/BaekjoonProblem.java
index 07151bd2..919cb5cc 100644
--- a/src/main/java/com/baektracker/domain/problem/model/BaekjoonProblem.java
+++ b/src/main/java/com/baektracker/domain/problem/model/BaekjoonProblem.java
@@ -8,6 +8,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Table(name = "problems")
@@ -15,6 +16,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class BaekjoonProblem {
     @Id
     private Integer id;
diff --git a/src/main/java/com/baektracker/domain/problem/model/SolvedProblem.java b/src/main/java/com/baektracker/domain/problem/model/SolvedProblem.java
index 33233ebd..4fd9b683 100644
--- a/src/main/java/com/baektracker/domain/problem/model/SolvedProblem.java
+++ b/src/main/java/com/baektracker/domain/problem/model/SolvedProblem.java
@@ -15,6 +15,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Table(name = "solved_problems")
@@ -22,6 +23,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class SolvedProblem {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/baektracker/domain/problem/queryRepository/SolvedProblemQueryRepository.java b/src/main/java/com/baektracker/domain/problem/queryRepository/SolvedProblemQueryRepository.java
index c69c3f11..cf22b838 100644
--- a/src/main/java/com/baektracker/domain/problem/queryRepository/SolvedProblemQueryRepository.java
+++ b/src/main/java/com/baektracker/domain/problem/queryRepository/SolvedProblemQueryRepository.java
@@ -16,7 +16,7 @@
 public class SolvedProblemQueryRepository {
     private final JPAQueryFactory queryFactory;
 
-    public List<SolvedProblem> fetchWeeklyUserScores(LocalDate beforeDate, LocalDate afterDate) {
+    public List<SolvedProblem> getSolvedCorrectProblems(LocalDate beforeDate, LocalDate afterDate) {
         QSolvedProblem sp = QSolvedProblem.solvedProblem;
         QSolvedProblem sp2 = new QSolvedProblem("sp2");
 
diff --git a/src/main/java/com/baektracker/domain/test/controller/TestController.java b/src/main/java/com/baektracker/domain/test/controller/TestController.java
new file mode 100644
index 00000000..b5fd57aa
--- /dev/null
+++ b/src/main/java/com/baektracker/domain/test/controller/TestController.java
@@ -0,0 +1,26 @@
+package com.baektracker.domain.test.controller;
+
+import com.baektracker.domain.weekly_result.service.WeeklyResultService;
+import java.time.LocalDate;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/test")
+@RequiredArgsConstructor
+public class TestController {
+
+    private final WeeklyResultService weeklyResultService;
+
+    @GetMapping("/job")
+    public ResponseEntity<Void> testWeeklyResultJob(@RequestParam LocalDate date) {
+        LocalDate fromDate = date.minusDays(6);
+        System.out.printf("test: %s - %s", fromDate, date);
+        weeklyResultService.updateWeeklyResults(fromDate, date);
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/com/baektracker/domain/user/model/User.java b/src/main/java/com/baektracker/domain/user/model/User.java
index acafd81d..2ffc57ea 100644
--- a/src/main/java/com/baektracker/domain/user/model/User.java
+++ b/src/main/java/com/baektracker/domain/user/model/User.java
@@ -11,6 +11,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.hibernate.annotations.ColumnDefault;
 
 @Entity
@@ -19,6 +20,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -55,4 +57,5 @@ public void updateLastRead(Integer lastRead) {
     public void setStreak(int streak) {
         this.streak = streak;
     }
+
 }
diff --git a/src/main/java/com/baektracker/domain/weekly_result/model/WeeklyResult.java b/src/main/java/com/baektracker/domain/weekly_result/model/WeeklyResult.java
index b2e6f8ee..0c882277 100644
--- a/src/main/java/com/baektracker/domain/weekly_result/model/WeeklyResult.java
+++ b/src/main/java/com/baektracker/domain/weekly_result/model/WeeklyResult.java
@@ -1,5 +1,6 @@
 package com.baektracker.domain.weekly_result.model;
 
+import com.baektracker.common.util.DateUtil;
 import com.baektracker.domain.user.model.User;
 import com.baektracker.domain.weekly_result.code.WeeklyResultState;
 import com.baektracker.domain.weekly_result.converter.WeeklyResultStatusConverter;
@@ -17,13 +18,17 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @Entity
 @Table(name = "weekly_results")
 @Getter
+@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class WeeklyResult {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -68,18 +73,14 @@ public void setState(WeeklyResultState state) {
         this.state = state;
     }
 
-    public static WeeklyResult from(String yearWeek, User user) {
+    public static WeeklyResult from(LocalDate date, User user) {
         return WeeklyResult.builder()
-                .yearWeek(yearWeek)
+                .weekDt(date)
+                .yearWeek(DateUtil.toYearWeek(date))
                 .score(0)
                 .state(WeeklyResultState.None)
                 .fine(0)
                 .user(user)
                 .build();
     }
-
-    @Override
-    public String toString() {
-        return String.format("(name: %s, week_dt: %s, score: %s, fine: %s\n", user.getNickname(), weekDt, score, fine);
-    }
 }
diff --git a/src/main/java/com/baektracker/domain/weekly_result/service/WeeklyResultService.java b/src/main/java/com/baektracker/domain/weekly_result/service/WeeklyResultService.java
index 2a505350..aab9ce79 100644
--- a/src/main/java/com/baektracker/domain/weekly_result/service/WeeklyResultService.java
+++ b/src/main/java/com/baektracker/domain/weekly_result/service/WeeklyResultService.java
@@ -19,6 +19,7 @@
 import com.baektracker.global.code.ApiResponseCode;
 import com.baektracker.global.exception.CustomException;
 import com.baektracker.mapper.WeeklyResultMapper;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -97,7 +98,8 @@ public MonthFineStatusResponse getMonthFine(LocalDate date) {
 
     @Transactional
     public void updateWeekPass(WeekPassRequestDto dto) {
-        String yearWeek = DateUtil.toYearWeek(dto.date());
+        LocalDate date = dto.date();
+        String yearWeek = DateUtil.toYearWeek(date);
         WeeklyResult weeklyResult = weeklyResultRepository.findWeeklyResultByYearWeekAndUser_Id(yearWeek, dto.id())
                 .orElseThrow();
         User user = weeklyResult.getUser();
@@ -106,24 +108,27 @@ public void updateWeekPass(WeekPassRequestDto dto) {
             throw CustomException.of(ApiResponseCode.INVALID_PASSWORD);
         }
 
+        if (date.getDayOfWeek().equals(DayOfWeek.SATURDAY) || date.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
+            throw CustomException.of(ApiResponseCode.WEEK_PASS_NOT_ALLOWED);
+        }
+
         WeeklyResultState state = dto.activate() ? WeeklyResultState.WeekPass : WeeklyResultState.None;
         weeklyResult.setState(state);
     }
 
     public void insertInitialWeeklyResults(LocalDate date) {
-        String yearWeek = DateUtil.toYearWeek(date);
         List<User> users = userRepository.findAll();
         List<WeeklyResult> weeklyResults = users.stream()
-                .map(user -> WeeklyResult.from(yearWeek, user))
+                .map(user -> WeeklyResult.from(date, user))
                 .toList();
         weeklyResultRepository.saveAll(weeklyResults);
     }
 
     @Transactional
     public void updateWeeklyResults(LocalDate fromDate, LocalDate toDate) {
-        String yearWeek = DateUtil.toYearWeek(toDate);
+        String yearWeek = DateUtil.toYearWeek(fromDate);
         List<WeeklyResult> weeklyResults = weeklyResultRepository.findWeeklyResultByYearWeek(yearWeek);
-        List<SolvedProblem> solvedProblems = solvedProblemQueryRepository.fetchWeeklyUserScores(fromDate, toDate);
+        List<SolvedProblem> solvedProblems = solvedProblemQueryRepository.getSolvedCorrectProblems(fromDate, toDate);
 
         Map<Long, Integer> userScoreMap = solvedProblems.stream()
                 .collect(Collectors.groupingBy(
@@ -132,13 +137,15 @@ public void updateWeeklyResults(LocalDate fromDate, LocalDate toDate) {
                 ));
 
         for (WeeklyResult weeklyResult : weeklyResults) {
-            int score = userScoreMap.get(weeklyResult.getUserId());
+            int score = userScoreMap.getOrDefault(weeklyResult.getUserId(), 0);
+            int fine = 0;
             weeklyResult.setScore(score);
             if (weeklyResult.getState() == WeeklyResultState.None) {
                 WeeklyResultState state = getWeeklyResultState(score);
                 weeklyResult.setState(state);
-                weeklyResult.setFine(getFineAmount(state));
+                fine = getFineAmount(state);
             }
+            weeklyResult.setFine(fine);
         }
     }
 
diff --git a/src/main/java/com/baektracker/global/code/ApiResponseCode.java b/src/main/java/com/baektracker/global/code/ApiResponseCode.java
index 504eca6d..d883fbea 100644
--- a/src/main/java/com/baektracker/global/code/ApiResponseCode.java
+++ b/src/main/java/com/baektracker/global/code/ApiResponseCode.java
@@ -25,7 +25,7 @@ public enum ApiResponseCode {
     INVALID_FILE(HttpStatus.BAD_REQUEST, "유효하지 않은 파일입니다."),
     INVALID_FILE_NAME(HttpStatus.BAD_REQUEST, "유효하지 않은 파일명입니다."),
     INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
-    PASS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "월 ~ 금요일에만 주간 패스를 활성화할 수 있습니다."),
+    WEEK_PASS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "월 ~ 금요일에만 주간 패스를 활성화할 수 있습니다."),
 
     /**
      * 401 Unauthorized (인증 필요)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 32de391a..1cdf169e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -23,6 +23,9 @@ spring:
     multipart:
       max-file-size: 150MB
       max-request-size: 150MB
+  output:
+    ansi:
+      enabled: always
 
 logging:
   pattern:
diff --git a/src/main/resources/db/procedure/init_user_streak.sql b/src/main/resources/db/procedure/init_user_streak.sql
index d239b5f1..c08c9006 100644
--- a/src/main/resources/db/procedure/init_user_streak.sql
+++ b/src/main/resources/db/procedure/init_user_streak.sql
@@ -1,3 +1,5 @@
+# 해당 쿼리를 실행하려는 날짜 기준, 이전 주까지의 스트릭을 갱신
+# 이번 주의 주간 결과는 포함 안함
 set @start_date := (select date_sub(curdate(), interval weekday(curdate()) day));
 
 update users u
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 1b1defb6..4e8e5bdf 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
+    <!-- 로그 패턴에 색상 적용 %clr(pattern){color} -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
     <!-- 콘솔 로그 패턴: 예외(Stacktrace)까지 반드시 출력 -->
-    <property name="CONSOLE_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full}"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){green} %highlight(%-5level) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${CONSOLE_PATTERN}</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
         </encoder>
     </appender>
 
-    <!-- (선택) 파일로도 남기고 싶으면 주석 해제 -->
-    <!--
+    <!-- 로그를 파일로 저장 -->
     <property name="LOG_DIR" value="./logs"/>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_DIR}/app.log</file>
@@ -20,11 +26,15 @@
             <fileNamePattern>${LOG_DIR}/app.%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
         <encoder>
             <pattern>${CONSOLE_PATTERN}</pattern>
         </encoder>
     </appender>
-    -->
 
     <!-- SQL / 파라미터(원하면) -->
     <logger name="org.hibernate.SQL" level="DEBUG"/>
diff --git a/src/main/resources/mapper/WeeklyResultMapper.xml b/src/main/resources/mapper/WeeklyResultMapper.xml
index 5da4a38e..6ac6a586 100644
--- a/src/main/resources/mapper/WeeklyResultMapper.xml
+++ b/src/main/resources/mapper/WeeklyResultMapper.xml
@@ -7,18 +7,21 @@
         set @start_date := (select date_sub(#{date}, interval weekday(#{date}) day));
 
         select u.id,
-        (with recursive base as (select @start_date as dt,
-        0 as cnt
-        union all
-        select date_sub(dt, interval 1 week) as dt,
-        IF(ws.state = 1, cnt + 1, cnt) as cnt
-        from base
-        left outer join weekly_results ws
-        on date_format(dt, '%Y-%u') = ws.year_week and ws.id = u.id
-        where ws.state = 1
-        or ws.state = 3)
-        select max(cnt)
-        from base) as streak
+               (with recursive base as (select @start_date as dt,
+                                               0           as cnt,
+                                               0           as state
+                                        union all
+                                        select date_sub(dt, interval 1 week)        as dt,
+                                               IF(ws.state in (1, 3), cnt + 1, cnt) as cnt,
+                                               ws.state                             as state
+                                        from base
+                                                 left outer join weekly_results ws
+                                                                 on ws.year_week =
+                                                                    date_format(date_sub(dt, interval 1 week), '%Y-%u') and
+                                                                    ws.user_id = u.id
+                                        where ws.state in (1, 3))
+                select max(cnt)
+                from base) as streak
         from users u
     </select>
 </mapper>
diff --git a/src/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
similarity index 52%
rename from src/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java
rename to src/test/java/com/baektracker/BaektrackerApplicationTests.java
index b75db3f0..fe68c891 100644
--- a/src/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java
+++ b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
@@ -1,14 +1,9 @@
-package com.baektracker.hanco;
+package com.baektracker;
 
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
 class BaektrackerApplicationTests {
 
-    @Test
-    void contextLoads() {
-
-    }
 
 }
diff --git a/src/test/java/com/baektracker/common/util/DateUtilTest.java b/src/test/java/com/baektracker/common/util/DateUtilTest.java
new file mode 100644
index 00000000..b5f700e6
--- /dev/null
+++ b/src/test/java/com/baektracker/common/util/DateUtilTest.java
@@ -0,0 +1,18 @@
+package com.baektracker.common.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDate;
+import org.junit.jupiter.api.Test;
+
+public class DateUtilTest {
+
+    @Test
+    void 날짜를_주차로_변경() {
+        LocalDate date = LocalDate.of(2025, 12, 29);
+
+        String yearWeek = DateUtil.toYearWeek(date);
+        assertThat(yearWeek).isEqualTo("2025-53");
+    }
+
+}
diff --git a/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java b/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
new file mode 100644
index 00000000..2fe4a3a0
--- /dev/null
+++ b/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
@@ -0,0 +1,245 @@
+package com.baektracker.domain.weekly_result.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+
+import com.baektracker.common.util.DateUtil;
+import com.baektracker.domain.problem.code.SolvedAcResultType;
+import com.baektracker.domain.problem.model.BaekjoonProblem;
+import com.baektracker.domain.problem.model.SolvedProblem;
+import com.baektracker.domain.problem.queryRepository.SolvedProblemQueryRepository;
+import com.baektracker.domain.problem.service.BaekjoonProblemService;
+import com.baektracker.domain.user.model.User;
+import com.baektracker.domain.user.repository.UserRepository;
+import com.baektracker.domain.weekly_result.code.WeeklyResultState;
+import com.baektracker.domain.weekly_result.model.WeeklyResult;
+import com.baektracker.domain.weekly_result.repository.WeeklyResultRepository;
+import com.baektracker.mapper.WeeklyResultMapper;
+import java.time.LocalDate;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@ExtendWith(MockitoExtension.class)
+class WeeklyResultServiceTest {
+
+    @InjectMocks
+    private WeeklyResultService weeklyResultService;
+
+    @Mock
+    private WeeklyResultMapper weeklyResultMapper;
+    @Mock
+    private UserRepository userRepository;
+    @Mock
+    private WeeklyResultRepository weeklyResultRepository;
+    @Mock
+    private SolvedProblemQueryRepository solvedProblemQueryRepository;
+    @Mock
+    private PasswordEncoder passwordEncoder;
+    @Mock
+    private BaekjoonProblemService problemService;
+
+    @Test
+    void 빈_주간_결과_삽입_테스트() {
+        LocalDate date = LocalDate.of(2025, 12, 15);
+        String yearWeek = DateUtil.toYearWeek(date);
+
+        User user1 = User.builder().id(1L).build();
+        User user2 = User.builder().id(2L).build();
+
+        // given
+        given(userRepository.findAll()).willReturn(List.of(user1, user2));
+
+        ArgumentCaptor<List<WeeklyResult>> captor = ArgumentCaptor.forClass(List.class);
+
+        // when
+        weeklyResultService.insertInitialWeeklyResults(date);
+
+        // then
+        then(weeklyResultRepository).should().saveAll(captor.capture());
+        List<WeeklyResult> saved = captor.getValue();
+
+        assertThat(saved).hasSize(2);
+        assertThat(saved).allSatisfy(wr -> {
+            assertThat(wr.getYearWeek()).isEqualTo(yearWeek);
+            assertThat(wr.getState()).isEqualTo(WeeklyResultState.None);
+            assertThat(wr.getFine()).isEqualTo(0);
+            assertThat(wr.getScore()).isEqualTo(0);
+            assertThat(wr.getUser()).isNotNull();
+        });
+    }
+
+    @Test
+    void 주간_결과_업데이트_20점_실패() {
+        // given
+        LocalDate from = LocalDate.of(2026, 1, 1);
+        LocalDate to = LocalDate.of(2026, 1, 7);
+        String yearWeek = DateUtil.toYearWeek(from);
+
+        User u1 = User.builder().id(1L).build();
+
+        WeeklyResult r1 = WeeklyResult.builder()
+                .user(u1)
+                .state(WeeklyResultState.None)
+                .build();
+
+        given(weeklyResultRepository.findWeeklyResultByYearWeek(yearWeek))
+                .willReturn(List.of(r1));
+
+        BaekjoonProblem bronze1 = BaekjoonProblem.builder()
+                .id(1)
+                .title("bronze 1")
+                .level(5)
+                .build();
+
+        SolvedProblem sp1 = SolvedProblem.builder()
+                .id(1L)
+                .user(u1)
+                .submitId(1)
+                .resultId(SolvedAcResultType.CORRECT.getStatus())
+                .problem(bronze1)
+                .tryDt(LocalDate.of(2026, 1, 2))
+                .build();
+
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
+                .willReturn(List.of(sp1));
+
+        given(problemService.mapProblemToScore(sp1)).willReturn(20);
+
+        // when
+        weeklyResultService.updateWeeklyResults(from, to);
+
+        // then
+        assertThat(r1.getScore()).isEqualTo(20);
+        assertThat(r1.getState()).isEqualTo(WeeklyResultState.Failed);
+        assertThat(r1.getFine()).isEqualTo(3000);
+    }
+
+    @Test
+    void 주간_결과_업데이트_100점_통과() {
+        // given
+        LocalDate from = LocalDate.of(2026, 1, 1);
+        LocalDate to = LocalDate.of(2026, 1, 7);
+        String yearWeek = DateUtil.toYearWeek(from);
+
+        User u1 = User.builder().id(1L).build();
+
+        WeeklyResult r1 = WeeklyResult.builder()
+                .user(u1)
+                .state(WeeklyResultState.None)
+                .build();
+
+        given(weeklyResultRepository.findWeeklyResultByYearWeek(yearWeek))
+                .willReturn(List.of(r1));
+
+        BaekjoonProblem bronze1 = BaekjoonProblem.builder()
+                .id(1)
+                .title("bronze 1")
+                .level(5)
+                .build();
+        BaekjoonProblem silver1 = BaekjoonProblem.builder()
+                .id(2)
+                .title("silver 1")
+                .level(10)
+                .build();
+        BaekjoonProblem gold1 = BaekjoonProblem.builder()
+                .id(3)
+                .title("gold 1")
+                .level(15)
+                .build();
+
+        SolvedProblem sp1 = SolvedProblem.builder()
+                .id(1L)
+                .user(u1)
+                .submitId(1)
+                .resultId(SolvedAcResultType.CORRECT.getStatus())
+                .problem(bronze1)
+                .tryDt(LocalDate.of(2026, 1, 2))
+                .build();
+        SolvedProblem sp2 = SolvedProblem.builder()
+                .id(2L)
+                .user(u1)
+                .submitId(2)
+                .resultId(SolvedAcResultType.CORRECT.getStatus())
+                .problem(silver1)
+                .tryDt(LocalDate.of(2026, 1, 2))
+                .build();
+        SolvedProblem sp3 = SolvedProblem.builder()
+                .id(3L)
+                .user(u1)
+                .submitId(3)
+                .resultId(SolvedAcResultType.CORRECT.getStatus())
+                .problem(gold1)
+                .tryDt(LocalDate.of(2026, 1, 4))
+                .build();
+
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
+                .willReturn(List.of(sp1, sp2, sp3));
+
+        given(problemService.mapProblemToScore(sp1)).willReturn(20);
+        given(problemService.mapProblemToScore(sp2)).willReturn(30);
+        given(problemService.mapProblemToScore(sp3)).willReturn(50);
+
+        // when
+        weeklyResultService.updateWeeklyResults(from, to);
+
+        // then
+        assertThat(r1.getScore()).isEqualTo(100);
+        assertThat(r1.getState()).isEqualTo(WeeklyResultState.Completed);
+        assertThat(r1.getFine()).isEqualTo(0);
+    }
+
+
+    @Test
+    void 주간_결과_업데이트_20점_주간패스() {
+        // given
+        LocalDate from = LocalDate.of(2026, 1, 1);
+        LocalDate to = LocalDate.of(2026, 1, 7);
+        String yearWeek = DateUtil.toYearWeek(from);
+
+        User u1 = User.builder().id(1L).build();
+
+        WeeklyResult r1 = WeeklyResult.builder()
+                .user(u1)
+                .state(WeeklyResultState.WeekPass)
+                .build();
+
+        given(weeklyResultRepository.findWeeklyResultByYearWeek(yearWeek))
+                .willReturn(List.of(r1));
+
+        BaekjoonProblem bronze1 = BaekjoonProblem.builder()
+                .id(1)
+                .title("bronze 1")
+                .level(5)
+                .build();
+
+        SolvedProblem sp1 = SolvedProblem.builder()
+                .id(1L)
+                .user(u1)
+                .submitId(1)
+                .resultId(SolvedAcResultType.CORRECT.getStatus())
+                .problem(bronze1)
+                .tryDt(LocalDate.of(2026, 1, 2))
+                .build();
+
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
+                .willReturn(List.of(sp1));
+
+        given(problemService.mapProblemToScore(sp1)).willReturn(20);
+
+        // when
+        weeklyResultService.updateWeeklyResults(from, to);
+
+        // then
+        assertThat(r1.getScore()).isEqualTo(20);
+        assertThat(r1.getState()).isEqualTo(WeeklyResultState.WeekPass);
+        assertThat(r1.getFine()).isEqualTo(0);
+    }
+
+}

From d0eb4b03b31850385418c736b33555c32dd297a0 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 21:05:26 +0900
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20users=20=ED=85=8C=EC=9D=B4=EB=B8=94?=
 =?UTF-8?q?=EC=97=90=20level=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baekjoon/service/BaekjoonService.java     |  6 +-
 .../baektracker/domain/user/model/User.java   |  4 +
 .../migration/V6__add_column_user_level.sql   |  2 +
 .../db/procedure/init_user_streak.sql         |  6 +-
 .../db/procedure/reset_weekly_result.sql      | 76 +++++++++++++++++++
 5 files changed, 87 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/db/migration/V6__add_column_user_level.sql
 create mode 100644 src/main/resources/db/procedure/reset_weekly_result.sql

diff --git a/src/main/java/com/baektracker/domain/baekjoon/service/BaekjoonService.java b/src/main/java/com/baektracker/domain/baekjoon/service/BaekjoonService.java
index 2e4add60..406ac2f2 100644
--- a/src/main/java/com/baektracker/domain/baekjoon/service/BaekjoonService.java
+++ b/src/main/java/com/baektracker/domain/baekjoon/service/BaekjoonService.java
@@ -12,6 +12,7 @@
 import com.baektracker.global.exception.CustomException;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,8 +38,6 @@ public class BaekjoonService {
     public void loadBaekjoonProblemStatus() {
         List<User> users = userRepository.findAll();
         for (User user : users) {
-            int count = 0;
-
             List<SolvedProblem> scrappedProblems = new ArrayList<>();
             int top = -1;
             do {
@@ -60,9 +59,8 @@ public void loadBaekjoonProblemStatus() {
                 System.out.printf("qwe (%s) scrapped : %d, last-read: %d\n", user.getUsername(),
                         scrappedProblems.size(), updatedLastRead);
                 user.updateLastRead(updatedLastRead);
+                user.updateLastReadTime(LocalDateTime.now());
                 solvedProblemRepository.saveAll(scrappedProblems);
-//                solvedProblemRepository.flush();
-//                userRepository.flush();
             }
         }
     }
diff --git a/src/main/java/com/baektracker/domain/user/model/User.java b/src/main/java/com/baektracker/domain/user/model/User.java
index 2ffc57ea..cfc6c645 100644
--- a/src/main/java/com/baektracker/domain/user/model/User.java
+++ b/src/main/java/com/baektracker/domain/user/model/User.java
@@ -54,6 +54,10 @@ public void updateLastRead(Integer lastRead) {
         this.lastRead = lastRead;
     }
 
+    public void updateLastReadTime(LocalDateTime lastReadTime) {
+        this.lastReadTime = lastReadTime;
+    }
+
     public void setStreak(int streak) {
         this.streak = streak;
     }
diff --git a/src/main/resources/db/migration/V6__add_column_user_level.sql b/src/main/resources/db/migration/V6__add_column_user_level.sql
new file mode 100644
index 00000000..58fae4d7
--- /dev/null
+++ b/src/main/resources/db/migration/V6__add_column_user_level.sql
@@ -0,0 +1,2 @@
+alter table users
+    add column level int null
diff --git a/src/main/resources/db/procedure/init_user_streak.sql b/src/main/resources/db/procedure/init_user_streak.sql
index c08c9006..5ccfb2b1 100644
--- a/src/main/resources/db/procedure/init_user_streak.sql
+++ b/src/main/resources/db/procedure/init_user_streak.sql
@@ -7,9 +7,9 @@ set streak=(with recursive base as (select @start_date as dt,
                                            0           as cnt,
                                            0           as state
                                     union all
-                                    select date_sub(dt, interval 1 week) as dt,
-                                           cnt + (ws.state = 1)          as cnt,
-                                           ws.state                      as state
+                                    select date_sub(dt, interval 1 week)        as dt,
+                                           IF(ws.state in (1, 3), cnt + 1, cnt) as cnt,
+                                           ws.state                             as state
                                     from base
                                              left join weekly_results ws
                                                        on ws.year_week =
diff --git a/src/main/resources/db/procedure/reset_weekly_result.sql b/src/main/resources/db/procedure/reset_weekly_result.sql
new file mode 100644
index 00000000..02ae8004
--- /dev/null
+++ b/src/main/resources/db/procedure/reset_weekly_result.sql
@@ -0,0 +1,76 @@
+set @date := CURDATE();
+set @max_date := (select date_sub(@date, interval 1 week));
+
+truncate weekly_results;
+
+insert into weekly_results
+    (year_week, week_dt, user_id, score, state, fine)
+select *
+from (with recursive
+          dates as (select '2025-06-09' as dt
+                    union all
+                    select date_add(dt, interval 1 week) as dt
+                    from dates
+                    where dt < @max_date),
+          user_date as (select dt,
+                               id as user_id
+                        from dates,
+                             users),
+          problems_by_date as (select distinct dt,
+                                               ud.user_id,
+                                               sp.problem_id
+                               from user_date ud
+                                        left outer join solved_problems sp
+                                                        on try_dt between dt and date_add(dt, interval 6 day) and
+                                                           sp.result_id = 4
+                                                            and sp.user_id = ud.user_id),
+          score_by_date as (select dt,
+                                   user_id,
+                                   IFNULL(sum(case
+                                                  when level <= 0 then 10
+                                                  when level > 0 and level <= 5 then 20
+                                                  when level > 5 and level <= 10 then 30
+                                                  when level > 10 and level <= 15 then 50
+                                                  when level > 15 then 80
+                                                  else 0
+                                       end), 0) as score
+                            from problems_by_date
+                                     left outer join problems pb on pb.id = problem_id
+                            group by dt, user_id)
+
+      select date_format(dt, '%Y-%u') as year_week,
+             dt,
+             user_id,
+             score,
+             IF(score >= 60, 1, 2)    as state,
+             IF(score < 60, 3000, 0)  as fine
+      from score_by_date) t;
+
+insert into weekly_results
+    (year_week, week_dt, user_id, score, state, fine)
+select date_format(@date, '%Y-%u'),
+       date_sub(@date, interval weekday(@date) day),
+       id,
+       0,
+       0,
+       0
+from users;
+
+set @start_date := (select date_sub(@date, interval weekday(@date) day));
+
+update users u
+set streak=(with recursive base as (select @start_date as dt,
+                                           0           as cnt,
+                                           0           as state
+                                    union all
+                                    select date_sub(dt, interval 1 week)        as dt,
+                                           IF(ws.state in (1, 3), cnt + 1, cnt) as cnt,
+                                           ws.state                             as state
+                                    from base
+                                             left join weekly_results ws
+                                                       on ws.year_week =
+                                                          date_format(date_sub(dt, interval 1 week), '%Y-%u') and
+                                                          ws.user_id = u.id
+                                    where ws.state in (1, 3))
+            select max(cnt)
+            from base)

From cbbe2450f6d2a707875d28042e953b1a24a24d95 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 21:28:37 +0900
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=EB=A7=A4=EC=9D=BC=2000:01=20?=
 =?UTF-8?q?=EC=97=90=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A0=88=EB=B2=A8=20?=
 =?UTF-8?q?=EA=B0=B1=EC=8B=A0=ED=95=98=EB=8A=94=20job=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/components/UserProgress.jsx        |  4 +--
 .../test/controller/TestController.java       | 10 ++++++-
 .../user/controller/UserController.java       |  4 +--
 .../baektracker/domain/user/dto/UserInfo.java |  1 +
 .../baektracker/domain/user/model/User.java   |  5 ++++
 .../user/repository/UserRepository.java       |  2 ++
 .../domain/user/service/UserService.java      | 26 ++++++++++++-------
 .../baektracker/global/config/JobConfig.java  | 13 ++++++----
 .../global/job/RecordUserLevelJob.java        | 21 +++++++++++++++
 .../job/RecordWeeklyResultJob.java            |  4 +--
 .../global/job/RecordUserLevelJobTest.java    |  4 +++
 11 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/baektracker/global/job/RecordUserLevelJob.java
 rename src/main/java/com/baektracker/{domain/weekly_result => global}/job/RecordWeeklyResultJob.java (93%)
 create mode 100644 src/test/java/com/baektracker/global/job/RecordUserLevelJobTest.java

diff --git a/src/main/frontend/src/js/components/UserProgress.jsx b/src/main/frontend/src/js/components/UserProgress.jsx
index e3135aea..941c1eb9 100644
--- a/src/main/frontend/src/js/components/UserProgress.jsx
+++ b/src/main/frontend/src/js/components/UserProgress.jsx
@@ -213,12 +213,12 @@ export function UserProgress({fromDate, toDate}) {
                         return (
                             <div key={i} className={cm(styles.userProgressCard, `${score >= 60 && styles.completed}`)}>
                                 <div className={styles.userProgressAccent}
-                                     style={{backgroundColor: DesignUtils.getTierColor(user.tier)}}
+                                     style={{backgroundColor: DesignUtils.getTierColor(user.level)}}
                                 />
                                 <div className={styles.userProgressHeader}>
                                     <div className={styles.userProgressInfo}>
                                         <span
-                                            className={cm(styles.tierIcon, `${DesignUtils.getTierIconClass(user.tier)}`)}></span>
+                                            className={cm(styles.tierIcon, `${DesignUtils.getTierIconClass(user.level)}`)}></span>
                                         {/*<TierIcon tier={user.tier} size="small"/>*/}
                                         <span className={styles.userProgressName}>
                                             {user.nickname} {isWeekPass ?
diff --git a/src/main/java/com/baektracker/domain/test/controller/TestController.java b/src/main/java/com/baektracker/domain/test/controller/TestController.java
index b5fd57aa..54ac1037 100644
--- a/src/main/java/com/baektracker/domain/test/controller/TestController.java
+++ b/src/main/java/com/baektracker/domain/test/controller/TestController.java
@@ -1,5 +1,6 @@
 package com.baektracker.domain.test.controller;
 
+import com.baektracker.domain.user.service.UserService;
 import com.baektracker.domain.weekly_result.service.WeeklyResultService;
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
@@ -15,12 +16,19 @@
 public class TestController {
 
     private final WeeklyResultService weeklyResultService;
+    private final UserService userService;
 
-    @GetMapping("/job")
+    @GetMapping("/job/weekly-result")
     public ResponseEntity<Void> testWeeklyResultJob(@RequestParam LocalDate date) {
         LocalDate fromDate = date.minusDays(6);
         System.out.printf("test: %s - %s", fromDate, date);
         weeklyResultService.updateWeeklyResults(fromDate, date);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping("/job/user-level")
+    public ResponseEntity<Void> testUserLevelJob() {
+        userService.updateUserInfoFromSolvedAc();
+        return ResponseEntity.noContent().build();
+    }
 }
diff --git a/src/main/java/com/baektracker/domain/user/controller/UserController.java b/src/main/java/com/baektracker/domain/user/controller/UserController.java
index 9f751148..7e786e73 100644
--- a/src/main/java/com/baektracker/domain/user/controller/UserController.java
+++ b/src/main/java/com/baektracker/domain/user/controller/UserController.java
@@ -1,6 +1,6 @@
 package com.baektracker.domain.user.controller;
 
-import com.baektracker.domain.user.dto.UserProfile;
+import com.baektracker.domain.user.dto.UserInfo;
 import com.baektracker.domain.user.dto.request.UpdatePasswordRequestDto;
 import com.baektracker.domain.user.service.UserService;
 import java.util.List;
@@ -22,7 +22,7 @@ public class UserController {
     private final UserService userService;
 
     @GetMapping("")
-    public ResponseEntity<List<UserProfile>> getAllUsers() {
+    public ResponseEntity<List<UserInfo>> getAllUsers() {
         return ResponseEntity.ok(userService.getUsers());
     }
 
diff --git a/src/main/java/com/baektracker/domain/user/dto/UserInfo.java b/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
index ab0ef6da..0c694048 100644
--- a/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
+++ b/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
@@ -5,6 +5,7 @@ public record UserInfo(
         String username,
         String nickname,
         String password,
+        Integer level,
         Integer lastRead,
         Integer streak,
         Long weekPassCount
diff --git a/src/main/java/com/baektracker/domain/user/model/User.java b/src/main/java/com/baektracker/domain/user/model/User.java
index cfc6c645..d0a48c84 100644
--- a/src/main/java/com/baektracker/domain/user/model/User.java
+++ b/src/main/java/com/baektracker/domain/user/model/User.java
@@ -11,6 +11,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.annotations.ColumnDefault;
 
@@ -39,6 +40,10 @@ public class User {
     @Column(name = "streak", nullable = false)
     private Integer streak;
 
+    @Setter
+    @Column(name = "level", nullable = true)
+    private Integer level;
+
     @ColumnDefault("-1")
     @Column(name = "last_read", nullable = false)
     private Integer lastRead;
diff --git a/src/main/java/com/baektracker/domain/user/repository/UserRepository.java b/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
index 6f6e84e1..4981515f 100644
--- a/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
+++ b/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
@@ -16,6 +16,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
                            u.username,
                            u.nickname,
                            u.password,
+                           u.level,
                            u.lastRead,
                            u.streak,
                            count(wr.state)
@@ -23,6 +24,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
                 from User u
                 left join WeeklyResult wr on u.id=wr.user.id and wr.state=3
                 group by u.id
+                order by u.level desc
             """)
     List<UserInfo> getUserInfo();
 }
diff --git a/src/main/java/com/baektracker/domain/user/service/UserService.java b/src/main/java/com/baektracker/domain/user/service/UserService.java
index e9446573..df31a221 100644
--- a/src/main/java/com/baektracker/domain/user/service/UserService.java
+++ b/src/main/java/com/baektracker/domain/user/service/UserService.java
@@ -2,14 +2,12 @@
 
 import com.baektracker.domain.problem.service.SolvedAcService;
 import com.baektracker.domain.user.dto.UserInfo;
-import com.baektracker.domain.user.dto.UserProfile;
 import com.baektracker.domain.user.dto.request.UpdatePasswordRequestDto;
 import com.baektracker.domain.user.model.User;
 import com.baektracker.domain.user.repository.UserRepository;
 import com.baektracker.domain.weekly_result.dto.SolvedAcUser;
 import com.baektracker.global.code.ApiResponseCode;
 import com.baektracker.global.exception.CustomException;
-import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -38,15 +36,23 @@ public void updatePassword(UpdatePasswordRequestDto dto) {
         user.updatePassword(passwordEncoder.encode(dto.newPwd()));
     }
 
-    public List<UserProfile> getUsers() {
-        List<UserInfo> users = userRepository.getUserInfo();
-        List<UserProfile> userProfiles = new ArrayList<>();
-        for (UserInfo user : users) {
-            SolvedAcUser solvedAcUser = solvedAcService.searchUser(user.username());
-            userProfiles.add(UserProfile.of(user, solvedAcUser));
+    public List<UserInfo> getUsers() {
+        return userRepository.getUserInfo();
+    }
+
+    @Transactional
+    public void updateUserInfoFromSolvedAc() {
+        List<User> users = userRepository.findAll();
+        for (User user : users) {
+            SolvedAcUser solvedAcUser = solvedAcService.searchUser(user.getUsername());
+
+            try {
+                user.setLevel(solvedAcUser.items().get(0).tier());
+            } catch (NullPointerException e) {
+                e.printStackTrace();
+                continue;
+            }
         }
-        userProfiles.sort((u1, u2) -> u2.tier() - u1.tier());
-        return userProfiles;
     }
 
 }
diff --git a/src/main/java/com/baektracker/global/config/JobConfig.java b/src/main/java/com/baektracker/global/config/JobConfig.java
index a015a82b..4f093e9d 100644
--- a/src/main/java/com/baektracker/global/config/JobConfig.java
+++ b/src/main/java/com/baektracker/global/config/JobConfig.java
@@ -1,6 +1,7 @@
 package com.baektracker.global.config;
 
-import com.baektracker.domain.weekly_result.job.RecordWeeklyResultJob;
+import com.baektracker.global.job.RecordUserLevelJob;
+import com.baektracker.global.job.RecordWeeklyResultJob;
 import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,10 +23,12 @@ public class JobConfig {
 
     @PostConstruct // '의존성 주입이 완료 된 후 실행되는 메소드'를 지정하는 어노테이션
     public void run() {
-        JobDetail codingStudyWeeklyJob = getJobDetail(RecordWeeklyResultJob.class, new HashMap());
+        JobDetail recordWeeklyResultJob = getJobDetail(RecordWeeklyResultJob.class, new HashMap());
+        JobDetail userLevelJob = getJobDetail(RecordUserLevelJob.class, new HashMap());
 
         try {
-            scheduler.scheduleJob(codingStudyWeeklyJob, getCronTrigger("0 59 23 ? * SUN")); // 매주 일요일 23:59
+            scheduler.scheduleJob(recordWeeklyResultJob, getCronTrigger("0 59 23 ? * SUN")); // 매주 일요일 23:59
+            scheduler.scheduleJob(userLevelJob, getCronTrigger("0 1 0 ? * *")); // 매일 23:59
         } catch (SchedulerException e) {
             throw new RuntimeException(e);
         }
@@ -41,13 +44,13 @@ public void run() {
     // L : 일에서 사용하면 마지막 일, 요일에서는 마지막 요일(토요일)
     // W : 가장 가까운 평일 (예) 15W는 15일에서 가장 가까운 평일 (월 ~ 금)을 찾음
     // # : 몇째주의 무슨 요일을 표현 (예) 3#2 : 2번째주 수요일
-    public Trigger getCronTrigger(String scheduleExp) {
+    private Trigger getCronTrigger(String scheduleExp) {
         return TriggerBuilder.newTrigger()
                 .withSchedule(CronScheduleBuilder.cronSchedule(scheduleExp))
                 .startNow().build();
     }
 
-    public JobDetail getJobDetail(Class job, Map params) {
+    private JobDetail getJobDetail(Class job, Map params) {
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.putAll(params);
         return JobBuilder.newJob(job).usingJobData(jobDataMap).build();
diff --git a/src/main/java/com/baektracker/global/job/RecordUserLevelJob.java b/src/main/java/com/baektracker/global/job/RecordUserLevelJob.java
new file mode 100644
index 00000000..2be75f30
--- /dev/null
+++ b/src/main/java/com/baektracker/global/job/RecordUserLevelJob.java
@@ -0,0 +1,21 @@
+package com.baektracker.global.job;
+
+import com.baektracker.domain.user.service.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class RecordUserLevelJob implements Job {
+    private final UserService userService;
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        userService.updateUserInfoFromSolvedAc();
+    }
+}
diff --git a/src/main/java/com/baektracker/domain/weekly_result/job/RecordWeeklyResultJob.java b/src/main/java/com/baektracker/global/job/RecordWeeklyResultJob.java
similarity index 93%
rename from src/main/java/com/baektracker/domain/weekly_result/job/RecordWeeklyResultJob.java
rename to src/main/java/com/baektracker/global/job/RecordWeeklyResultJob.java
index bd727eaf..e7c841fd 100644
--- a/src/main/java/com/baektracker/domain/weekly_result/job/RecordWeeklyResultJob.java
+++ b/src/main/java/com/baektracker/global/job/RecordWeeklyResultJob.java
@@ -1,4 +1,4 @@
-package com.baektracker.domain.weekly_result.job;
+package com.baektracker.global.job;
 
 import com.baektracker.domain.baekjoon.service.BaekjoonService;
 import com.baektracker.domain.weekly_result.service.WeeklyResultService;
@@ -21,8 +21,6 @@ public class RecordWeeklyResultJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        log.info("[Job] Weekly Job is processing!");
-
         LocalDate thisWeekDate = LocalDate.now();
         LocalDate fromDate = thisWeekDate.minusDays(6);
         if (thisWeekDate.getDayOfWeek() != DayOfWeek.SUNDAY) {
diff --git a/src/test/java/com/baektracker/global/job/RecordUserLevelJobTest.java b/src/test/java/com/baektracker/global/job/RecordUserLevelJobTest.java
new file mode 100644
index 00000000..535afc94
--- /dev/null
+++ b/src/test/java/com/baektracker/global/job/RecordUserLevelJobTest.java
@@ -0,0 +1,4 @@
+package com.baektracker.global.job;
+
+public class RecordUserLevelJobTest {
+}

From 4693429f06b03fba62cd013b3a750be567814346 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 21:49:39 +0900
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baektracker/domain/user/dto/UserInfo.java |  3 +--
 .../domain/user/dto/UserProfile.java          | 27 -------------------
 .../user/repository/UserRepository.java       |  4 +--
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 src/main/java/com/baektracker/domain/user/dto/UserProfile.java

diff --git a/src/main/java/com/baektracker/domain/user/dto/UserInfo.java b/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
index 0c694048..fb6df36b 100644
--- a/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
+++ b/src/main/java/com/baektracker/domain/user/dto/UserInfo.java
@@ -7,7 +7,6 @@ public record UserInfo(
         String password,
         Integer level,
         Integer lastRead,
-        Integer streak,
-        Long weekPassCount
+        Integer streak
 ) {
 }
diff --git a/src/main/java/com/baektracker/domain/user/dto/UserProfile.java b/src/main/java/com/baektracker/domain/user/dto/UserProfile.java
deleted file mode 100644
index 83d4d245..00000000
--- a/src/main/java/com/baektracker/domain/user/dto/UserProfile.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.baektracker.domain.user.dto;
-
-import com.baektracker.domain.weekly_result.dto.SolvedAcUser;
-
-public record UserProfile(
-        Long id,
-        String username,
-        String nickname,
-        Integer streak,
-        Integer solvedCount,
-        Long weekPassCount,
-        Integer tier
-) {
-
-    public static UserProfile of(UserInfo user, SolvedAcUser solvedAcUser) {
-        SolvedAcUser.InnerUserItem item = solvedAcUser.items().get(0);
-        return new UserProfile(
-                user.id(),
-                user.username(),
-                user.nickname(),
-                user.streak(),
-                item.solvedCount(),
-                user.weekPassCount(),
-                item.tier()
-        );
-    }
-}
diff --git a/src/main/java/com/baektracker/domain/user/repository/UserRepository.java b/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
index 4981515f..4ab3cd0e 100644
--- a/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
+++ b/src/main/java/com/baektracker/domain/user/repository/UserRepository.java
@@ -18,11 +18,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
                            u.password,
                            u.level,
                            u.lastRead,
-                           u.streak,
-                           count(wr.state)
+                           u.streak
                     )
                 from User u
-                left join WeeklyResult wr on u.id=wr.user.id and wr.state=3
                 group by u.id
                 order by u.level desc
             """)

From 484903302541c39a9cbedaa72b00b201e20718f0 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 21:55:01 +0900
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EC=97=B0=EB=8F=84=20=EB=B0=94?=
 =?UTF-8?q?=EB=80=8C=EB=8A=94=20=EB=82=A0=EC=A7=9C=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EC=8B=9C=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

---
 src/main/frontend/src/js/components/Header.jsx    | 2 +-
 src/main/frontend/src/js/setup/utils/DateUtils.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/frontend/src/js/components/Header.jsx b/src/main/frontend/src/js/components/Header.jsx
index d1fc22d9..1211a11c 100644
--- a/src/main/frontend/src/js/components/Header.jsx
+++ b/src/main/frontend/src/js/components/Header.jsx
@@ -110,4 +110,4 @@ const FineInfo = ({totalFine, onShowReceipt, className}) => {
             </button>
         </div>
     )
-}
\ No newline at end of file
+}
diff --git a/src/main/frontend/src/js/setup/utils/DateUtils.js b/src/main/frontend/src/js/setup/utils/DateUtils.js
index b9d035ef..a66c28f8 100644
--- a/src/main/frontend/src/js/setup/utils/DateUtils.js
+++ b/src/main/frontend/src/js/setup/utils/DateUtils.js
@@ -154,7 +154,7 @@ export const DateUtils = {
 
         if (orgMonth === 12 && (days) >= (totalDays - orgDate)) {
             date.setFullYear(date.getFullYear() + 1);
-            date.setMonth(1);
+            date.setMonth(0);
             date.setDate((days) - (totalDays - orgDate));
         } else {
             date.setDate(orgDate + (days));
@@ -209,4 +209,4 @@ export const DateUtils = {
         newDate.setDate(newDate.getDate() + addOffset);
         return newDate;
     }
-}
\ No newline at end of file
+}