From dc35f6069e178cfdcc5ff263d31a1c02a2777762 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Sun, 4 Jan 2026 20:57:05 +0900
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20ERROR=20=EB=A1=9C=EA=B7=B8=EB=A5=BC?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EC=A0=80=EC=9E=A5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml            |  3 +++
 .../db/procedure/init_user_streak.sql         |  2 ++
 src/main/resources/logback-spring.xml         | 22 ++++++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

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"/>

From cd169b671e309c2a5b26ceb94b97cc8ffd9dbe97 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Sat, 10 Jan 2026 22:44:16 +0900
Subject: [PATCH 2/8] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B0=8F=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml                      |   2 +-
 build.gradle                                  |  12 +-
 gradle/libs.versions.toml                     |   3 +
 .../src/js/components/UserProgress.jsx        |  10 +-
 .../domain/problem/model/BaekjoonProblem.java |   2 +
 .../domain/problem/model/SolvedProblem.java   |   2 +
 .../SolvedProblemQueryRepository.java         |   2 +-
 .../baektracker/domain/user/model/User.java   |   3 +
 .../weekly_result/model/WeeklyResult.java     |  12 +-
 .../service/WeeklyResultService.java          |   8 +-
 .../BaektrackerApplicationTests.java          |   2 +-
 .../job/WeeklyResultServiceTest.java          | 246 ++++++++++++++++++
 12 files changed, 288 insertions(+), 16 deletions(-)
 rename src/test/java/com/baektracker/{hanco => }/BaektrackerApplicationTests.java (86%)
 create mode 100644 src/test/java/com/baektracker/domain/weekly_result/job/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/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..64cabd03 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> getCorrectProblems(LocalDate beforeDate, LocalDate afterDate) {
         QSolvedProblem sp = QSolvedProblem.solvedProblem;
         QSolvedProblem sp2 = new QSolvedProblem("sp2");
 
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..a120e69e 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
@@ -17,13 +17,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)
@@ -78,8 +82,8 @@ public static WeeklyResult from(String yearWeek, 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);
-    }
+//    @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..d758be34 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
@@ -123,7 +123,7 @@ public void insertInitialWeeklyResults(LocalDate date) {
     public void updateWeeklyResults(LocalDate fromDate, LocalDate toDate) {
         String yearWeek = DateUtil.toYearWeek(toDate);
         List<WeeklyResult> weeklyResults = weeklyResultRepository.findWeeklyResultByYearWeek(yearWeek);
-        List<SolvedProblem> solvedProblems = solvedProblemQueryRepository.fetchWeeklyUserScores(fromDate, toDate);
+        List<SolvedProblem> solvedProblems = solvedProblemQueryRepository.getCorrectProblems(fromDate, toDate);
 
         Map<Long, Integer> userScoreMap = solvedProblems.stream()
                 .collect(Collectors.groupingBy(
@@ -132,13 +132,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/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
similarity index 86%
rename from src/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java
rename to src/test/java/com/baektracker/BaektrackerApplicationTests.java
index b75db3f0..b4b403ac 100644
--- a/src/test/java/com/baektracker/hanco/BaektrackerApplicationTests.java
+++ b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
@@ -1,4 +1,4 @@
-package com.baektracker.hanco;
+package com.baektracker;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java b/src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java
new file mode 100644
index 00000000..d491b0cc
--- /dev/null
+++ b/src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java
@@ -0,0 +1,246 @@
+package com.baektracker.domain.weekly_result.job;
+
+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.domain.weekly_result.service.WeeklyResultService;
+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(to);
+
+        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.getCorrectProblems(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(to);
+
+        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.getCorrectProblems(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(to);
+
+        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.getCorrectProblems(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 17186d15c41ed67fef7a4119fe4a30a7519d6ceb Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Sat, 10 Jan 2026 22:50:32 +0900
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20getStreak=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=98=AC=EB=B0=94=EB=A5=B4=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/WeeklyResultMapper.xml   | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/WeeklyResultMapper.xml b/src/main/resources/mapper/WeeklyResultMapper.xml
index 5da4a38e..1d9dc5e6 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,
+                                               cnt + (ws.state = 1)          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>

From 10097cc53532c1775ce2794bf6fb5cfd9162d96a Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Sat, 10 Jan 2026 23:26:05 +0900
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=EC=A3=BC=EB=A7=90(=ED=86=A0,?=
 =?UTF-8?q?=EC=9D=BC)=20=EC=A3=BC=EA=B0=84=20=ED=8C=A8=EC=8A=A4=20?=
 =?UTF-8?q?=EB=B0=A9=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/weekly_result/service/WeeklyResultService.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 d758be34..f8f81408 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,6 +108,10 @@ 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.PASS_NOT_ALLOWED, "주간 패스는 평일에만 사용할 수 있습니다.");
+        }
+
         WeeklyResultState state = dto.activate() ? WeeklyResultState.WeekPass : WeeklyResultState.None;
         weeklyResult.setState(state);
     }

From f925e5583ef4811d28b55671ca3a660e8d632b91 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 17:58:50 +0900
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20DateUtil=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=A3=BC=EC=9D=98=20=EC=8B=9C=EC=9E=91=EC=9D=84=20=EC=9B=94?=
 =?UTF-8?q?=EC=9A=94=EC=9D=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/baektracker/common/util/DateUtil.java |  8 +++---
 .../test/controller/TestController.java       | 26 +++++++++++++++++++
 .../weekly_result/model/WeeklyResult.java     | 11 +++-----
 .../service/WeeklyResultService.java          |  5 ++--
 .../global/code/ApiResponseCode.java          |  2 +-
 5 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/com/baektracker/domain/test/controller/TestController.java

diff --git a/src/main/java/com/baektracker/common/util/DateUtil.java b/src/main/java/com/baektracker/common/util/DateUtil.java
index 36b0f59b..df8f1787 100644
--- a/src/main/java/com/baektracker/common/util/DateUtil.java
+++ b/src/main/java/com/baektracker/common/util/DateUtil.java
@@ -1,14 +1,16 @@
 package com.baektracker.common.util;
 
+import java.time.DayOfWeek;
 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.of(DayOfWeek.MONDAY, 4);
 
     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/test/controller/TestController.java b/src/main/java/com/baektracker/domain/test/controller/TestController.java
new file mode 100644
index 00000000..496843be
--- /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", date, fromDate);
+        weeklyResultService.updateWeeklyResults(fromDate, date);
+        return ResponseEntity.noContent().build();
+    }
+}
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 a120e69e..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;
@@ -72,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 f8f81408..020d6311 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
@@ -109,7 +109,7 @@ public void updateWeekPass(WeekPassRequestDto dto) {
         }
 
         if (date.getDayOfWeek().equals(DayOfWeek.SATURDAY) || date.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
-            throw CustomException.of(ApiResponseCode.PASS_NOT_ALLOWED, "주간 패스는 평일에만 사용할 수 있습니다.");
+            throw CustomException.of(ApiResponseCode.WEEK_PASS_NOT_ALLOWED);
         }
 
         WeeklyResultState state = dto.activate() ? WeeklyResultState.WeekPass : WeeklyResultState.None;
@@ -117,10 +117,9 @@ public void updateWeekPass(WeekPassRequestDto dto) {
     }
 
     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);
     }
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 (인증 필요)

