fix: 주간 결과 정산 오류 수정

.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

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
-}
+}

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

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

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) {

src/main/java/com/baektracker/domain/problem/model/BaekjoonProblem.java

@@ -8,13 +8,15 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Table(name = "problems")
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class BaekjoonProblem {
     @Id
     private Integer id;

src/main/java/com/baektracker/domain/problem/model/SolvedProblem.java

@@ -15,13 +15,15 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Table(name = "solved_problems")
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@ToString
 public class SolvedProblem {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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");
 

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();
+    }
+}

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;
     }
+
 }

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);
-    }
 }

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);
         }
     }
 

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 (인증 필요)

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:

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

src/main/resources/logback-spring.xml

@@ -1,30 +1,40 @@
 <?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>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <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"/>

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>