Merge branch 'master' into migrate

Author: nebocco

atcoder-problems-backend/Cargo.lock

@@ -24,14 +24,17 @@ sql-client = { path = "./sql-client" }
 atcoder-client = { path = "./atcoder-client" }
 
 # Web framework
-actix-web = "4.0.0-beta.18"
+actix-web = "4.0.0-rc.2"
+actix-service = "2.0.2"
 reqwest = { version = "0.11", features = ["json"] }
 
 async-trait = "0.1"
 
 anyhow = "1.0"
+futures-util = "0.3.19"
 
 [dev-dependencies]
+httpmock = "0.6.6"
 
 [workspace]
 members = ["sql-client", "atcoder-client"]

atcoder-problems-backend/Cargo.toml

@@ -1,24 +1,29 @@
 use std::env;
 
+use atcoder_problems_backend::server::middleware::github_auth::GithubClient;
 use atcoder_problems_backend::server::run_server;
-use atcoder_problems_backend::server::GitHubAuthentication;
 use atcoder_problems_backend::utils::init_log_config;
 
 #[actix_web::main]
 async fn main() {
-    // std::env::set_var("RUST_LOG", "actix_web=info");
     init_log_config().unwrap();
     let database_url = env::var("SQL_URL").expect("SQL_URL is not set.");
     let port = 8080;
 
     let client_id = env::var("CLIENT_ID").unwrap_or_else(|_| String::new());
     let client_secret = env::var("CLIENT_SECRET").unwrap_or_else(|_| String::new());
 
-    let auth = GitHubAuthentication::new(&client_id, &client_secret);
     let pg_pool = sql_client::initialize_pool(&database_url)
         .await
         .expect("Failed to initialize the connection pool");
-    run_server(pg_pool, auth, port)
+    let github = GithubClient::new(
+        &client_id,
+        &client_secret,
+        "https://github.com",
+        "https://api.github.com",
+    )
+    .expect("Failed to create github client");
+    run_server(pg_pool, github, port)
         .await
         .expect("Failed to run server");
 }

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

@@ -0,0 +1,6 @@
+use actix_web::{get, HttpResponse, Responder};
+
+#[get("/healthcheck")]
+pub async fn get_healthcheck() -> impl Responder {
+    HttpResponse::Ok().finish()
+}

atcoder-problems-backend/src/server/auth.rs

@@ -0,0 +1,28 @@
+use actix_web::{post, web, HttpResponse, Responder, Result};
+use serde::Deserialize;
+use sql_client::{
+    internal::virtual_contest_manager::{VirtualContestItem, VirtualContestManager},
+    PgPool,
+};
+
+use crate::server::{error::ApiResult, middleware::github_auth::GithubToken};
+
+#[derive(Deserialize)]
+pub struct UpdateItemsQuery {
+    contest_id: String,
+    problems: Vec<VirtualContestItem>,
+}
+
+#[post("/internal-api/contest/item/update")]
+pub async fn update_items(
+    token: web::ReqData<GithubToken>,
+    pool: web::Data<PgPool>,
+    query: web::Json<UpdateItemsQuery>,
+) -> Result<impl Responder> {
+    let user_id = token.id.to_string();
+    pool.update_items(&query.contest_id, &query.problems, &user_id)
+        .await
+        .map_internal_server_err()?;
+    let response = HttpResponse::Ok().finish();
+    Ok(response)
+}