Add changes from Erudite (basically rewrite test handling)

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 edition = "2021"
 version = "0.1.0"
-rust-version = "1.81"
+rust-version = "1.87"
 
 [workspace.dependencies]
 anyhow = "1.0.95"
@@ -26,11 +26,8 @@ derive_more = { version = "2.0.1", features = [
     "from_str",
 ] }
 directories = "6.0.0"
-erudite = { git = "https://github.com/basalt-rs/erudite.git", rev = "7de318e", features = [
-    "serde",
-] }
+erudite = { git = "https://github.com/basalt-rs/erudite.git", rev = "f45f587" }
 lazy_static = "1.5.0"
-leucite = "0.2.0"
 rand = "0.8.5"
 redact = { version = "0.1.10", features = ["serde"] }
 scopeguard = "1.2.0"
@@ -41,7 +38,7 @@ sqlx = { version = "0.8.3", features = [
     "runtime-tokio-native-tls",
     "time",
 ] }
-thiserror = "2.0.11"
+thiserror = "2.0.16"
 time = { version = "0.3.40", features = ["serde"] }
 tokio = { version = "1.43.0", features = ["full"] }
 tower-http = { version = "0.6.2", features = ["cors", "trace", "fs"] }

basalt-server-lib/Cargo.toml

@@ -26,7 +26,6 @@ derive_more.workspace = true
 directories.workspace = true
 erudite.workspace = true
 lazy_static.workspace = true
-leucite.workspace = true
 rand.workspace = true
 redact.workspace = true
 scopeguard.workspace = true
@@ -45,6 +44,7 @@ rustyscript = { git = "https://github.com/rscarson/rustyscript.git", branch = "m
     "http",
 ], optional = true }
 reqwest = { version = "0.11.0", features = ["json"], optional = true }
+futures = "0.3.31"
 
 [dev-dependencies]
 async-tempfile = { version = "0.6.0", features = ["uuid"] }

basalt-server-lib/migration.sql

@@ -16,22 +16,31 @@ CREATE TABLE IF NOT EXISTS submission_history (
   id VARCHAR(32) NOT NULL PRIMARY KEY,
   submitter VARCHAR(32) NOT NULL REFERENCES users(id),
   time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  compile_fail BOOLEAN NOT NULL,
   code TEXT NOT NULL,
   question_index INTEGER NOT NULL,
-  score FLOAT NOT NULL,
-  success BOOLEAN NOT NULL,
-  language TEXT NOT NULL
+  language TEXT NOT NULL,
+  compile_result INTEGER NOT NULL, -- CompileResultState enum
+  compile_stdout TEXT NOT NULL,
+  compile_stderr TEXT NOT NULL,
+  compile_exit_status INTEGER NOT NULL,
+  -- The remaining data will be updated after the tests have finished running
+  state INTEGER NOT NULL DEFAULT 0, -- SubmissionState
+  score FLOAT NOT NULL DEFAULT 0.0,
+  success BOOLEAN NOT NULL DEFAULT false,
+  time_taken INTEGER NOT NULL DEFAULT 0 -- NOTE: This is stored as a `u64` cast as an `i64`.  Keep that in mind while doing operations on this data in queries.
 );
 
--- History of tests that have been run on submissions
-CREATE TABLE IF NOT EXISTS submission_test_history (
+-- Output of each test
+CREATE TABLE IF NOT EXISTS test_results (
   submission VARCHAR(32) NOT NULL REFERENCES submission_history(id),
   test_index INTEGER NOT NULL,
-  result VARCHAR(32) NOT NULL,
-  stdout TEXT,
-  stderr TEXT,
-  exit_status INTEGER NOT NULL
+  result INTEGER NOT NULL, -- TestResultState enum
+  stdout TEXT NOT NULL,
+  stderr TEXT NOT NULL,
+  exit_status INTEGER NOT NULL,
+  time_taken INTEGER NOT NULL, -- NOTE: This is stored as a `u64` cast as an `i64`.  Keep that in mind while doing operations on this data in queries.
+
+  PRIMARY KEY (submission, test_index)
 );
 
 CREATE TABLE IF NOT EXISTS announcements (

basalt-server-lib/src/extractors/auth.rs

@@ -54,9 +54,8 @@ async fn extract(
     let session_id = bearer.token();
 
     // confirm user is in db and the session is active
-    let db = state.db.read().await;
     trace!("getting user from session");
-    let user = repositories::session::get_user_from_session(&db, session_id)
+    let user = repositories::session::get_user_from_session(&state.db, session_id)
         .await
         .map_err(|_| {
             trace!("token expired");

basalt-server-lib/src/repositories/mod.rs

@@ -2,3 +2,4 @@ pub mod announcements;
 pub mod session;
 pub mod submissions;
 pub mod users;
+pub mod util;

basalt-server-lib/src/repositories/session.rs

@@ -6,39 +6,13 @@ use sqlx::{prelude::FromRow, SqliteExecutor};
 use utoipa::ToSchema;
 
 use crate::{
+    define_id_type,
     repositories::users::{Role, UserId},
-    storage::SqliteLayer,
 };
 
 use super::users::User;
 
-#[derive(
-    Debug,
-    Clone,
-    Hash,
-    Eq,
-    PartialEq,
-    Serialize,
-    Deserialize,
-    ToSchema,
-    derive_more::From,
-    derive_more::Into,
-    sqlx::Type,
-)]
-#[sqlx(transparent)]
-pub struct SessionId(pub String);
-
-impl SessionId {
-    fn new() -> Self {
-        use rand::{distributions::Alphanumeric, Rng};
-        let id = rand::thread_rng()
-            .sample_iter(Alphanumeric)
-            .take(20)
-            .map(char::from)
-            .collect::<String>();
-        Self(id)
-    }
-}
+define_id_type!(SessionId);
 
 #[derive(Debug, FromRow, Serialize, Deserialize)]
 pub struct Session {
@@ -88,7 +62,7 @@ pub enum GetSessionError {
 }
 
 pub async fn get_user_from_session(
-    sql: &SqliteLayer,
+    sql: impl SqliteExecutor<'_> + Copy, // Copy is implemented for &T
     session_id: &str,
 ) -> Result<User, GetSessionError> {
     #[derive(sqlx::FromRow)]
@@ -102,7 +76,7 @@ pub async fn get_user_from_session(
     }
 
     let session = sqlx::query_as!(SessionUser, "SELECT users.*, expires_at FROM users JOIN sessions ON users.id = sessions.user_id WHERE session_id = $1", session_id)
-        .fetch_optional(&sql.db)
+        .fetch_optional(sql)
         .await
         .map_err(|e| GetSessionError::QueryError(e.to_string()))?
         .ok_or_else(|| GetSessionError::SessionNotFound {
@@ -111,7 +85,7 @@ pub async fn get_user_from_session(
 
     if SystemTime::UNIX_EPOCH + Duration::from_secs(session.expires_at as u64) < SystemTime::now() {
         sqlx::query!("DELETE FROM sessions WHERE session_id = $1", session_id)
-            .execute(&sql.db)
+            .execute(sql)
             .await
             .map_err(|e| GetSessionError::QueryError(e.to_string()))?;