Merge branch 'master' of github.com:mdcpp/mdoj

Cargo.toml

@@ -37,11 +37,11 @@ version = "0.11.0"
 default-features = false
 
 [workspace.dependencies.sea-orm]
-version = "0.12.11"
+version = "1.0.0"
 default-features = false
 
 [workspace.dependencies.sea-orm-migration]
-version = "0.12.11"
+version = "1.0.0"
 default-features = false
 
 [profile.wasm-release]

backend/Cargo.toml

@@ -19,7 +19,7 @@ futures = "0.3.29"
 bincode = "1.3.3"
 base64 = "0.21.5"
 tonic-web = { workspace = true }
-quick_cache = "0.4.0"
+quick_cache = "0.6.2"
 hickory-resolver = "0.24.0"
 crossbeam-queue = "0.3.8"
 dashmap = "5.5.3"
@@ -36,7 +36,6 @@ opentelemetry-semantic-conventions = "0.16.0"
 tracing-opentelemetry = { version = "0.24.0", features = ["metrics"] }
 tracing-core = "0.1.32"
 migration = { path = "./migration", optional = true }
-sea-orm-cli = { version = "0.12.12", optional = true }
 governor = "0.6.0"
 http = "^0.2"
 lazy_static = "1.5.0"
@@ -69,7 +68,7 @@ version = "^0.4"
 features = ["cors", "trace"]
 
 [dependencies.sea-query]
-version = "0.30.4"
+version = "0.31.0"
 features = ["thread-safe", "with-chrono", "backend-sqlite"]
 
 [dependencies.chrono]
@@ -102,7 +101,8 @@ workspace = true
 features = ["macros", "rt-multi-thread", "full", "time"]
 
 [dependencies.sea-orm]
