chore remove idea warning

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

@@ -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())
@@ -260,7 +260,7 @@ impl Contest for ArcServer {
             if result.rows_affected == 0 {
                 return Err(Error::NotInDB);
             }
-            tracing::info!(counter.contest = -1, id = req.id);
+            info!(counter.contest = -1, id = req.id);
             Ok(())
         })
         .await
@@ -270,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
@@ -320,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 {
@@ -338,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())
@@ -353,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

backend/src/endpoint/problem.rs

@@ -140,7 +140,7 @@ impl Problem for ArcServer {
 
             let id = *model.id.as_ref();
 
-            tracing::info!(count.problem = 1, id = id);
+            info!(count.problem = 1, id = id);
 
             Ok(id.into())
         })
@@ -213,7 +213,7 @@ impl Problem for ArcServer {
             if result.rows_affected == 0 {
                 return Err(Error::NotInDB);
             }
-            tracing::info!(count.problem = -1, id = req.id);
+            info!(count.problem = -1, id = req.id);
             Ok(())
         })
         .await
@@ -298,7 +298,7 @@ impl Problem for ArcServer {
 
             let mut model = model.ok_or(Error::NotInDB)?.into_active_model();
             if let Some(x) = model.contest_id.into_value() {
-                tracing::debug!(old_id = x.to_string());
+                debug!(old_id = x.to_string());
             }
             model.contest_id = ActiveValue::Set(None);
             model

backend/src/endpoint/submit.rs

@@ -91,11 +91,11 @@ impl Submit for ArcServer {
     async fn info(&self, req: Request<Id>) -> Result<Response<SubmitInfo>, Status> {
         let (auth, req) = self.rate_limit(req).in_current_span().await?;
 
-        tracing::debug!(id = req.id);
+        debug!(id = req.id);
 
         let model = Entity::read_filter(Entity::find_by_id(req.id), &auth)?
             .one(self.db.deref())
-            .instrument(tracing::debug_span!("fetch").or_current())
+            .instrument(debug_span!("fetch").or_current())
             .await
             .map_err(Into::<Error>::into)?
             .ok_or(Error::NotInDB)?;
@@ -156,7 +156,7 @@ impl Submit for ArcServer {
                 .instrument(info_span!("construct_submit").or_current())
                 .await?;
 
-            tracing::info!(counter.submit = 1, id = id);
+            info!(counter.submit = 1, id = id);
 
             Ok(id.into())
         })
@@ -189,7 +189,7 @@ impl Submit for ArcServer {
             if result.rows_affected == 0 {
                 Err(Error::NotInDB)
             } else {
-                tracing::info!(counter.submit = -1, id = req.id);
+                info!(counter.submit = -1, id = req.id);
                 Ok(())
             }
         })

backend/src/endpoint/testcase.rs

@@ -102,7 +102,7 @@ impl Testcase for ArcServer {
 
             let id = *model.id.as_ref();
 
-            tracing::info!(count.testcase = 1, id = id);
+            info!(count.testcase = 1, id = id);
 
             Ok(id.into())
         })
@@ -121,7 +121,7 @@ impl Testcase 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::write_filter(Entity::find_by_id(req.id), &auth)?
                 .one(self.db.deref())
                 .instrument(info_span!("fetch").or_current())
@@ -162,7 +162,7 @@ impl Testcase for ArcServer {
             if result.rows_affected == 0 {
                 Err(Error::NotInDB)
             } else {
-                tracing::info!(counter.testcase = -1, id = req.id);
+                info!(counter.testcase = -1, id = req.id);
                 Ok(())
             }
         })
@@ -197,6 +197,7 @@ impl Testcase for ArcServer {
             let problem: problem::IdModel = problem.ok_or(Error::NotInDB)?;
 
             let mut model = model.ok_or(Error::NotInDB)?.into_active_model();
+            // FIXME: use is_set(), be sure to know what Option<T> in sea_orm said
             if let ActiveValue::Set(Some(v)) = model.problem_id {
                 return Err(Error::AlreadyExist("testcase already linked"));
             }

backend/src/endpoint/token.rs

@@ -77,7 +77,7 @@ impl Token for ArcServer {
         // FIXME: add request_id
         let (_, req) = self.rate_limit(req).in_current_span().await?;
 
-        tracing::debug!(username = req.username);
+        debug!(username = req.username);
 
         let model = user::Entity::find()
             .filter(user::Column::Username.eq(req.username))
@@ -99,7 +99,7 @@ impl Token for ArcServer {
                 expiry: into_prost(expiry),
             }))
         } else {
-            tracing::trace!("password_mismatch");
+            trace!("password_mismatch");
             Err(Error::PermissionDeny("wrong password").into())
         }
     }
@@ -164,7 +164,7 @@ impl Token for ArcServer {
                 .remove(token.to_string())
                 .in_current_span()
                 .await?;
-            tracing::event!(Level::TRACE, token = token);
+            event!(Level::TRACE, token = token);
 
             return Ok(Response::new(()));
         }

backend/src/endpoint/user.rs

@@ -118,7 +118,7 @@ impl User for ArcServer {
 
             let mut model: ActiveModel = Default::default();
 
-            tracing::debug!(username = req.info.username);
+            debug!(username = req.info.username);
 
             let hash = self.crypto.hash(req.info.password.as_str());
 
@@ -133,7 +133,7 @@ impl User for ArcServer {
                 .map_err(Into::<Error>::into)?;
 
             let id = *model.id.as_ref();
-            tracing::info!(counter.user = 1, id = id);
+            info!(counter.user = 1, id = id);
 
             Ok(id.into())
         })
@@ -213,7 +213,7 @@ impl User 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(())
             }
         })