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..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 @@ -38,12 +38,13 @@ 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) 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 @@ -67,12 +68,13 @@ 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) 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 @@ -96,12 +98,13 @@ 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) 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