Merge pull request #1133 from kenkoooo/fix/rated_point_sum_exclude_heuristic

fix: exclude heuristic rated points

Author: kenkoooo

atcoder-problems-backend/sql-client/src/models.rs

@@ -1,4 +1,3 @@
-use crate::{FIRST_AGC_EPOCH_SECOND, UNRATED_STATE};
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgRow;
 use sqlx::FromRow;
@@ -13,12 +12,6 @@ pub struct Contest {
     pub rate_change: String,
 }
 
-impl Contest {
-    pub fn is_rated(&self) -> bool {
-        self.start_epoch_second >= FIRST_AGC_EPOCH_SECOND && self.rate_change != UNRATED_STATE
-    }
-}
-
 #[derive(Debug, Eq, PartialEq, Serialize)]
 pub struct Problem {
     pub id: String,

atcoder-problems-backend/sql-client/src/rated_point_sum.rs

@@ -21,9 +21,17 @@ impl RatedPointSumClient for PgPool {
     async fn update_rated_point_sum(&self, ac_submissions: &[Submission]) -> Result<()> {
         let rated_contest_ids_fut = sqlx::query(
             r"
-            SELECT id FROM contests
-            WHERE start_epoch_second >= $1
-            AND rate_change != $2
+            SELECT contests.id FROM
+            (
+                SELECT COUNT(*) AS problem_count, contest_id
+                FROM contest_problem
+                GROUP BY contest_id
+            ) AS contest_problem_count
+            JOIN contests ON contests.id=contest_problem_count.contest_id
+            WHERE 
+                contests.start_epoch_second >= $1
+                AND contests.rate_change != $2
+                AND contest_problem_count.problem_count >= 2
             ",
         )
         .bind(FIRST_AGC_EPOCH_SECOND)

atcoder-problems-backend/sql-client/tests/test_rated_point_sum.rs

@@ -13,6 +13,7 @@ const USER_ID2: &str = "user2";
 const USER_ID3: &str = "user3";
 const USER_ID4: &str = "user4";
 const RATED_CONTEST: &str = "rated_contest";
+const HEURISTIC_CONTEST: &str = "heuristic_contest";
 const UNRATED_CONTEST1: &str = "unrated_contest1";
 const UNRATED_CONTEST2: &str = "unrated_contest2";
 
@@ -56,6 +57,13 @@ async fn setup_contests(pool: &PgPool) {
             title: "Unrated New Contest".to_string(),
             rate_change: UNRATED_STATE.to_string(),
         },
+        Contest {
+            id: HEURISTIC_CONTEST.to_string(),
+            start_epoch_second: FIRST_AGC_EPOCH_SECOND,
+            duration_second: 1000,
+            title: "Heuristic Contest".to_string(),
+            rate_change: "All".to_string(),
+        },
     ];
     for contest in contests {
         sqlx::query(
@@ -102,6 +110,18 @@ async fn setup_contest_problems(pool: &PgPool) {
             problem_id: "problem5".to_string(),
             contest_id: SAME_CONTEST_UNRATED.to_string(),
         },
+        ContestProblem {
+            problem_id: "problem6".to_string(),
+            contest_id: SAME_CONTEST_RATED.to_string(),
+        },
+        ContestProblem {
+            problem_id: "problem6".to_string(),
+            contest_id: SAME_CONTEST_UNRATED.to_string(),
+        },
+        ContestProblem {
+            problem_id: "heuristic-problem".to_string(),
+            contest_id: HEURISTIC_CONTEST.to_string(),
+        },
     ];
 
     for problem in problems {
@@ -175,6 +195,14 @@ async fn test_update_rated_point_sum() {
             contest_id: SAME_CONTEST_UNRATED.to_string(),
             ..Default::default()
         },
+        Submission {
+            id: 6,
+            user_id: USER_ID.to_string(),
+            point: 1000000.0,
+            problem_id: "heuristic-problem".to_string(),
+            contest_id: HEURISTIC_CONTEST.to_string(),
+            ..Default::default()
+        },
     ];
 
     pool.update_rated_point_sum(&submissions).await.unwrap();