-version = "0.12.11"
+workspace = true
+default-features = false
 features = [
   "runtime-tokio-rustls",
   "macros",
@@ -124,12 +124,12 @@ version = "0.9.8"
 features = ["mutex", "spin_mutex", "rwlock"]
 
 [dependencies.sea-orm-migration]
-# workspace = true
-version = "0.12.11"
+workspace = true
 optional = true
+default-features = false
 features = ["runtime-tokio-rustls", "sqlx-sqlite", "with-chrono"]
 
 [features]
 default = ["insecure-print"]
-standalone = ["dep:migration", "dep:sea-orm-migration", "dep:sea-orm-cli"]
+standalone = ["dep:migration", "dep:sea-orm-migration"]
 insecure-print = ["sea-orm/debug-print"]

backend/migration/Cargo.toml

@@ -22,7 +22,7 @@ version = "1"
 features = ["attributes", "tokio1"]
 
 [dependencies.sea-orm]
-version = "0.12.11"
+workspace = true
 default-features = false
 features = [
     "runtime-async-std-rustls",
@@ -34,8 +34,7 @@ features = [
 ]
 
 [dependencies.sea-orm-migration]
-# workspace = true
-version = "0.12.11"
+workspace = true
 default-features = true
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.

backend/migration/src/m20231207_000001_create_table.rs

@@ -668,17 +668,25 @@ impl MigrationTrait for Migration {
         index!(manager, Problem, AcceptCount);
         index!(manager, Problem, Difficulty);
         index!(manager, Problem, Order);
+        index!(manager, Problem, Content);
+        index!(manager, Problem, Title);
+
         index!(manager, Submit, Committed);
         index!(manager, Submit, Time);
         index!(manager, Submit, Memory);
+        index!(manager, Submit, UserId);
+
         index!(manager, Contest, Hoster);
         index!(manager, Contest, Public);
         index!(manager, Contest, End);
         index!(manager, Contest, Begin);
+
         index!(manager, User, Score);
         index!(manager, User, Username);
+
         index!(manager, Token, Rand);
         index!(manager, Token, Expiry);
+
         index!(manager, Chat, CreateAt);
 
         manager

backend/src/endpoint/announcement.rs

@@ -175,7 +175,7 @@ impl Announcement for ArcServer {
 
             let id = *model.id.as_ref();
 
-            tracing::info!(count.announcement = 1, id = id);
+            info!(count.announcement = 1, id = id);
 
             Ok(id.into())
         })
@@ -197,7 +197,7 @@ impl Announcement for ArcServer {
         req.bound_check()?;
 
         req.get_or_insert(|req| async move {
-            tracing::trace!(id = req.id);
+            trace!(id = req.id);
 
             let mut model = Entity::find_by_id(req.id)
                 .with_auth(&auth)
@@ -242,7 +242,7 @@ impl Announcement for ArcServer {
             if result.rows_affected == 0 {
                 Err(Error::NotInDB)
             } else {
-                tracing::info!(counter.announcement = -1, id = req.id);
+                info!(counter.announcement = -1, id = req.id);
                 Ok(())
             }
         })

backend/src/endpoint/chat.rs

@@ -51,7 +51,7 @@ impl Chat for ArcServer {
                 .map_err(Into::<Error>::into)?;
 
             let id = *model.id.as_ref();
-            tracing::debug!(id = id, "chat_created");
+            debug!(id = id, "chat_created");
 
             Ok(id.into())
         })
@@ -80,7 +80,7 @@ impl Chat for ArcServer {
             if result.rows_affected == 0 {
                 Err(Error::NotInDB)
             } else {
-                tracing::info!(counter.chat = -1, id = req.id);
+                info!(counter.chat = -1, id = req.id);
                 Ok(())
             }
         })

backend/src/endpoint/contest.rs

@@ -1,9 +1,9 @@
 use super::*;
-
 use crate::entity::{
     contest::{Paginator, *},
-    *,
+    problem, *,
 };
+use sea_orm::sea_query::Expr;
 
 use grpc::backend::contest_server::*;
 
@@ -164,7 +164,7 @@ impl Contest for ArcServer {
 
             let id = *model.id.as_ref();
 
-            tracing::info!(count.contest = 1, id = id);
+            info!(count.contest = 1, id = id);
 
             Ok(id.into())
         })
@@ -185,7 +185,7 @@ impl Contest for ArcServer {
         let (_, perm) = auth.assume_login()?;
 
         req.get_or_insert(|req| async move {
-            tracing::trace!(id = req.id);
+            trace!(id = req.id);
 
             let mut model = Entity::find_by_id(req.id).with_auth(&auth).write()?
             .one(self.db.deref())
@@ -238,6 +238,8 @@ impl Contest for ArcServer {
         let (auth, req) = self.rate_limit(req).in_current_span().await?;
 
         req.get_or_insert(|req| async move {
+            let txn = self.db.begin().await?;
+
             let result = Entity::delete_by_id(req.id)
                 .with_auth(&auth)
                 .write()?
@@ -246,12 +248,20 @@ impl Contest for ArcServer {
                 .await
                 .map_err(Into::<Error>::into)?;
 
+            problem::Entity::update_many()
+                .col_expr(problem::Column::ContestId, Expr::value(Value::Int(None)))
+                .filter(crate::entity::testcase::Column::ProblemId.eq(req.id))
+                .exec(&txn)
+                .instrument(info_span!("remove_child"))
+                .await?;
+
+            txn.commit().await.map_err(|_| Error::Retry)?;
+
             if result.rows_affected == 0 {
-                Err(Error::NotInDB)
-            } else {
-                tracing::info!(counter.contest = -1, id = req.id);
-                Ok(())
+                return Err(Error::NotInDB);
             }
+            info!(counter.contest = -1, id = req.id);
+            Ok(())
         })
         .await
         .with_grpc()
@@ -260,47 +270,30 @@ impl Contest for ArcServer {
     #[instrument(
         skip_all,
         level = "info",
-        name = "oj.backend.Contest/join",
+        name = "oj.backend.Contest/publish",
         err(level = "debug", Display)
     )]
-    async fn join(&self, req: Request<JoinContestRequest>) -> Result<Response<()>, Status> {
+    async fn publish(&self, req: Request<PublishRequest>) -> Result<Response<()>, Status> {
         let (auth, req) = self.rate_limit(req).in_current_span().await?;
-        let (user_id, _) = auth.assume_login()?;
 
         req.get_or_insert(|req| async move {
-            let model = Entity::find_by_id(req.id)
+            let mut model = Entity::find_by_id(req.id)
                 .with_auth(&auth)
-                .read()?
+                .write()?
+                .columns([Column::Id])
                 .one(self.db.deref())
                 .instrument(info_span!("fetch").or_current())
                 .await
                 .map_err(Into::<Error>::into)?
-                .ok_or(Error::NotInDB)?;
-            // FIXME: abstract away password checking logic
-
-            if let Some(tar) = model.password {
-                let password = req
-                    .password
-                    .as_ref()
-                    .ok_or(Error::NotInPayload("password"))?;
-                if !self.crypto.hash_eq(password, &tar) {
-                    return Err(Error::PermissionDeny("mismatched password"));
-                }
-            }
-
-            let pivot = user_contest::ActiveModel {
-                user_id: ActiveValue::Set(user_id),
-                contest_id: ActiveValue::Set(model.id),
-                ..Default::default()
-            };
+                .ok_or(Error::NotInDB)?
+                .into_active_model();
 
-            pivot
-                .save(self.db.deref())
-                .instrument(info_span!("insert_pviot").or_current())
-                .await
-                .map_err(Into::<Error>::into)?;
+            model.public = ActiveValue::Set(true);
 
-            tracing::debug!(user_id = user_id, contest_id = req.id);
+            model
+                .update(self.db.deref())
+                .instrument(info_span!("update").or_current())
+                .await?;
             Ok(())
         })
         .await
@@ -310,10 +303,10 @@ impl Contest for ArcServer {
     #[instrument(
         skip_all,
         level = "info",
-        name = "oj.backend.Contest/publish",
+        name = "oj.backend.Contest/unpublish",
         err(level = "debug", Display)
     )]
-    async fn publish(&self, req: Request<PublishRequest>) -> Result<Response<()>, Status> {
+    async fn unpublish(&self, req: Request<PublishRequest>) -> Result<Response<()>, Status> {
         let (auth, req) = self.rate_limit(req).in_current_span().await?;
 
         req.get_or_insert(|req| async move {
@@ -328,7 +321,7 @@ impl Contest for ArcServer {
                 .ok_or(Error::NotInDB)?
                 .into_active_model();
 
-            model.public = ActiveValue::Set(true);
+            model.public = ActiveValue::Set(false);
 
             model
                 .update(self.db.deref())
@@ -343,30 +336,47 @@ impl Contest for ArcServer {
     #[instrument(
         skip_all,
         level = "info",
-        name = "oj.backend.Contest/unpublish",
+        name = "oj.backend.Contest/join",
         err(level = "debug", Display)
     )]
-    async fn unpublish(&self, req: Request<PublishRequest>) -> Result<Response<()>, Status> {
+    async fn join(&self, req: Request<JoinContestRequest>) -> Result<Response<()>, Status> {
         let (auth, req) = self.rate_limit(req).in_current_span().await?;
+        let (user_id, _) = auth.assume_login()?;
 
         req.get_or_insert(|req| async move {
-            let mut model = Entity::find_by_id(req.id)
+            let model = Entity::find_by_id(req.id)
                 .with_auth(&auth)
-                .write()?
-                .columns([Column::Id])
+                .read()?
                 .one(self.db.deref())
                 .instrument(info_span!("fetch").or_current())
                 .await
                 .map_err(Into::<Error>::into)?
-                .ok_or(Error::NotInDB)?
-                .into_active_model();
+                .ok_or(Error::NotInDB)?;
+            // FIXME: abstract away password checking logic
 
-            model.public = ActiveValue::Set(false);
+            if let Some(tar) = model.password {
+                let password = req
+                    .password
+                    .as_ref()
+                    .ok_or(Error::NotInPayload("password"))?;
+                if !self.crypto.hash_eq(password, &tar) {
+                    return Err(Error::PermissionDeny("mismatched password"));
+                }
+            }
 
-            model
-                .update(self.db.deref())
-                .instrument(info_span!("update").or_current())
-                .await?;
+            let pivot = user_contest::ActiveModel {
+                user_id: ActiveValue::Set(user_id),
+                contest_id: ActiveValue::Set(model.id),
+                ..Default::default()
+            };
+
+            pivot
+                .save(self.db.deref())
+                .instrument(info_span!("insert_pviot").or_current())
+                .await
+                .map_err(Into::<Error>::into)?;
+
+            debug!(user_id = user_id, contest_id = req.id);
             Ok(())
         })
         .await

backend/src/endpoint/education.rs

@@ -104,7 +104,7 @@ impl Education for ArcServer {
 
             let id = *model.id.as_ref();
 
-            tracing::info!(count.education = 1, id = id);
+            info!(count.education = 1, id = id);
 
             Ok(id.into())
         })
@@ -123,7 +123,7 @@ impl Education for ArcServer {
         req.bound_check()?;
 
         req.get_or_insert(|req| async move {
-            tracing::trace!(id = req.id);
+            trace!(id = req.id);
             let mut model = Entity::find_by_id(req.id)
                 .with_auth(&auth)
                 .write()?
@@ -167,7 +167,7 @@ impl Education for ArcServer {
             if result.rows_affected == 0 {
                 Err(Error::NotInDB)
             } else {
-                tracing::info!(counter.education = -1, id = req.id);
+                info!(counter.education = -1, id = req.id);
                 Ok(())
             }
         })

backend/src/endpoint/imgur.rs

@@ -19,7 +19,7 @@ impl Image for ArcServer {
         req.get_or_insert(|req| async move {
             let url = self.imgur.upload(req.data).await?;
 
-            tracing::debug!(counter.image = 1, uri = url);
+            debug!(counter.image = 1, uri = url);
             Ok(UploadResponse { url })
         })
         .await