From ca82fd7bbbe05c0daf04ac656760fbc01b1b8478 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 18:54:33 +0900
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20updateStreak()=20=EC=BF=BC=EB=A6=AC?=
 =?UTF-8?q?=20=EA=B8=B0=EC=A4=80=EA=B0=92=20=EB=B3=80=EA=B2=BD=20(toDate?=
 =?UTF-8?q?=20->=20fromDate)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/baektracker/common/util/DateUtil.java    |  3 +--
 .../SolvedProblemQueryRepository.java            |  2 +-
 .../domain/test/controller/TestController.java   |  2 +-
 .../service/WeeklyResultService.java             |  4 ++--
 .../baektracker/common/util/DateUtilTest.java    | 16 ++++++++++++++++
 .../WeeklyResultServiceTest.java                 |  6 +++---
 6 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/com/baektracker/common/util/DateUtilTest.java
 rename src/test/java/com/baektracker/domain/weekly_result/{job => service}/WeeklyResultServiceTest.java (97%)

diff --git a/src/main/java/com/baektracker/common/util/DateUtil.java b/src/main/java/com/baektracker/common/util/DateUtil.java
index df8f1787..26ed098e 100644
--- a/src/main/java/com/baektracker/common/util/DateUtil.java
+++ b/src/main/java/com/baektracker/common/util/DateUtil.java
@@ -1,11 +1,10 @@
 package com.baektracker.common.util;
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.temporal.WeekFields;
 
 public class DateUtil {
-    private final static WeekFields isoWeekFields = WeekFields.of(DayOfWeek.MONDAY, 4);
+    private final static WeekFields isoWeekFields = WeekFields.ISO;
 
     public static String toYearWeek(LocalDate date) {
         int year = date.getYear();
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 64cabd03..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> getCorrectProblems(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
index 496843be..b5fd57aa 100644
--- a/src/main/java/com/baektracker/domain/test/controller/TestController.java
+++ b/src/main/java/com/baektracker/domain/test/controller/TestController.java
@@ -19,7 +19,7 @@ public class TestController {
     @GetMapping("/job")
     public ResponseEntity<Void> testWeeklyResultJob(@RequestParam LocalDate date) {
         LocalDate fromDate = date.minusDays(6);
-        System.out.printf("test: %s - %s", date, fromDate);
+        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/weekly_result/service/WeeklyResultService.java b/src/main/java/com/baektracker/domain/weekly_result/service/WeeklyResultService.java
index 020d6311..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
@@ -126,9 +126,9 @@ public void insertInitialWeeklyResults(LocalDate date) {
 
     @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.getCorrectProblems(fromDate, toDate);
+        List<SolvedProblem> solvedProblems = solvedProblemQueryRepository.getSolvedCorrectProblems(fromDate, toDate);
 
         Map<Long, Integer> userScoreMap = solvedProblems.stream()
                 .collect(Collectors.groupingBy(
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..3cd6009e
--- /dev/null
+++ b/src/test/java/com/baektracker/common/util/DateUtilTest.java
@@ -0,0 +1,16 @@
+package com.baektracker.common.util;
+
+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);
+        System.out.println(yearWeek);
+    }
+
+}
diff --git a/src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java b/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
similarity index 97%
rename from src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java
rename to src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
index d491b0cc..485d2a36 100644
--- a/src/test/java/com/baektracker/domain/weekly_result/job/WeeklyResultServiceTest.java
+++ b/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
@@ -108,7 +108,7 @@ class WeeklyResultServiceTest {
                 .tryDt(LocalDate.of(2026, 1, 2))
                 .build();
 
-        given(solvedProblemQueryRepository.getCorrectProblems(from, to))
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
                 .willReturn(List.of(sp1));
 
         given(problemService.mapProblemToScore(sp1)).willReturn(20);
@@ -180,7 +180,7 @@ class WeeklyResultServiceTest {
                 .tryDt(LocalDate.of(2026, 1, 4))
                 .build();
 
-        given(solvedProblemQueryRepository.getCorrectProblems(from, to))
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
                 .willReturn(List.of(sp1, sp2, sp3));
 
         given(problemService.mapProblemToScore(sp1)).willReturn(20);
@@ -229,7 +229,7 @@ class WeeklyResultServiceTest {
                 .tryDt(LocalDate.of(2026, 1, 2))
                 .build();
 
-        given(solvedProblemQueryRepository.getCorrectProblems(from, to))
+        given(solvedProblemQueryRepository.getSolvedCorrectProblems(from, to))
                 .willReturn(List.of(sp1));
 
         given(problemService.mapProblemToScore(sp1)).willReturn(20);

From 62a964bc2d636f9897cb4139ce7390e7afdf5361 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 18:55:23 +0900
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=EC=BF=BC=EB=A6=AC=20=EC=98=A4?=
 =?UTF-8?q?=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/resources/mapper/WeeklyResultMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/WeeklyResultMapper.xml b/src/main/resources/mapper/WeeklyResultMapper.xml
index 1d9dc5e6..6ac6a586 100644
--- a/src/main/resources/mapper/WeeklyResultMapper.xml
+++ b/src/main/resources/mapper/WeeklyResultMapper.xml
@@ -11,9 +11,9 @@
                                                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 outer join weekly_results ws
                                                                  on ws.year_week =

From f235fa320075a9fe28e3a0e23c9ad3791be98cc0 Mon Sep 17 00:00:00 2001
From: chanrhan <km1104rs@naver.com>
Date: Mon, 12 Jan 2026 19:05:02 +0900
Subject: [PATCH 8/8] =?UTF-8?q?test:=20=EC=88=98=EC=A0=95=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/baektracker/BaektrackerApplicationTests.java     | 5 -----
 .../java/com/baektracker/common/util/DateUtilTest.java   | 4 +++-
 .../weekly_result/service/WeeklyResultServiceTest.java   | 9 ++++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/test/java/com/baektracker/BaektrackerApplicationTests.java b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
index b4b403ac..fe68c891 100644
--- a/src/test/java/com/baektracker/BaektrackerApplicationTests.java
+++ b/src/test/java/com/baektracker/BaektrackerApplicationTests.java
@@ -1,14 +1,9 @@
 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
index 3cd6009e..b5f700e6 100644
--- a/src/test/java/com/baektracker/common/util/DateUtilTest.java
+++ b/src/test/java/com/baektracker/common/util/DateUtilTest.java
@@ -1,5 +1,7 @@
 package com.baektracker.common.util;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.time.LocalDate;
 import org.junit.jupiter.api.Test;
 
@@ -10,7 +12,7 @@ public class DateUtilTest {
         LocalDate date = LocalDate.of(2025, 12, 29);
 
         String yearWeek = DateUtil.toYearWeek(date);
-        System.out.println(yearWeek);
+        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
index 485d2a36..2fe4a3a0 100644
--- a/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
+++ b/src/test/java/com/baektracker/domain/weekly_result/service/WeeklyResultServiceTest.java
@@ -1,4 +1,4 @@
-package com.baektracker.domain.weekly_result.job;
+package com.baektracker.domain.weekly_result.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
@@ -15,7 +15,6 @@
 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.domain.weekly_result.service.WeeklyResultService;
 import com.baektracker.mapper.WeeklyResultMapper;
 import java.time.LocalDate;
 import java.util.List;
@@ -81,7 +80,7 @@ class WeeklyResultServiceTest {
         // given
         LocalDate from = LocalDate.of(2026, 1, 1);
         LocalDate to = LocalDate.of(2026, 1, 7);
-        String yearWeek = DateUtil.toYearWeek(to);
+        String yearWeek = DateUtil.toYearWeek(from);
 
         User u1 = User.builder().id(1L).build();
 
@@ -127,7 +126,7 @@ class WeeklyResultServiceTest {
         // given
         LocalDate from = LocalDate.of(2026, 1, 1);
         LocalDate to = LocalDate.of(2026, 1, 7);
-        String yearWeek = DateUtil.toYearWeek(to);
+        String yearWeek = DateUtil.toYearWeek(from);
 
         User u1 = User.builder().id(1L).build();
 
@@ -202,7 +201,7 @@ class WeeklyResultServiceTest {
         // given
         LocalDate from = LocalDate.of(2026, 1, 1);
         LocalDate to = LocalDate.of(2026, 1, 7);
-        String yearWeek = DateUtil.toYearWeek(to);
+        String yearWeek = DateUtil.toYearWeek(from);
 
         User u1 = User.builder().id(1L).build();