Validation server

common/src/errors/mod.rs

@@ -3,9 +3,13 @@ pub mod infallible;
 pub mod not_found;
 pub mod register_error;
 pub mod submit_result_error;
+pub mod validate_fetch_error;
+pub mod validate_submit_error;
 
 pub use fetch_tasks_error::FetchTasksError;
 pub use infallible::Infallible;
 pub use not_found::NotFound;
 pub use register_error::RegisterError;
 pub use submit_result_error::SubmitResultError;
+pub use validate_fetch_error::ValidateFetchError;
+pub use validate_submit_error::ValidateSubmitError;

common/src/errors/validate_fetch_error.rs

@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Clone, Hash, Debug, Serialize, Deserialize, Error)]
+pub enum ValidateFetchError {
+    #[error("invalid project")]
+    InvalidProject,
+}

common/src/errors/validate_submit_error.rs

@@ -0,0 +1,16 @@
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Clone, Hash, Debug, Serialize, Deserialize, Error)]
+pub enum ValidateSubmitError {
+    #[error("invalid result")]
+    InvalidResult,
+    #[error("expected results for exactly one task")]
+    InvalidTaskCount,
+    #[error("the group id of all results in a group must be the first submitted result")]
+    InconsistentGroup,
+    #[error("forbidden state transition")]
+    ForbiddenStateTransition,
+    #[error("missing some results for this task")]
+    MissingResults,
+}

common/src/records/result.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::types::Id;
+use crate::types::{Id, ResultState};
 
 use super::Assignment;
 
@@ -13,17 +13,31 @@ pub struct Result {
     pub stdout: String,
     pub stderr: String,
     pub exit_code: Option<i32>,
+    pub group_result_id: Option<Id<Result>>,
+    pub state: ResultState,
 }
 
 #[non_exhaustive]
 #[derive(Clone, Hash, Debug, Default, Serialize, Deserialize)]
 pub struct ResultFilter {
     pub assignment_id: Option<Id<Assignment>>,
+    pub group_result_id: Option<Id<Result>>,
+    pub state: Option<ResultState>,
 }
 
 impl ResultFilter {
     pub fn assignment_id(mut self, assignment_id: Id<Assignment>) -> Self {
         self.assignment_id = Some(assignment_id);
         self
     }
+
+    pub fn group_result_id(mut self, group_result_id: Id<Result>) -> Self {
+        self.group_result_id = Some(group_result_id);
+        self
+    }
+
+    pub fn state(mut self, state: ResultState) -> Self {
+        self.state = Some(state);
+        self
+    }
 }

common/src/records/task.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::types::{Id, Interval};
 
-use super::{Project, User};
+use super::{Project, Result, User};
 
 #[derive(Clone, Hash, Debug, Serialize, Deserialize)]
 pub struct Task {
@@ -14,17 +14,25 @@ pub struct Task {
     pub stdin: String,
     pub assignments_needed: i32,
     pub assignment_user_ids: Vec<Id<User>>,
+    pub canonical_result_id: Option<Id<Result>>,
+    pub quorum: i32,
 }
 
 #[non_exhaustive]
 #[derive(Clone, Hash, Debug, Default, Serialize, Deserialize)]
 pub struct TaskFilter {
     pub project_id: Option<Id<Project>>,
+    pub canonical_result_id: Option<Id<Result>>,
 }
 
 impl TaskFilter {
     pub fn project_id(mut self, project_id: Id<Project>) -> Self {
         self.project_id = Some(project_id);
         self
     }
+
+    pub fn canonical_result_id(mut self, canonical_result_id: Id<Result>) -> Self {
+        self.canonical_result_id = Some(canonical_result_id);
+        self
+    }
 }

common/src/requests/mod.rs

@@ -1,7 +1,9 @@
 pub mod fetch_tasks_request;
 pub mod register_request;
 pub mod submit_result_request;
+pub mod validate_submit_request;
 
 pub use fetch_tasks_request::FetchTasksRequest;
 pub use register_request::RegisterRequest;
 pub use submit_result_request::SubmitResultRequest;
+pub use validate_submit_request::ValidateSubmitRequest;

common/src/requests/validate_submit_request.rs

@@ -0,0 +1,11 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+use crate::{records::Result, types::Id};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ValidateSubmitRequest {
+    // Map from result id to group id. None means error.
+    pub results: HashMap<Id<Result>, Option<Id<Result>>>,
+}

common/src/types/assignment_state.rs

@@ -11,7 +11,4 @@ pub enum AssignmentState {
     Canceled,
     Expired,
     Submitted,
-    Valid,
-    Invalid,
-    Inconclusive,
 }

common/src/types/mod.rs

@@ -1,7 +1,9 @@
 pub mod assignment_state;
 pub mod id;
 pub mod interval;
+pub mod result_state;
 
 pub use assignment_state::AssignmentState;
 pub use id::Id;
 pub use interval::Interval;
+pub use result_state::ResultState;

common/src/types/result_state.rs

@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "sqlx", derive(sqlx::Type))]
+#[cfg_attr(
+    feature = "sqlx",
+    sqlx(type_name = "result_state", rename_all = "snake_case")
+)]
+pub enum ResultState {
+    Init,
+    Valid,
+    Invalid,
+    Inconclusive,
+    Error,
+}