fix(Backend): 🐛 fix mismatched Code

mdcpp · Feb 4, 2024 · d02eca3 · d02eca3
1 parent 743b51e
commit d02eca3
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 88 deletions.
diff --git a/backend/src/controller/code.rs b/backend/src/controller/code.rs
@@ -2,7 +2,7 @@ use crate::grpc::backend::StateCode as BackendCode;
 use crate::grpc::judger::JudgerCode;
 
 /// Stablized JudgeResponse Code, store in database
-#[derive(Clone, Copy,PartialEq, Eq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 #[repr(C)]
 pub enum Code {
     Accepted = 1,

diff --git a/backend/src/controller/judger/mod.rs b/backend/src/controller/judger/mod.rs
@@ -12,7 +12,7 @@ use std::{
 use tokio_stream::StreamExt;
 
 use crate::{
-    grpc::TonicStream,
+    grpc::{backend::StateCode as BackendCode, TonicStream},
     init::{config, logger::PACKAGE_NAME},
     report_internal,
 };
@@ -26,7 +26,7 @@ use tracing::{instrument, Instrument, Span};
 use uuid::Uuid;
 
 use crate::grpc::{
-    backend::{submit_status, JudgeResult as BackendResult, PlaygroundResult, SubmitStatus},
+    backend::{submit_status, PlaygroundResult, SubmitStatus},
     judger::{JudgeResponse, *},
 };
 
@@ -131,7 +131,7 @@ impl From<Code> for SubmitStatus {
     fn from(value: Code) -> Self {
         SubmitStatus {
             task: Some(submit_status::Task::Result(
-                Into::<Code>::into(value) as i32
+                Into::<BackendCode>::into(value) as i32,
             )),
         }
     }
@@ -240,7 +240,7 @@ impl JudgerController {
         if ps_guard
             .send(Ok(SubmitStatus {
                 task: Some(submit_status::Task::Result(
-                    Into::<Code>::into(status) as i32
+                    Into::<BackendCode>::into(status) as i32,
                 )),
             }))
             .is_err()
@@ -254,7 +254,7 @@ impl JudgerController {
         model.pass_case = ActiveValue::Set(pass_case);
         model.time = ActiveValue::Set(Some(total_time.try_into().unwrap_or(i64::MAX)));
         model.memory = ActiveValue::Set(Some(total_memory.try_into().unwrap_or(i64::MAX)));
-        model.accept=ActiveValue::Set(status==Code::Accepted);
+        model.accept = ActiveValue::Set(status == Code::Accepted);
 
         drop(meter);
 
@@ -324,14 +324,9 @@ impl JudgerController {
                 .await
             {
                 Ok(submit) => {
-                    score::ScoreUpload::new(
-                        req.user,
-                        problem,
-                        submit.score,
-                        submit.accept,
-                    )
-                    .upload(&db)
-                    .await;
+                    score::ScoreUpload::new(req.user, problem, submit.score, submit.accept)
+                        .upload(&db)
+                        .await;
                 }
                 Err(err) => {
                     tracing::warn!(err = err.to_string(), "judge_fail");

diff --git a/backend/src/endpoint/announcement.rs b/backend/src/endpoint/announcement.rs
@@ -65,7 +65,7 @@ impl AnnouncementSet for Arc<Server> {
     ) -> Result<Response<ListAnnouncementResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -83,9 +83,7 @@ impl AnnouncementSet for Arc<Server> {
             }
             list_announcement_request::Request::Pager(old) => {
                 let pager: ColPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -103,8 +101,8 @@ impl AnnouncementSet for Arc<Server> {
         req: Request<TextSearchRequest>,
     ) -> Result<Response<ListAnnouncementResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
-        
-        let (rev,size)=split_rev(req.size);
+
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -114,9 +112,7 @@ impl AnnouncementSet for Arc<Server> {
             }
             text_search_request::Request::Pager(old) => {
                 let pager: TextPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -381,7 +377,7 @@ impl AnnouncementSet for Arc<Server> {
         req: Request<ListByRequest>,
     ) -> Result<Response<ListAnnouncementResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -400,9 +396,7 @@ impl AnnouncementSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/chat.rs b/backend/src/endpoint/chat.rs
@@ -84,8 +84,8 @@ impl ChatSet for Arc<Server> {
         req: Request<ListByRequest>,
     ) -> Result<Response<ListChatResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
-        
-        let (rev,size)=split_rev(req.size);
+
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -104,9 +104,7 @@ impl ChatSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/contest.rs b/backend/src/endpoint/contest.rs
@@ -70,7 +70,7 @@ impl ContestSet for Arc<Server> {
     ) -> Result<Response<ListContestResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -88,9 +88,7 @@ impl ContestSet for Arc<Server> {
             }
             list_contest_request::Request::Pager(old) => {
                 let pager: ColPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -105,8 +103,8 @@ impl ContestSet for Arc<Server> {
         req: Request<TextSearchRequest>,
     ) -> Result<Response<ListContestResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
-        
-        let (rev,size)=split_rev(req.size);
+
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -116,9 +114,7 @@ impl ContestSet for Arc<Server> {
             }
             text_search_request::Request::Pager(old) => {
                 let pager: TextPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/education.rs b/backend/src/endpoint/education.rs
@@ -46,7 +46,7 @@ impl EducationSet for Arc<Server> {
     ) -> Result<Response<ListEducationResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -219,8 +219,8 @@ impl EducationSet for Arc<Server> {
         req: Request<ListByRequest>,
     ) -> Result<Response<ListEducationResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
-        
-        let (rev,size)=split_rev(req.size);
+
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -239,9 +239,7 @@ impl EducationSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/mod.rs b/backend/src/endpoint/mod.rs
@@ -39,7 +39,7 @@ mod tools {
     pub use tonic::*;
     pub use tracing::instrument;
     pub use uuid::Uuid;
-    pub fn split_rev(raw:i64)->(bool,u64){
-        return (raw <0,raw.abs().try_into().unwrap());
+    pub fn split_rev(raw: i64) -> (bool, u64) {
+        return (raw < 0, raw.abs().try_into().unwrap());
     }
 }
diff --git a/backend/src/endpoint/problem.rs b/backend/src/endpoint/problem.rs
@@ -57,7 +57,7 @@ impl ProblemSet for Arc<Server> {
     ) -> Result<Response<ListProblemResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -75,9 +75,7 @@ impl ProblemSet for Arc<Server> {
             }
             list_problem_request::Request::Pager(old) => {
                 let pager: ColPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -93,7 +91,7 @@ impl ProblemSet for Arc<Server> {
     ) -> Result<Response<ListProblemResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -103,9 +101,7 @@ impl ProblemSet for Arc<Server> {
             }
             text_search_request::Request::Pager(old) => {
                 let pager: TextPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -374,10 +370,10 @@ impl ProblemSet for Arc<Server> {
     ) -> Result<Response<ListProblemResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
-        
+
         let (pager, models) = match req.request.ok_or(Error::NotInPayload("request"))? {
             list_by_request::Request::Create(create) => {
                 tracing::debug!(id = create.parent_id);
@@ -393,9 +389,7 @@ impl ProblemSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/submit.rs b/backend/src/endpoint/submit.rs
@@ -70,7 +70,7 @@ impl SubmitSet for Arc<Server> {
     ) -> Result<Response<ListSubmitResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -81,9 +81,7 @@ impl SubmitSet for Arc<Server> {
             }
             list_submit_request::Request::Pager(old) => {
                 let pager: ColPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 
@@ -100,7 +98,7 @@ impl SubmitSet for Arc<Server> {
     ) -> Result<Response<ListSubmitResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -118,9 +116,7 @@ impl SubmitSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;
 

diff --git a/backend/src/endpoint/testcase.rs b/backend/src/endpoint/testcase.rs
@@ -45,16 +45,14 @@ impl TestcaseSet for Arc<Server> {
     ) -> Result<Response<ListTestcaseResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
         let (pager, models) = match req.request.ok_or(Error::NotInPayload("request"))? {
             list_testcase_request::Request::Pager(old) => {
                 let pager: ColPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
             list_testcase_request::Request::StartFromEnd(rev) => {
                 ColPaginator::new_fetch(Default::default(), &auth, size, offset, rev, &self.db)
@@ -253,7 +251,7 @@ impl TestcaseSet for Arc<Server> {
     ) -> Result<Response<ListTestcaseResponse>, Status> {
         let (auth, req) = self.parse_request(req).await?;
 
-        let (rev,size)=split_rev(req.size);
+        let (rev, size) = split_rev(req.size);
         let size = bound!(size, 64);
         let offset = bound!(req.offset(), 1024);
 
@@ -271,9 +269,7 @@ impl TestcaseSet for Arc<Server> {
             }
             list_by_request::Request::Pager(old) => {
                 let pager: ParentPaginator = self.crypto.decode(old.session)?;
-                pager
-                    .fetch(&auth, size, offset, rev, &self.db)
-                    .await
+                pager.fetch(&auth, size, offset, rev, &self.db).await
             }
         }?;