feat: add problem_index and name to Problem

Author: southball

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

@@ -23,6 +23,8 @@ impl Contest {
 pub struct Problem {
     pub id: String,
     pub contest_id: String,
+    pub problem_index: String,
+    pub name: String,
     pub title: String,
 }
 

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

@@ -68,30 +68,36 @@ impl SimpleClient for PgPool {
     }
 
     async fn insert_problems(&self, values: &[Problem]) -> Result<usize> {
-        let (ids, contest_ids, titles) = values.iter().fold(
-            (vec![], vec![], vec![]),
-            |(mut ids, mut contest_ids, mut titles), cur| {
+        let (ids, contest_ids, problem_indexes, names, titles) = values.iter().fold(
+            (vec![], vec![], vec![], vec![], vec![]),
+            |(mut ids, mut contest_ids, mut problem_indexes, mut names, mut titles), cur| {
                 ids.push(cur.id.as_str());
                 contest_ids.push(cur.contest_id.as_str());
+                problem_indexes.push(cur.problem_index.as_str());
+                names.push(cur.name.as_str());
                 titles.push(cur.title.as_str());
-                (ids, contest_ids, titles)
+                (ids, contest_ids, problem_indexes, names, titles)
             },
         );
 
         let result = sqlx::query(
             r"
             INSERT INTO problems
-            (id, contest_id, title)
+            (id, contest_id, problem_index, name, title)
             VALUES (
                 UNNEST($1::VARCHAR(255)[]),
                 UNNEST($2::VARCHAR(255)[]),
-                UNNEST($3::VARCHAR(255)[])
+                UNNEST($3::VARCHAR(255)[]),
+                UNNEST($4::VARCHAR(255)[]),
+                UNNEST($5::VARCHAR(255)[])
             )
             ON CONFLICT DO NOTHING
             ",
         )
         .bind(ids)
         .bind(contest_ids)
+        .bind(problem_indexes)
+        .bind(names)
         .bind(titles)
         .execute(self)
         .await?;
@@ -100,19 +106,24 @@ impl SimpleClient for PgPool {
     }
 
     async fn load_problems(&self) -> Result<Vec<Problem>> {
-        let problems = sqlx::query("SELECT id, contest_id, title FROM problems")
-            .try_map(|row: PgRow| {
-                let id: String = row.try_get("id")?;
-                let contest_id: String = row.try_get("contest_id")?;
-                let title: String = row.try_get("title")?;
-                Ok(Problem {
-                    id,
-                    contest_id,
-                    title,
+        let problems =
+            sqlx::query("SELECT id, contest_id, problem_index, name, title FROM problems")
+                .try_map(|row: PgRow| {
+                    let id: String = row.try_get("id")?;
+                    let contest_id: String = row.try_get("contest_id")?;
+                    let problem_index: String = row.try_get("problem_index")?;
+                    let name: String = row.try_get("name")?;
+                    let title: String = row.try_get("title")?;
+                    Ok(Problem {
+                        id,
+                        contest_id,
+                        problem_index,
+                        name,
+                        title,
+                    })
                 })
-            })
-            .fetch_all(self)
-            .await?;
+                .fetch_all(self)
+                .await?;
         Ok(problems)
     }
 

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

@@ -38,6 +38,8 @@ async fn test_insert_problems() {
     pool.insert_problems(&[Problem {
         id: "problem1".to_string(),
         contest_id: "".to_string(),
+        problem_index: "".to_string(),
+        name: "".to_string(),
         title: "".to_string(),
     }])
     .await
@@ -49,6 +51,8 @@ async fn test_insert_problems() {
     pool.insert_problems(&[Problem {
         id: "problem1".to_string(),
         contest_id: "".to_string(),
+        problem_index: "".to_string(),
+        name: "".to_string(),
         title: "".to_string(),
     }])
     .await

atcoder-problems-backend/src/bin/dump_json.rs

@@ -124,6 +124,8 @@ async fn main() -> Result<()> {
             SELECT
                 problems.id AS merged_problem_id,
                 problems.contest_id AS merged_contest_id,
+                problems.problem_index AS merged_problem_index,
+                problems.name AS merged_problem_name,
                 problems.title AS merged_problem_title,
 
                 shortest.submission_id AS shortest_submission_id,
@@ -158,6 +160,8 @@ async fn main() -> Result<()> {
     .map(|row: PgRow| {
         let id: String = row.get("merged_problem_id");
         let contest_id: String = row.get("merged_contest_id");
+        let problem_index: String = row.get("merged_problem_index");
+        let name: String = row.get("merged_problem_name");
         let title: String = row.get("merged_problem_title");
 
         let shortest_submission_id: Option<i64> = row.get("shortest_submission_id");
@@ -180,6 +184,9 @@ async fn main() -> Result<()> {
         MergedProblem {
             id,
             contest_id,
+            problem_index,
+            name,
+
             title,
             shortest_submission_id,
             shortest_contest_id,
@@ -236,6 +243,8 @@ struct UserStreak {
 struct MergedProblem {
     id: String,
     contest_id: String,
+    problem_index: String,
+    name: String,
     title: String,
     shortest_submission_id: Option<i64>,
     shortest_contest_id: Option<String>,

atcoder-problems-backend/src/crawler/mod.rs

@@ -126,7 +126,9 @@ fn convert_problem(p: AtCoderProblem) -> Problem {
     Problem {
         id: p.id,
         contest_id: p.contest_id,
+        problem_index: p.position.to_string(),
         title: p.position + ". " + p.title.as_str(),
+        name: p.title.to_string(),
     }
 }
 

config/database-definition.sql

@@ -26,6 +26,8 @@ DROP TABLE IF EXISTS problems;
 CREATE TABLE problems (
   id            VARCHAR(255) NOT NULL,
   contest_id    VARCHAR(255) NOT NULL,
+  problem_index VARCHAR(255) NOT NULL,
+  name          VARCHAR(255) NOT NULL,
   title         VARCHAR(255) NOT NULL,
   PRIMARY KEY (id)
 );