From a8eaa06c28c1f11df270d3ac2975bf33b22aecbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=A0=95=EB=B9=88?= Date: Mon, 13 Apr 2026 02:26:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20AnalyzeMyPeriodService=20=EA=B8=B0?= =?UTF-8?q?=EA=B0=84=EB=B3=84=20=ED=86=B5=EA=B3=84=EA=B0=92=20=EC=A0=88?= =?UTF-8?q?=EB=B0=98=20=EC=A1=B0=ED=9A=8C=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/github/GitHubDailyStatsJpaRepository.java | 4 ++-- .../user/userexphistory/UserExpHistoryJpaRepository.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/process/clash/adapter/persistence/github/GitHubDailyStatsJpaRepository.java b/src/main/java/com/process/clash/adapter/persistence/github/GitHubDailyStatsJpaRepository.java index 67b3efd5a..d8e26bf9d 100644 --- a/src/main/java/com/process/clash/adapter/persistence/github/GitHubDailyStatsJpaRepository.java +++ b/src/main/java/com/process/clash/adapter/persistence/github/GitHubDailyStatsJpaRepository.java @@ -78,7 +78,7 @@ List findDailyContributionsByUserIds( SELECT user_id, cast(date_trunc('month', study_date) as date) + (floor((extract(day from study_date) - 1) / 7) * 7)::int AS week_start, - AVG(commit_count + pr_count + review_count + issue_count) AS point, + SUM(commit_count + pr_count + review_count + issue_count) AS point, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY cast(date_trunc('month', study_date) as date) + (floor((extract(day from study_date) - 1) / 7) * 7)::int DESC) as rn FROM github_daily_stats WHERE user_id IN (:userIds) @@ -105,7 +105,7 @@ List findWeeklyContributionsByUserIds( SELECT user_id, cast(date_trunc('month', study_date) as date) AS month_start, - AVG(commit_count + pr_count + review_count + issue_count) AS point, + SUM(commit_count + pr_count + review_count + issue_count) AS point, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY date_trunc('month', study_date) DESC) as rn FROM github_daily_stats WHERE user_id IN (:userIds) diff --git a/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java b/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java index 428aeda72..254e6363c 100644 --- a/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java +++ b/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java @@ -38,7 +38,7 @@ Optional findByUserAndDateAndActingCategory( SELECT fk_user_id, cast(date_trunc('day', date) as date) AS day_date, - AVG(earn_exp) AS point, + SUM(earn_exp) AS point, ROW_NUMBER() OVER (PARTITION BY fk_user_id ORDER BY date_trunc('day', date) DESC) as rn FROM user_exp_history WHERE fk_user_id IN (:userIds) @@ -67,7 +67,7 @@ List findDailyDataByUserIds( SELECT fk_user_id, cast(date_trunc('month', date) as date) + (floor((extract(day from date) - 1) / 7) * 7)::int AS week_start, - AVG(earn_exp) AS point, + SUM(earn_exp) AS point, ROW_NUMBER() OVER (PARTITION BY fk_user_id ORDER BY cast(date_trunc('month', date) as date) + (floor((extract(day from date) - 1) / 7) * 7)::int DESC) as rn FROM user_exp_history WHERE fk_user_id IN (:userIds) @@ -96,7 +96,7 @@ List findWeeklyDataByUserIds( SELECT fk_user_id, cast(date_trunc('month', date) as date) AS month_start, - AVG(earn_exp) AS point, + SUM(earn_exp) AS point, ROW_NUMBER() OVER (PARTITION BY fk_user_id ORDER BY date_trunc('month', date) DESC) as rn FROM user_exp_history WHERE fk_user_id IN (:userIds) From 9fe9f5269d864334d13b0c8625bafe7d720204bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=A0=95=EB=B9=88?= Date: Mon, 13 Apr 2026 02:32:39 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=8B=9C=EC=A6=8C=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EC=BB=AC=EB=A6=BC=EC=9D=84=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=ED=95=98=EC=97=AC=20=EC=A1=B0=ED=9A=8C=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/userexphistory/UserExpHistoryJpaRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java b/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java index 254e6363c..9145ae4dd 100644 --- a/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java +++ b/src/main/java/com/process/clash/adapter/persistence/user/userexphistory/UserExpHistoryJpaRepository.java @@ -44,6 +44,7 @@ Optional findByUserAndDateAndActingCategory( WHERE fk_user_id IN (:userIds) AND date >= date_trunc('day', CAST(:startDate AS date)) AND date <= :endDate + AND acting_category <> 'SEASON_RESET' GROUP BY fk_user_id, date_trunc('day', date) ) subquery WHERE rn <= 10 @@ -73,6 +74,7 @@ List findDailyDataByUserIds( WHERE fk_user_id IN (:userIds) AND date >= :startDate AND date <= :endDate + AND acting_category <> 'SEASON_RESET' GROUP BY fk_user_id, cast(date_trunc('month', date) as date) + (floor((extract(day from date) - 1) / 7) * 7)::int ) subquery WHERE rn <= 10 @@ -102,6 +104,7 @@ List findWeeklyDataByUserIds( WHERE fk_user_id IN (:userIds) AND date >= date_trunc('month', CAST(:startDate AS date)) AND date <= :endDate + AND acting_category <> 'SEASON_RESET' GROUP BY fk_user_id, date_trunc('month', date) ) subquery WHERE rn <= 10